From 3f80e92f2ca33339a57ca1e9bbc672d6da7be9f1 Mon Sep 17 00:00:00 2001 From: IlDucci Date: Mon, 25 Jan 2021 23:35:06 +0100 Subject: Updating Spanish.txt FOLLOWING the existing strings on master and miami, undoing LATAM contents MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @ForeverL95 attempted to add Latin American Spanish elements into what's an originally European Spanish translation. If you want a Latin American Version, you should do a entire new file and not step into the existing one. - Restoring all the new reLCS elements following what was done on miami, adding the new particularities/uppercasings currently in use. - Removing all Latin American Spanish details (using íconos and not iconos, mouse instead of ratón, video instead of vídeo, Latin American Spanish verbal tense usage...) --- utils/gxt/spanish.txt | 210 +++++++++++++++++++++++++------------------------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/utils/gxt/spanish.txt b/utils/gxt/spanish.txt index bf2cb721..3f57b1a9 100644 --- a/utils/gxt/spanish.txt +++ b/utils/gxt/spanish.txt @@ -17384,13 +17384,13 @@ This track contains a sample of "Next Level" as performed by Showbiz & AG. Court INICIO [FEP_STG] -INICIAR JUEGO +Iniciar juego [FEP_OPT] -OPCIONES +Opciones [FEP_QUI] -SALIR +Salir [FET_QG] SALIR @@ -17404,87 +17404,87 @@ SALIR OPCIONES [FET_GRA] -Config. Gráficos +Configuración de gráficos [FET_PS] -Config. Jugador +Configuración de hugador [FET_MIG] -IZQUIERDA, DERECHA o RUEDA DEL MOUSE: ajustar. +IZQUIERDA, DERECHA, RUEDA DEL RATÓN PARA AJUSTAR [FET_HRD] -Ajustes reiniciados. +SE HA RESTAURADO LA CONFIGURACIÓN PREDETERMINADA [FET_APP] -CLICK IZQ. o ENTER para aplicar cambios. +APLICAR { controls } [FET_CTL] -CONTROLES +Configuración de controles [FET_CTI] -CONTROLES CLÁSICOS +Controles clásicos [FET_STI] -CONTROLES ESTÁNDAR +Controles estándar [FEC_RED] -REDEFINIR CONTROLES +Redefinir controles [FEC_MOUSE] -CONFIG. MOUSE +Configuración del ratón [FET_DEF] -Reiniciar Ajustes +Restaurar valores por defecto { mouse settings } [FEC_MSH] -SENSIBILIDAD: +SENSIBILIDAD DEL RATÓN: [FEC_IVV] -INVERTIR VERTICALMENTE: +INVERTIR VERTICALIDAD RATÓN: [FET_MST] -CONDUCC. CON MOUSE: +CONDUCIR CON EL RATÓN: { audio } [FEA_NM3] -NO HAY ARCHIVOS +NO HAY ARCHIVOS MP3 [FEA_3DH] -HARDWARE: +HARDWARE DE SONIDO: [FEA_2SP] -2 Altavoces +2 altavoces [FET_DAM] MODELADO ACÚSTICO DINÁMICO: [FEA_4SP] -Más de 2 Altavoces +Más de 2 altavoces [FEA_EAR] Auriculares [FEA_MPB] -VOL. ARCHIVOS MP3: +SUBIR VOLUMEN DE MP3: [FEA_SPK] -CONFIG. ALTAVOCES: +CONFIGURACIÓN DE ALTAVOCES: [FEA_ADP] -AUTO-DETECTAR HARDWARE +DETECTAR AUTOMÁTICAMENTE [FET_RSC] -Hardware no disponible. Ajustes reiniciados. +HARDAWARE NO DISPONIBLE. RESTAURADO AJUSTE ORIGINAL { display } [FEM_LOD] -DISTANCIA VISIBLE: +DISTANCIA DE DIBUJADO: [FEM_CSB] BORDES EN CINEMÁTICAS: @@ -17495,31 +17495,31 @@ CÁMARA LIBRE: { graphics } [FED_RES] -RESOLUCIÓN: +RESOLUCIÓN DE PANTALLA: [FED_FLS] -COMPLETA +PANTALLA COMPLETA [FED_WND] VENTANA [FEM_VSC] -SINC. AUDIO/VIDEO: +SINCRONIZAR IMAGEN: [FEM_FRM] LIMITADOR DE FOTOGRAMAS: [FED_AAS] -ANTI-ALIASING: +SUAVIZADO DE BORDES: [FEM_2PR] -PS2 ALPHA TEST: +ALPHA TEST TIPO PS2: [FEM_MOB] MÓVIL [FED_MBL] -DESENFOQ. MOVIMIENTO: +DESENFOQUE DE MOVIMIENTO: [FEM_NRM] NORMAL @@ -17528,7 +17528,7 @@ NORMAL SIMPLE [FEM_SCF] -FORMATO DE PANTALLA: +FORMATO DE IMAGEN: [FED_CLF] FILTRO DE COLOR: @@ -17536,27 +17536,27 @@ FILTRO DE COLOR: { skin } [FES_SKN] -NOMBRE +NOMBRE DE APARIENCIA [FES_DAT] FECHA [FES_SET] -USAR +Utilizar apariencia [FET_DSN] -Predeterminado.bmp +Apariencia predeterminada del jugador.bmp { pause menu } [FET_PAU] -PAUSA +MENÚ PAUSA [FEP_RES] -CONTINUAR +Continuar [FEQ_SRE] -¿Seguro que quieres salir? Se perderá todo el progreso que hiciste. ¿Continuar? +¿Seguro que quieres salir? Se perderán todos los progresos desde la última partida guardada. ¿Quieres proceder? { map } @@ -17564,7 +17564,7 @@ CONTINUAR ESTÁS AQUÍ [FEH_MPH] -MOUSE o FLECHAS: mover. REPÁG, AVPÁG o RUEDA DEL MOUSE: acercar/alejar. L: referencias. CLICK DCHO: fijar destino. +RATÓN, CURSORES PARA DESPLAZAR - RE PÁG, AV PÁG, RUEDA RATÓN PARA HACER ZOOM, L - LEYENDA { control keys } @@ -17572,16 +17572,16 @@ MOUSE o FLECHAS: mover. REPÁG, AVPÁG o RUEDA DEL MOUSE: acercar/alejar. L: ref A PIE [FET_CCR] -EN VEHÍCULO +EN COCHE [FEC_NMN] NUM. ~1~ [FEC_ETR] -ENT +ENTRAR [FEC_DOT] -NUM. +NUM. . [FEC_UPA] ARRIBA @@ -17599,19 +17599,19 @@ RE PÁG AV PÁG [FEC_RTN] -ENTER +INTRO [FEC_NUS] -NO USADO +NO UTILIZADO [FEC_HME] INICIO [FEC_RCT] -CTRL DCHO +CTRL DCHO. [FEC_LSF] -SHIFT IZQ +MAYÚS IZQ. [FEC_DLL] SUPR @@ -17623,85 +17623,85 @@ TAB - [FEC_LCT] -CTRL IZQ +CTRL IZQ. [FEC_MSL] -CLICK IZQ +RATÓN IZDO. [FEC_MWB] -RUEDA ABAJO +RUEDA RATÓN ABAJO [FEC_MWF] -RUEDA ARRIBA +RUEDA RATÓN ARRIBA [FEC_SPC] ESPACIO [FEC_RSF] -SHIFT DCHO +MAYÚS DCHA. [FEC_MSR] -CLICK DCHO +RATÓN DCHO. [FEC_CLK] BLOQ MAYÚS [FEC_MSM] -CLICK RUEDA +RATÓN CENTRAL [FET_CIG] -RETROCESO: limpiar acción. CLICK IZQ. o ENTER: asignar/agregar. +RETROCESO: QUITAR - BIR, INTRO: CAMBIAR [FET_EIG] -No se puede asignar un botón para ésta acción. +NO SE PUEDE DEFINIR UN CONTROL PARA ESTA ACCIÓN [FEC_CMP] COMBO: MIRAR I+D [FEC_LOR] -Mirar Derecha +Mirar hacia la derecha [FEC_LOL] -Mirar Izquierda +Mirar hacia la izquierda [FEC_LBA] -Mirar Atrás +Mirar hacia atrás [FEC_IRT] -INSERTAR +INSERT [FEC_PLS] -NUM + +NUM. + [FEC_QUE] -????? +¿¿¿??? [FEC_UNB] SIN ASIGNAR [FEC_ERI] -¡Error! Una o más acciones no están vinculadas a una tecla o botón. Verifica que todas las acciones estén configuradas. +¡Error! Una o más acciones de control no están asignadas a una tecla o botón. Comprueba que todas las acciones de control estén asignadas. [FEC_TFD] -Torreta+Inclinar Abajo +Torreta /morro abajo [FET_RIG] -Aprieta el botón/tecla que quieras para ésta acción. +ELIGE UN NUEVO CONTROL PARA ESTA ACCIÓN [FEC_TFU] -Torreta+Inclinar Arriba +Torreta /morro arriba [FEC_TFR] -Mirar+Torreta (Dcha.) +Mirar /Torreta a dcha. [FEC_TFL] -Mirar+Torreta (Izqda.) +Mirar /Torreta a izda. [FEC_ANS] Acción [FEC_HND] -Freno de Mano +Freno de mano [FEC_SPN] Esprintar @@ -17710,25 +17710,25 @@ Esprintar Saltar [FEC_CMR] -Cámara +Cambiar cámara [FEC_SUB] -Misión Secundaria +Misión secundaria [FEC_HRN] Claxon [FEC_RAD] -Cambiar Emisora +Radio [FEC_EEX] -Entrar+Salir +Entrar y salir [FEC_ZOT] -Alejar Zoom +Alejar zoom [FEC_ZIN] -Aumentar Zoom +Acercar zoom [FEC_RIG] Derecha @@ -17737,96 +17737,96 @@ Derecha Izquierda [FEC_CEN] -Centrar Cámara +Centrar cámara [FEC_BAC] Retroceder [FEC_PTT] -Objetivo Anterior +Objetivo anterior [FEC_FOR] -Avanzar/Acelerar +Avanzar [FEC_PWE] -Arma Anterior +Arma anterior [FEC_NWE] -Arma Siguiente +Siguiente arma [FEC_FIR] -Atacar/Disparar +Disparar [FEC_NTR] -Objetivo Siguiente +Siguiente objetivo [FEC_LDU] -Mirar Abajo +Mirar abajo [FEC_LUD] -Mirar Arriba +Mirar arriba { improvements & fixes } [FED_HUD] -MODO INTERFAZ: +INTERFAZ: [FED_RDM] -MAPA E ÍCONOS +MAPA E ICONOS [FED_RDB] -SOLO ÍCONOS +SOLO ICONOS [FEA_MUS] -VOL. DE RADIO: +VOLUMEN DE RADIO: [FEA_SFX] -VOL. DE EFECTOS: +VOLUMEN DE EFECTOS: [BUSTED] -¡ARRESTADO! +¡TRINCADO! [FEM_SL1] -Espacio Libre 1 +Archivo 1 no presente [FEM_SL2] -Espacio Libre 2 +Archivo 2 no presente [FEM_SL3] -Espacio Libre 3 +Archivo 3 no presente [FEM_SL4] -Espacio Libre 4 +Archivo 4 no presente [FEM_SL5] -Espacio Libre 5 +Archivo 5 no presente [FEM_SL6] -Espacio Libre 6 +Archivo 6 no presente [FEM_SL7] -Espacio Libre 7 +Archivo 7 no presente [FEM_SL8] -Espacio Libre 8 +Archivo 8 no presente [FES_DEL] -BORRAR PARTIDA +Borrar partida [FEO_CON] -Config. Controles +Configuración de controles [FEO_AUD] -Config. Audio +Configuración de audio [FEO_DIS] -Config. Pantalla +Configuración de pantalla [FEO_LAN] -Config. Idioma +Configuración de idioma [FEO_PLA] -Config. Jugador +Configuración del jugador [FEB_AUD] Audio @@ -17844,7 +17844,7 @@ AUDIO IZQUIERDA [FEH_SGA] -NUEVO JUEGO +Iniciar nueva partida [DUMMY] THIS LABEL NEEDS TO BE HERE !!! -- cgit v1.2.3 From 70c1f0640d76d90985bd181f8fb32579ca9f4e1b Mon Sep 17 00:00:00 2001 From: aap Date: Tue, 26 Jan 2021 19:24:12 +0100 Subject: add missing ferry vehicle desc --- src/modelinfo/VehicleModelInfo.cpp | 20 +++++++++++++++++++- src/modelinfo/VehicleModelInfo.h | 12 ++++++++++++ src/vehicles/Ferry.h | 13 +++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 src/vehicles/Ferry.h diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp index bd3a2154..21583709 100644 --- a/src/modelinfo/VehicleModelInfo.cpp +++ b/src/modelinfo/VehicleModelInfo.cpp @@ -15,6 +15,7 @@ #include "Automobile.h" #include "Boat.h" #include "Train.h" +#include "Ferry.h" #include "Plane.h" #include "Heli.h" #include "Bike.h" @@ -122,6 +123,22 @@ RwObjectNameIdAssocation trainIds[] = { { nil, 0, 0 } }; +RwObjectNameIdAssocation ferryIds[] = { + { "door_front_dummy", FERRY_DOOR_FRONT, VEHICLE_FLAG_LEFT | VEHICLE_FLAG_COLLAPSE }, + { "door_back_dummy", FERRY_DOOR_BACK, VEHICLE_FLAG_LEFT | VEHICLE_FLAG_COLLAPSE }, + { "ramp_front_dummy", FERRY_RAMP_FRONT, VEHICLE_FLAG_LEFT | VEHICLE_FLAG_COLLAPSE }, + { "ramp_back_dummy", FERRY_RAMP_BACK, VEHICLE_FLAG_LEFT | VEHICLE_FLAG_COLLAPSE }, + { "light_front", FERRY_POS_LIGHT_FRONT, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "light_rear", FERRY_POS_LIGHT_REAR, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "chim_left", FERRY_POS_CHIM_LEFT, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "ped_point", FERRY_POS_PED_POINT, VEHICLE_FLAG_DOOR | VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "car1_dummy", FERRY_POS_CAR1, VEHICLE_FLAG_DOOR | VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "car2_dummy", FERRY_POS_CAR2, VEHICLE_FLAG_DOOR | VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "car3_dummy", FERRY_POS_CAR3, VEHICLE_FLAG_DOOR | VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { "car4_dummy", FERRY_POS_CAR4, VEHICLE_FLAG_DOOR | VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, + { nil, 0, 0 } +}; + RwObjectNameIdAssocation heliIds[] = { { "chassis_dummy", HELI_CHASSIS, VEHICLE_FLAG_COLLAPSE }, { "toprotor", HELI_TOPROTOR, 0 }, @@ -170,7 +187,8 @@ RwObjectNameIdAssocation *CVehicleModelInfo::ms_vehicleDescs[] = { trainIds, heliIds, planeIds, - bikeIds + bikeIds, + ferryIds }; bool gbBlackCars; diff --git a/src/modelinfo/VehicleModelInfo.h b/src/modelinfo/VehicleModelInfo.h index f979c2c0..6f2cea3c 100644 --- a/src/modelinfo/VehicleModelInfo.h +++ b/src/modelinfo/VehicleModelInfo.h @@ -49,6 +49,18 @@ enum eBoatPositions BOAT_POS_FRONTSEAT }; +enum eFerryPositions +{ + FERRY_POS_LIGHT_FRONT, + FERRY_POS_LIGHT_REAR, + FERRY_POS_CHIM_LEFT, + FERRY_POS_PED_POINT, + FERRY_POS_CAR1, + FERRY_POS_CAR2, + FERRY_POS_CAR3, + FERRY_POS_CAR4 +}; + enum eTrainPositions { TRAIN_POS_LIGHT_FRONT, diff --git a/src/vehicles/Ferry.h b/src/vehicles/Ferry.h new file mode 100644 index 00000000..375dfce1 --- /dev/null +++ b/src/vehicles/Ferry.h @@ -0,0 +1,13 @@ +#pragma once + +#include "Vehicle.h" +#include "Door.h" + +enum eFerryNodes +{ + FERRY_DOOR_FRONT = 1, + FERRY_RAMP_FRONT, + FERRY_DOOR_BACK, + FERRY_RAMP_BACK, + NUM_FERRY_NODES +}; -- cgit v1.2.3 From 433baf5f3c9963c8636fd111ad56f56727b15947 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Thu, 28 Jan 2021 01:08:06 +0300 Subject: fix --- src/control/Script8.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/control/Script8.cpp b/src/control/Script8.cpp index 53e39b68..c53f852d 100644 --- a/src/control/Script8.cpp +++ b/src/control/Script8.cpp @@ -437,7 +437,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command) } case COMMAND_DOT_PRODUCT_3D: { - CollectParameters(&m_nIp, 4); + CollectParameters(&m_nIp, 6); float X1 = GET_FLOAT_PARAM(0); float Y1 = GET_FLOAT_PARAM(1); float Z1 = GET_FLOAT_PARAM(2); -- cgit v1.2.3 From 3f8e258055cd1d10a9496995f329c6a08ebdea30 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Thu, 28 Jan 2021 01:50:10 +0300 Subject: fix --- src/control/Script6.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/control/Script6.cpp b/src/control/Script6.cpp index acc84c31..0e1256fd 100644 --- a/src/control/Script6.cpp +++ b/src/control/Script6.cpp @@ -632,7 +632,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command) if (GET_INTEGER_PARAM(2) < 0) pPed->WarpPedIntoCarAsPassenger(pVehicle, GET_INTEGER_PARAM(2)); else { - script_assert(GET_INTEGER_PARAM(1) >= 0 && GET_INTEGER_PARAM(1) < ARRAY_SIZE(pVehicle->pPassengers)); + script_assert(GET_INTEGER_PARAM(2) >= 0 && GET_INTEGER_PARAM(2) < ARRAY_SIZE(pVehicle->pPassengers)); pPed->WarpPedIntoCarAsPassenger(pVehicle, GET_INTEGER_PARAM(2)); } return 0; -- cgit v1.2.3 From 9fc0ec0bf4ed7d83195255d241652feb76d49a9b Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Thu, 28 Jan 2021 02:41:21 +0300 Subject: I hate ATanOfXY pt 2 --- src/control/Script10.cpp | 4 ++-- src/control/Script9.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/control/Script10.cpp b/src/control/Script10.cpp index fef33848..6514ebe5 100644 --- a/src/control/Script10.cpp +++ b/src/control/Script10.cpp @@ -223,8 +223,8 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command) CObject* pObject = CPools::GetObjectPool()->GetAt(GET_INTEGER_PARAM(0)); script_assert(pObject); SET_FLOAT_PARAM(1, LimitAngleOnCircle(RADTODEG(Asin(pObject->GetForward().z)))); - SET_FLOAT_PARAM(2, LimitAngleOnCircle(RADTODEG(CGeneral::GetATanOfXY(pObject->GetForward().x, pObject->GetForward().y)))); - SET_FLOAT_PARAM(0, LimitAngleOnCircle(RADTODEG(CGeneral::GetATanOfXY(pObject->GetUp().z, pObject->GetRight().z)))); + SET_FLOAT_PARAM(2, LimitAngleOnCircle(RADTODEG(Atan2(-pObject->GetForward().x, pObject->GetForward().y)))); + SET_FLOAT_PARAM(0, LimitAngleOnCircle(RADTODEG(Atan2(-pObject->GetRight().z, pObject->GetUp().z)))); StoreParameters(&m_nIp, 3); return 0; } diff --git a/src/control/Script9.cpp b/src/control/Script9.cpp index 020221c4..3a68e239 100644 --- a/src/control/Script9.cpp +++ b/src/control/Script9.cpp @@ -431,8 +431,8 @@ int8 CRunningScript::ProcessCommands1500To1599(int32 command) CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(0)); script_assert(pVehicle); SET_FLOAT_PARAM(1, LimitAngleOnCircle(RADTODEG(Asin(pVehicle->GetForward().z)))); - SET_FLOAT_PARAM(2, LimitAngleOnCircle(RADTODEG(CGeneral::GetATanOfXY(pVehicle->GetForward().x, pVehicle->GetForward().y)))); - SET_FLOAT_PARAM(0, LimitAngleOnCircle(RADTODEG(CGeneral::GetATanOfXY(pVehicle->GetUp().z, pVehicle->GetRight().z)))); + SET_FLOAT_PARAM(2, LimitAngleOnCircle(RADTODEG(Atan2(-pVehicle->GetForward().x, pVehicle->GetForward().y)))); + SET_FLOAT_PARAM(0, LimitAngleOnCircle(RADTODEG(Atan2(-pVehicle->GetRight().z, pVehicle->GetUp().z)))); StoreParameters(&m_nIp, 3); return 0; } -- cgit v1.2.3 From 2d5f087041f45d81fafea98ea54ba4dca04f7794 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Thu, 28 Jan 2021 23:23:49 +0300 Subject: fix --- src/control/Script3.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/control/Script3.cpp b/src/control/Script3.cpp index 7acfdfc8..f05c21eb 100644 --- a/src/control/Script3.cpp +++ b/src/control/Script3.cpp @@ -1714,6 +1714,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command) pBoat->AutoPilot.m_nCarMission = MISSION_GOTOCOORDS_ASTHECROWSWIMS; pBoat->AutoPilot.m_vecDestinationCoors = pos; pBoat->SetStatus(STATUS_PHYSICS); + pBoat->bEngineOn = true; pBoat->AutoPilot.m_nCruiseSpeed = Max(1, pBoat->AutoPilot.m_nCruiseSpeed); pBoat->AutoPilot.m_nAntiReverseTimer = CTimer::GetTimeInMilliseconds(); return 0; -- cgit v1.2.3 From 4270180b8bb9bc67b36c1ea653ad9d25cf61bf1c Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Fri, 29 Jan 2021 00:05:57 +0300 Subject: fix --- src/control/Script.cpp | 4 ++-- src/control/Script8.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 1b1b9045..d12bbb40 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -1608,7 +1608,7 @@ const tScriptCommandData commands[] = { REGISTER_COMMAND(COMMAND_SET_NAVIGATION_ARROW, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_CLEAR_NAVIGATION_ARROW, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_CALL, INPUT_ARGUMENTS(ARGTYPE_FUNCTION, ), OUTPUT_ARGUMENTS(), false, -1, ""), - REGISTER_COMMAND(COMMAND_CALLNOT, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""), + REGISTER_COMMAND(COMMAND_CALLNOT, INPUT_ARGUMENTS(ARGTYPE_FUNCTION, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_IS_CAR_AUTOMOBILE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), true, -1, ""), REGISTER_COMMAND(COMMAND_IS_CAR_BIKE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), true, -1, ""), REGISTER_COMMAND(COMMAND_IS_CAR_PLANE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), true, -1, ""), @@ -1649,7 +1649,7 @@ const tScriptCommandData commands[] = { REGISTER_COMMAND(COMMAND_SET_DRAW_HUD, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_GET_RANDOM_CHAR_IN_AREA_NO_CHECKS, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_GET_RANDOM_CAR_IN_AREA_NO_CHECKS_NO_SAVE, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""), - REGISTER_COMMAND(COMMAND_STORE_CAR_COLLIDED_WITH_NO_SAVE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), + REGISTER_COMMAND(COMMAND_STORE_CAR_COLLIDED_WITH_NO_SAVE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(ARGTYPE_INT, ), false, -1, ""), REGISTER_COMMAND(COMMAND_DISABLE_FERRY_PATH, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_ENABLE_FERRY_PATH, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_GET_CLOSEST_DOCKED_FERRY, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(ARGTYPE_INT, ), false, -1, ""), diff --git a/src/control/Script8.cpp b/src/control/Script8.cpp index c53f852d..8a1612fb 100644 --- a/src/control/Script8.cpp +++ b/src/control/Script8.cpp @@ -788,6 +788,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command) } } } + StoreParameters(&m_nIp, 1); return 0; } default: -- cgit v1.2.3 From a0c5d75f8350387e48aba997b154614920846247 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sat, 30 Jan 2021 14:53:51 +0300 Subject: fixed bike bomb --- src/core/World.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/World.cpp b/src/core/World.cpp index eccbcd89..da1c58b2 100644 --- a/src/core/World.cpp +++ b/src/core/World.cpp @@ -2218,8 +2218,12 @@ CWorld::UseDetonator(CEntity *pEntity) { int32 i = CPools::GetVehiclePool()->GetSize(); while(--i >= 0) { +#ifdef FIX_BUGS + CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i); +#else CAutomobile *pVehicle = (CAutomobile *)CPools::GetVehiclePool()->GetSlot(i); - if(pVehicle && !pVehicle->m_vehType && pVehicle->m_bombType == CARBOMB_REMOTE && +#endif + if(pVehicle && pVehicle->m_bombType == CARBOMB_REMOTE && pVehicle->m_pBombRigger == pEntity) { pVehicle->m_bombType = CARBOMB_NONE; pVehicle->m_nBombTimer = 500; -- cgit v1.2.3 From 2c29ab5542abf64eb87e09ff35069a29c780087a Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sat, 30 Jan 2021 20:26:10 +0300 Subject: fix --- src/control/Garages.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp index 0b1f8e19..ede252a7 100644 --- a/src/control/Garages.cpp +++ b/src/control/Garages.cpp @@ -1357,7 +1357,7 @@ bool CGarage::IsAnyOtherCarTouchingGarage(CVehicle * pException) uint32 i = CPools::GetVehiclePool()->GetSize(); while (i--) { CVehicle* pVehicle = CPools::GetVehiclePool()->GetSlot(i); - if (!pVehicle || pVehicle == pException) + if (!pVehicle || pVehicle == pException || pVehicle->GetStatus() == STATUS_WRECKED) continue; if (!IsEntityTouching3D(pVehicle)) continue; -- cgit v1.2.3