mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 10:10:01 +00:00
Merge branch 'lcs-dev' into lcs
This commit is contained in:
commit
a5be17d941
|
@ -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_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_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_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_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_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, ""),
|
REGISTER_COMMAND(COMMAND_IS_MULTIPLAYER_ACTIVE, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), true, -1, ""),
|
||||||
|
@ -4574,14 +4574,12 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
|
||||||
UpdateCompareFlag(TheCamera.IsSphereVisible(pos, GET_FLOAT_PARAM(3)));
|
UpdateCompareFlag(TheCamera.IsSphereVisible(pos, GET_FLOAT_PARAM(3)));
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
case COMMAND_DEBUG_ON:
|
case COMMAND_DEBUG_ON:
|
||||||
CTheScripts::DbgFlag = true;
|
CTheScripts::DbgFlag = true;
|
||||||
return 0;
|
return 0;
|
||||||
case COMMAND_DEBUG_OFF:
|
case COMMAND_DEBUG_OFF:
|
||||||
CTheScripts::DbgFlag = false;
|
CTheScripts::DbgFlag = false;
|
||||||
return 0;
|
return 0;
|
||||||
*/
|
|
||||||
case COMMAND_RETURN_TRUE:
|
case COMMAND_RETURN_TRUE:
|
||||||
UpdateCompareFlag(true);
|
UpdateCompareFlag(true);
|
||||||
ReturnFromGosubOrFunction();
|
ReturnFromGosubOrFunction();
|
||||||
|
|
|
@ -286,9 +286,9 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command)
|
||||||
return 0;
|
return 0;
|
||||||
case COMMAND_IS_FINAL_GAME:
|
case COMMAND_IS_FINAL_GAME:
|
||||||
#ifdef FINAL
|
#ifdef FINAL
|
||||||
UpdateCompareFlag(false);
|
|
||||||
#else
|
|
||||||
UpdateCompareFlag(true);
|
UpdateCompareFlag(true);
|
||||||
|
#else
|
||||||
|
UpdateCompareFlag(false);
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
case COMMAND_SET_ALLOWED_COLLISION:
|
case COMMAND_SET_ALLOWED_COLLISION:
|
||||||
|
|
|
@ -573,7 +573,9 @@ int8 CRunningScript::ProcessCommands1500To1599(int32 command)
|
||||||
CollectParameters(&m_nIp, 1);
|
CollectParameters(&m_nIp, 1);
|
||||||
// CPed::UnloadNonStandardPedAnim(SET_INTEGER_PARAM(0));
|
// CPed::UnloadNonStandardPedAnim(SET_INTEGER_PARAM(0));
|
||||||
return 0;
|
return 0;
|
||||||
//case COMMAND_1566:
|
case COMMAND_1566:
|
||||||
|
CollectParameters(&m_nIp, 1);
|
||||||
|
return 0;
|
||||||
case COMMAND_BUILD_WORLD_GEOMETRY:
|
case COMMAND_BUILD_WORLD_GEOMETRY:
|
||||||
CollectParameters(&m_nIp, 1);
|
CollectParameters(&m_nIp, 1);
|
||||||
if (/*gBuildWorldGeom*/ false) {
|
if (/*gBuildWorldGeom*/ false) {
|
||||||
|
|
|
@ -420,8 +420,10 @@ CPlayerInfo::Process(void)
|
||||||
CTimer::Update();
|
CTimer::Update();
|
||||||
}
|
}
|
||||||
m_bInRemoteMode = false;
|
m_bInRemoteMode = false;
|
||||||
CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle->bRemoveFromWorld = true;
|
if (CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle) {
|
||||||
CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle = nil;
|
CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle->bRemoveFromWorld = true;
|
||||||
|
CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle = nil;
|
||||||
|
}
|
||||||
if (FindPlayerVehicle()) {
|
if (FindPlayerVehicle()) {
|
||||||
FindPlayerVehicle()->SetStatus(STATUS_PLAYER);
|
FindPlayerVehicle()->SetStatus(STATUS_PLAYER);
|
||||||
}
|
}
|
||||||
|
|
|
@ -230,7 +230,7 @@ GenericSave(int file)
|
||||||
totalSize = buf - work_buff;
|
totalSize = buf - work_buff;
|
||||||
|
|
||||||
// Save the rest
|
// Save the rest
|
||||||
WriteSaveDataBlock(CPools::SavePedPool, "PedPoolSize");
|
//WriteSaveDataBlock(CPools::SavePedPool, "PedPoolSize");
|
||||||
WriteSaveDataBlock(CGarages::Save, "GaragesSize");
|
WriteSaveDataBlock(CGarages::Save, "GaragesSize");
|
||||||
WriteSaveDataBlock(CGameLogic::Save, "GameLogicSize");
|
WriteSaveDataBlock(CGameLogic::Save, "GameLogicSize");
|
||||||
WriteSaveDataBlock(CPools::SaveVehiclePool, "VehPoolSize");
|
WriteSaveDataBlock(CPools::SaveVehiclePool, "VehPoolSize");
|
||||||
|
@ -361,8 +361,8 @@ GenericLoad()
|
||||||
ReadDataFromBlock("Loading Scripts \n", CTheScripts::LoadAllScripts);
|
ReadDataFromBlock("Loading Scripts \n", CTheScripts::LoadAllScripts);
|
||||||
|
|
||||||
// Load the rest
|
// Load the rest
|
||||||
LoadSaveDataBlock();
|
//LoadSaveDataBlock();
|
||||||
ReadDataFromBlock("Loading PedPool \n", CPools::LoadPedPool);
|
//ReadDataFromBlock("Loading PedPool \n", CPools::LoadPedPool);
|
||||||
LoadSaveDataBlock();
|
LoadSaveDataBlock();
|
||||||
ReadDataFromBlock("Loading Garages \n", CGarages::Load);
|
ReadDataFromBlock("Loading Garages \n", CGarages::Load);
|
||||||
LoadSaveDataBlock();
|
LoadSaveDataBlock();
|
||||||
|
|
Loading…
Reference in a new issue