a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-06 05:35:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'lcs-dev' into lcs

Browse source
This commit is contained in:
Nikolay Korolev 2021-01-20 12:12:56 +03:00
parent b1454276ed aa0f77043c
commit b4b4c996ba
9 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/control/Script.cpp
View file

@ -1642,7 +1642,7 @@ const tScriptCommandData commands[] = {
REGISTER_COMMAND(COMMAND_1489, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_1489, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
REGISTER_COMMAND(COMMAND_1490, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_1490, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
REGISTER_COMMAND(COMMAND_1491, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_1491, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
REGISTER_COMMAND(COMMAND_SET_DEBUG_MENU_ACTUVE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_SET_DEBUG_MENU_ACTIVE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
REGISTER_COMMAND(COMMAND_SET_DRAW_HUD, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), 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_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_GET_RANDOM_CAR_IN_AREA_NO_CHECKS_NO_SAVE, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
@ -1750,7 +1750,7 @@ const tScriptCommandData commands[] = {
REGISTER_COMMAND(COMMAND_REGISTER_HIGHEST_LEVEL_SLASH_TV, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_REGISTER_HIGHEST_LEVEL_SLASH_TV, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
REGISTER_COMMAND(COMMAND_ADD_MONEY_MADE_WITH_SLASH_TV, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_ADD_MONEY_MADE_WITH_SLASH_TV, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
REGISTER_COMMAND(COMMAND_ADD_TOTAL_KILLS_ON_SLASH_TV, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_ADD_TOTAL_KILLS_ON_SLASH_TV, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
REGISTER_COMMAND(COMMAND_ADD_NOODLES_DELIEVERED, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_ADD_NOODLES_DELIVERED, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
REGISTER_COMMAND(COMMAND_REGISTER_SCRAPYARD_CHALLENGE_SCORE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_REGISTER_SCRAPYARD_CHALLENGE_SCORE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
REGISTER_COMMAND(COMMAND_REGISTER_9MM_MAYHEM_SCORE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_REGISTER_9MM_MAYHEM_SCORE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
REGISTER_COMMAND(COMMAND_REGISTER_SCOOTER_SHOOTER_SCORE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""), REGISTER_COMMAND(COMMAND_REGISTER_SCOOTER_SHOOTER_SCORE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),

7
src/control/Script.h
View file

@ -568,16 +568,13 @@ public:
return; return;
} }
} }
else if (m_nAndOrState >= ORS_1 && m_nAndOrState <= ORS_8) { else {
m_bCondResult |= flag; m_bCondResult |= flag;
if (m_nAndOrState == ORS_1) { if (m_nAndOrState <= ORS_1) {
m_nAndOrState = ANDOR_NONE; m_nAndOrState = ANDOR_NONE;
return; return;
} }
} }
else {
return;
}
m_nAndOrState--; m_nAndOrState--;
} }
int16 GetPadState(uint16, uint16); int16 GetPadState(uint16, uint16);

2
src/control/Script10.cpp
View file

@ -27,7 +27,7 @@ bool gDeveloperFlag;
int8 CRunningScript::ProcessCommands1600To1699(int32 command) int8 CRunningScript::ProcessCommands1600To1699(int32 command)
{ {
switch (command) { switch (command) {
case COMMAND_ADD_NOODLES_DELIEVERED: case COMMAND_ADD_NOODLES_DELIVERED:
CollectParameters(&m_nIp, 1); CollectParameters(&m_nIp, 1);
// CStats::NoodlesDelievered += GET_INTEGER_PARAM(0); // CStats::NoodlesDelievered += GET_INTEGER_PARAM(0);
return 0; return 0;

18
src/control/Script5.cpp
View file

@ -2222,9 +2222,13 @@ INITSAVEBUF
script_assert(ReadSaveBuf<uint32>(buf) == SCRIPT_DATA_SIZE); script_assert(ReadSaveBuf<uint32>(buf) == SCRIPT_DATA_SIZE);
OnAMissionFlag = ReadSaveBuf<uint32>(buf); OnAMissionFlag = ReadSaveBuf<uint32>(buf);
LastMissionPassedTime = ReadSaveBuf<uint32>(buf); LastMissionPassedTime = ReadSaveBuf<uint32>(buf);
for (uint32 i = 0; i < MAX_NUM_COLLECTIVES; i++)
CollectiveArray[i] = ReadSaveBuf<tCollectiveData>(buf);
NextFreeCollectiveIndex = ReadSaveBuf<int32>(buf);
for (uint32 i = 0; i < MAX_NUM_BUILDING_SWAPS; i++) { for (uint32 i = 0; i < MAX_NUM_BUILDING_SWAPS; i++) {
uint32 type = ReadSaveBuf<uint32>(buf); uint32 type = ReadSaveBuf<uint32>(buf);
uint32 handle = ReadSaveBuf<uint32>(buf); uint32 handle = ReadSaveBuf<uint32>(buf);
/*
switch (type) { switch (type) {
case 0: case 0:
BuildingSwapArray[i].m_pBuilding = nil; BuildingSwapArray[i].m_pBuilding = nil;
@ -2238,14 +2242,18 @@ INITSAVEBUF
default: default:
script_assert(false); script_assert(false);
} }
BuildingSwapArray[i].m_nNewModel = ReadSaveBuf<uint32>(buf); */
BuildingSwapArray[i].m_nOldModel = ReadSaveBuf<uint32>(buf); /*BuildingSwapArray[i].m_nNewModel = */ReadSaveBuf<uint32>(buf);
/*BuildingSwapArray[i].m_nOldModel = */ReadSaveBuf<uint32>(buf);
/*
if (BuildingSwapArray[i].m_pBuilding) if (BuildingSwapArray[i].m_pBuilding)
BuildingSwapArray[i].m_pBuilding->ReplaceWithNewModel(BuildingSwapArray[i].m_nNewModel); BuildingSwapArray[i].m_pBuilding->ReplaceWithNewModel(BuildingSwapArray[i].m_nNewModel);
*/
} }
for (uint32 i = 0; i < MAX_NUM_INVISIBILITY_SETTINGS; i++) { for (uint32 i = 0; i < MAX_NUM_INVISIBILITY_SETTINGS; i++) {
uint32 type = ReadSaveBuf<uint32>(buf); uint32 type = ReadSaveBuf<uint32>(buf);
uint32 handle = ReadSaveBuf<uint32>(buf); uint32 handle = ReadSaveBuf<uint32>(buf);
/*
switch (type) { switch (type) {
case 0: case 0:
InvisibilitySettingArray[i] = nil; InvisibilitySettingArray[i] = nil;
@ -2267,9 +2275,10 @@ INITSAVEBUF
} }
if (InvisibilitySettingArray[i]) if (InvisibilitySettingArray[i])
InvisibilitySettingArray[i]->bIsVisible = false; InvisibilitySettingArray[i]->bIsVisible = false;
*/
} }
script_assert(ReadSaveBuf<bool>(buf) == bUsingAMultiScriptFile); script_assert(ReadSaveBuf<bool>(buf) == bUsingAMultiScriptFile);
bPlayerHasMetDebbieHarry = ReadSaveBuf<uint8>(buf); /*bPlayerHasMetDebbieHarry = */ReadSaveBuf<uint8>(buf);
ReadSaveBuf<uint16>(buf); ReadSaveBuf<uint16>(buf);
script_assert(ReadSaveBuf<uint32>(buf) == MainScriptSize); script_assert(ReadSaveBuf<uint32>(buf) == MainScriptSize);
script_assert(ReadSaveBuf<uint32>(buf) == LargestMissionScriptSize); script_assert(ReadSaveBuf<uint32>(buf) == LargestMissionScriptSize);
@ -2277,7 +2286,8 @@ INITSAVEBUF
script_assert(ReadSaveBuf<uint16>(buf) == NumberOfExclusiveMissionScripts); script_assert(ReadSaveBuf<uint16>(buf) == NumberOfExclusiveMissionScripts);
uint32 runningScripts = ReadSaveBuf<uint32>(buf); uint32 runningScripts = ReadSaveBuf<uint32>(buf);
for (uint32 i = 0; i < runningScripts; i++) for (uint32 i = 0; i < runningScripts; i++)
StartNewScript(0)->Load(buf); CRunningScript().Load(buf);
StartTestScript(); // <- tmp hack
return true; return true;
VALIDATESAVEBUF(size) VALIDATESAVEBUF(size)
} }

2
src/control/Script8.cpp
View file

@ -681,7 +681,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
//case COMMAND_1489: //case COMMAND_1489:
//case COMMAND_1490: //case COMMAND_1490:
//case COMMAND_1491: //case COMMAND_1491:
case COMMAND_SET_DEBUG_MENU_ACTUVE: case COMMAND_SET_DEBUG_MENU_ACTIVE:
CollectParameters(&m_nIp, 1); CollectParameters(&m_nIp, 1);
// this sets two values on PS2, but not on mobile - TODO? // this sets two values on PS2, but not on mobile - TODO?
return 0; return 0;

4
src/control/ScriptCommands.h
View file

@ -1493,7 +1493,7 @@ enum {
COMMAND_1489, COMMAND_1489,
COMMAND_1490, COMMAND_1490,
COMMAND_1491, COMMAND_1491,
COMMAND_SET_DEBUG_MENU_ACTUVE, COMMAND_SET_DEBUG_MENU_ACTIVE,
COMMAND_SET_DRAW_HUD, COMMAND_SET_DRAW_HUD,
COMMAND_GET_RANDOM_CHAR_IN_AREA_NO_CHECKS, COMMAND_GET_RANDOM_CHAR_IN_AREA_NO_CHECKS,
COMMAND_GET_RANDOM_CAR_IN_AREA_NO_CHECKS_NO_SAVE, COMMAND_GET_RANDOM_CAR_IN_AREA_NO_CHECKS_NO_SAVE,
@ -1601,7 +1601,7 @@ enum {
COMMAND_REGISTER_HIGHEST_LEVEL_SLASH_TV, COMMAND_REGISTER_HIGHEST_LEVEL_SLASH_TV,
COMMAND_ADD_MONEY_MADE_WITH_SLASH_TV, COMMAND_ADD_MONEY_MADE_WITH_SLASH_TV,
COMMAND_ADD_TOTAL_KILLS_ON_SLASH_TV, COMMAND_ADD_TOTAL_KILLS_ON_SLASH_TV,
COMMAND_ADD_NOODLES_DELIEVERED, COMMAND_ADD_NOODLES_DELIVERED,
COMMAND_REGISTER_SCRAPYARD_CHALLENGE_SCORE, COMMAND_REGISTER_SCRAPYARD_CHALLENGE_SCORE,
COMMAND_REGISTER_9MM_MAYHEM_SCORE, COMMAND_REGISTER_9MM_MAYHEM_SCORE,
COMMAND_REGISTER_SCOOTER_SHOOTER_SCORE, COMMAND_REGISTER_SCOOTER_SHOOTER_SCORE,

6
src/core/Frontend.cpp
View file

@ -3369,9 +3369,9 @@ CMenuManager::Process(void)
#ifdef XBOX_MESSAGE_SCREEN #ifdef XBOX_MESSAGE_SCREEN
ProcessDialogTimer(); ProcessDialogTimer();
#endif #endif
// tmp hack to get saving to work
if (TheCamera.GetScreenFadeStatus() != FADE_0) //if (TheCamera.GetScreenFadeStatus() != FADE_0)
return; // return;
InitialiseChangedLanguageSettings(); InitialiseChangedLanguageSettings();

2
src/core/config.h
View file

@ -212,7 +212,7 @@ enum Config {
# define PS2_MATFX # define PS2_MATFX
# endif # endif
# define PC_PLAYER_CONTROLS // mouse player/cam mode # define PC_PLAYER_CONTROLS // mouse player/cam mode
# //define GTA_REPLAY //# define GTA_REPLAY
# define GTA_SCENE_EDIT # define GTA_SCENE_EDIT
#elif defined GTA_XBOX #elif defined GTA_XBOX
#endif #endif

2
src/save/GenericGameStorage.cpp
View file

@ -44,7 +44,7 @@
// --MIAMI: file done // --MIAMI: file done
#define BLOCK_COUNT 22 #define BLOCK_COUNT 22
#define SIZE_OF_SIMPLEVARS 0xE4 #define SIZE_OF_SIMPLEVARS 0xE8
const uint32 SIZE_OF_ONE_GAME_IN_BYTES = 201729; const uint32 SIZE_OF_ONE_GAME_IN_BYTES = 201729;