joshua
/
re3-mirror
mirror of https://github.com/GTAmodding/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

revision

This commit is contained in:
Nikolay Korolev 2021-08-23 11:00:09 +03:00
parent 3cbf84f98b
commit 381d0b4e3e
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/control/Script.cpp
View File

@ -98,7 +98,7 @@ bool CTheScripts::bPlayerHasMetDebbieHarry;
bool CTheScripts::bPlayerIsInTheStatium; bool CTheScripts::bPlayerIsInTheStatium;
int CTheScripts::AllowedCollision[MAX_ALLOWED_COLLISIONS]; int CTheScripts::AllowedCollision[MAX_ALLOWED_COLLISIONS];
int CTheScripts::FSDestroyedFlag; int CTheScripts::FSDestroyedFlag;
short* CTheScripts::SavedVarIndices; uint16* CTheScripts::SavedVarIndices;
int CTheScripts::NumSaveVars; int CTheScripts::NumSaveVars;
int gScriptsFile = -1; int gScriptsFile = -1;
int CTheScripts::NextProcessId = 1; int CTheScripts::NextProcessId = 1;
@ -496,7 +496,10 @@ void CMissionCleanup::Process()
CWeather::ReleaseWeather(); CWeather::ReleaseWeather();
for (int i = 0; i < NUM_OF_SPECIAL_CHARS; i++) for (int i = 0; i < NUM_OF_SPECIAL_CHARS; i++)
CStreaming::SetMissionDoesntRequireSpecialChar(i); CStreaming::SetMissionDoesntRequireSpecialChar(i);
CStreaming::ms_disableStreaming = false; #ifdef GTA_NETWORK
if (!gIsMultiplayerGame)
#endif
CStreaming::ms_disableStreaming = false;
if (CHud::m_ItemToFlash != ITEM_ARMOUR && CHud::m_ItemToFlash != ITEM_HEALTH) if (CHud::m_ItemToFlash != ITEM_ARMOUR && CHud::m_ItemToFlash != ITEM_HEALTH)
CHud::m_ItemToFlash = -1; CHud::m_ItemToFlash = -1;
CHud::SetHelpMessage(nil, false); // nil, false, false, true TODO(LCS) CHud::SetHelpMessage(nil, false); // nil, false, false, true TODO(LCS)
@ -548,7 +551,7 @@ void CMissionCleanup::Process()
} }
RemoveEntityFromList(m_sEntities[i].id, m_sEntities[i].type); RemoveEntityFromList(m_sEntities[i].id, m_sEntities[i].type);
} }
for (int i = 1; i < NUMSTREAMINFO; i++) { for (int i = 1; i < MODELINFOSIZE; i++) {
if (CStreaming::IsScriptOwnedModel(i)) if (CStreaming::IsScriptOwnedModel(i))
CStreaming::SetMissionDoesntRequireModel(i); CStreaming::SetMissionDoesntRequireModel(i);
} }

2
src/control/Script.h
View File

@ -532,7 +532,7 @@ public:
static bool bPlayerHasMetDebbieHarry; static bool bPlayerHasMetDebbieHarry;
static int AllowedCollision[MAX_ALLOWED_COLLISIONS]; static int AllowedCollision[MAX_ALLOWED_COLLISIONS];
static short* SavedVarIndices; static uint16* SavedVarIndices;
static int NumSaveVars; static int NumSaveVars;
static int FSDestroyedFlag; static int FSDestroyedFlag;
static int NextProcessId; static int NextProcessId;

1
src/control/Script3.cpp
View File

@ -316,7 +316,6 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
CVehicle* pTarget; CVehicle* pTarget;
if (GET_INTEGER_PARAM(1) >= 0) { if (GET_INTEGER_PARAM(1) >= 0) {
pTarget = CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(1)); pTarget = CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(1));
script_assert(pTarget);
} }
else { else {
pTarget = nil; pTarget = nil;

2
src/control/Script5.cpp
View File

@ -2811,7 +2811,7 @@ void CTheScripts::ReadObjectNamesFromScript()
int32 varSpace = GetSizeOfVariableSpace(); int32 varSpace = GetSizeOfVariableSpace();
uint32 ip = varSpace + 8; uint32 ip = varSpace + 8;
NumSaveVars = Read4BytesFromScript(&ip); NumSaveVars = Read4BytesFromScript(&ip);
SavedVarIndices = (short*)&ScriptSpace[ip]; SavedVarIndices = (uint16*)&ScriptSpace[ip];
ip += 2 * NumSaveVars; ip += 2 * NumSaveVars;
NumberOfUsedObjects = Read2BytesFromScript(&ip); NumberOfUsedObjects = Read2BytesFromScript(&ip);
ip += 2; ip += 2;

2
src/text/Messages.h
View File

@ -23,7 +23,7 @@ struct tPreviousBrief
}; };
#define NUMBRIEFMESSAGES 8 #define NUMBRIEFMESSAGES 8
#define NUMBIGMESSAGES 6 #define NUMBIGMESSAGES 8
#define NUMPREVIOUSBRIEFS 5 #define NUMPREVIOUSBRIEFS 5
class CMessages class CMessages