diff options
| -rw-r--r-- | src/control/Script.cpp | 4 | ||||
| -rw-r--r-- | src/control/Script10.cpp | 4 | ||||
| -rw-r--r-- | src/control/Script9.cpp | 4 | ||||
| -rw-r--r-- | src/core/PlayerInfo.cpp | 6 | ||||
| -rw-r--r-- | src/save/GenericGameStorage.cpp | 6 |
5 files changed, 13 insertions, 11 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 6b52ed82..187ea2a7 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -1716,7 +1716,7 @@ const tScriptCommandData commands[] = { REGISTER_COMMAND(COMMAND_CLEAR_AREA_OF_OBJECTS, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_LOAD_NON_STANDARD_PED_ANIM, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_UNLOAD_NON_STANDARD_PED_ANIM, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), - REGISTER_COMMAND(COMMAND_1566, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""), + REGISTER_COMMAND(COMMAND_1566, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_BUILD_WORLD_GEOMETRY, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_STORE_BUILDING_SWAP, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT, ARGTYPE_INT, ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_IS_MULTIPLAYER_ACTIVE, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), true, -1, ""), @@ -4568,14 +4568,12 @@ int8 CRunningScript::ProcessCommands100To199(int32 command) UpdateCompareFlag(TheCamera.IsSphereVisible(pos, GET_FLOAT_PARAM(3))); return 0; } - /* case COMMAND_DEBUG_ON: CTheScripts::DbgFlag = true; return 0; case COMMAND_DEBUG_OFF: CTheScripts::DbgFlag = false; return 0; - */ case COMMAND_RETURN_TRUE: UpdateCompareFlag(true); ReturnFromGosubOrFunction(); diff --git a/src/control/Script10.cpp b/src/control/Script10.cpp index 1a355228..2fa6ea8f 100644 --- a/src/control/Script10.cpp +++ b/src/control/Script10.cpp @@ -286,9 +286,9 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command) return 0; case COMMAND_IS_FINAL_GAME: #ifdef FINAL - UpdateCompareFlag(false); -#else UpdateCompareFlag(true); +#else + UpdateCompareFlag(false); #endif return 0; case COMMAND_SET_ALLOWED_COLLISION: diff --git a/src/control/Script9.cpp b/src/control/Script9.cpp index e03c60ba..3ad8e180 100644 --- a/src/control/Script9.cpp +++ b/src/control/Script9.cpp @@ -573,7 +573,9 @@ int8 CRunningScript::ProcessCommands1500To1599(int32 command) CollectParameters(&m_nIp, 1); // CPed::UnloadNonStandardPedAnim(SET_INTEGER_PARAM(0)); return 0; - //case COMMAND_1566: + case COMMAND_1566: + CollectParameters(&m_nIp, 1); + return 0; case COMMAND_BUILD_WORLD_GEOMETRY: CollectParameters(&m_nIp, 1); if (/*gBuildWorldGeom*/ false) { diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp index f0f3e2c6..64f3b9d0 100644 --- a/src/core/PlayerInfo.cpp +++ b/src/core/PlayerInfo.cpp @@ -420,8 +420,10 @@ CPlayerInfo::Process(void) CTimer::Update(); } m_bInRemoteMode = false; - CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle->bRemoveFromWorld = true; - CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle = nil; + if (CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle) { + CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle->bRemoveFromWorld = true; + CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle = nil; + } if (FindPlayerVehicle()) { FindPlayerVehicle()->SetStatus(STATUS_PLAYER); } diff --git a/src/save/GenericGameStorage.cpp b/src/save/GenericGameStorage.cpp index 13f15b8a..17691048 100644 --- a/src/save/GenericGameStorage.cpp +++ b/src/save/GenericGameStorage.cpp @@ -230,7 +230,7 @@ GenericSave(int file) totalSize = buf - work_buff; // Save the rest - WriteSaveDataBlock(CPools::SavePedPool, "PedPoolSize"); + //WriteSaveDataBlock(CPools::SavePedPool, "PedPoolSize"); WriteSaveDataBlock(CGarages::Save, "GaragesSize"); WriteSaveDataBlock(CGameLogic::Save, "GameLogicSize"); WriteSaveDataBlock(CPools::SaveVehiclePool, "VehPoolSize"); @@ -356,8 +356,8 @@ GenericLoad() ReadDataFromBlock("Loading Scripts \n", CTheScripts::LoadAllScripts); // Load the rest - LoadSaveDataBlock(); - ReadDataFromBlock("Loading PedPool \n", CPools::LoadPedPool); + //LoadSaveDataBlock(); + //ReadDataFromBlock("Loading PedPool \n", CPools::LoadPedPool); LoadSaveDataBlock(); ReadDataFromBlock("Loading Garages \n", CGarages::Load); LoadSaveDataBlock(); |