summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Script.cpp9
-rw-r--r--src/control/Script.h2
-rw-r--r--src/control/Script3.cpp1
-rw-r--r--src/control/Script5.cpp2
4 files changed, 8 insertions, 6 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index 1e76e509..59af9ff2 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -98,7 +98,7 @@ bool CTheScripts::bPlayerHasMetDebbieHarry;
bool CTheScripts::bPlayerIsInTheStatium;
int CTheScripts::AllowedCollision[MAX_ALLOWED_COLLISIONS];
int CTheScripts::FSDestroyedFlag;
-short* CTheScripts::SavedVarIndices;
+uint16* CTheScripts::SavedVarIndices;
int CTheScripts::NumSaveVars;
int gScriptsFile = -1;
int CTheScripts::NextProcessId = 1;
@@ -496,7 +496,10 @@ void CMissionCleanup::Process()
CWeather::ReleaseWeather();
for (int i = 0; i < NUM_OF_SPECIAL_CHARS; 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)
CHud::m_ItemToFlash = -1;
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);
}
- for (int i = 1; i < NUMSTREAMINFO; i++) {
+ for (int i = 1; i < MODELINFOSIZE; i++) {
if (CStreaming::IsScriptOwnedModel(i))
CStreaming::SetMissionDoesntRequireModel(i);
}
diff --git a/src/control/Script.h b/src/control/Script.h
index bc16c99d..d9a109fd 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -532,7 +532,7 @@ public:
static bool bPlayerHasMetDebbieHarry;
static int AllowedCollision[MAX_ALLOWED_COLLISIONS];
- static short* SavedVarIndices;
+ static uint16* SavedVarIndices;
static int NumSaveVars;
static int FSDestroyedFlag;
static int NextProcessId;
diff --git a/src/control/Script3.cpp b/src/control/Script3.cpp
index b0f529c0..e2646866 100644
--- a/src/control/Script3.cpp
+++ b/src/control/Script3.cpp
@@ -316,7 +316,6 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
CVehicle* pTarget;
if (GET_INTEGER_PARAM(1) >= 0) {
pTarget = CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(1));
- script_assert(pTarget);
}
else {
pTarget = nil;
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp
index 174df06a..75e33e36 100644
--- a/src/control/Script5.cpp
+++ b/src/control/Script5.cpp
@@ -2811,7 +2811,7 @@ void CTheScripts::ReadObjectNamesFromScript()
int32 varSpace = GetSizeOfVariableSpace();
uint32 ip = varSpace + 8;
NumSaveVars = Read4BytesFromScript(&ip);
- SavedVarIndices = (short*)&ScriptSpace[ip];
+ SavedVarIndices = (uint16*)&ScriptSpace[ip];
ip += 2 * NumSaveVars;
NumberOfUsedObjects = Read2BytesFromScript(&ip);
ip += 2;