The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-12-24 08:41:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed script issues

Browse Source
This commit is contained in:
Nikolay Korolev 2019-07-20 16:30:11 +03:00
parent be8e29e4e2
commit ef831a491e
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/control/Script.cpp
View File

@ -79,6 +79,7 @@ CMissionCleanup::CMissionCleanup()
void CMissionCleanup::Init()
{
m_nCount = 0;
for (int i = 0; i < MAX_CLEANUP; i++){
m_sEntities[i].type = CLEANUP_UNUSED;
m_sEntities[i].id = 0;
@ -102,7 +103,7 @@ void CMissionCleanup::AddEntityToList(int32 id, uint8 type)
return;
pNew->id = id;
pNew->type = type;
m_bCount++;
m_nCount++;
}
void CMissionCleanup::RemoveEntityFromList(int32 id, uint8 type)
@ -111,6 +112,7 @@ void CMissionCleanup::RemoveEntityFromList(int32 id, uint8 type)
if (m_sEntities[i].type == type && m_sEntities[i].id == id){
m_sEntities[i].id = 0;
m_sEntities[i].type = CLEANUP_UNUSED;
m_nCount--;
}
}
}
@ -603,7 +605,7 @@ void CTheScripts::Process()
if (UseTextCommands){
for (int i = 0; i < MAX_NUM_INTRO_TEXT_LINES; i++)
IntroTextLines[i].Reset();
NumberOfIntroRectanglesThisFrame = 0;
NumberOfIntroTextLinesThisFrame = 0;
for (int i = 0; i < MAX_NUM_INTRO_RECTANGLES; i++){
IntroRectangles[i].m_bIsUsed = false;
IntroRectangles[i].m_bBeforeFade = false;
@ -1638,27 +1640,27 @@ int8 CRunningScript::ProcessCommandsFrom100To199(int32 command)
CollectParameters(&m_nIp, 5);
switch (ScriptParams[1]) {
case MI_COP:
if (ScriptParams[0] = PEDTYPE_COP)
if (ScriptParams[0] == PEDTYPE_COP)
ScriptParams[1] = COP_STREET;
break;
case MI_SWAT:
if (ScriptParams[0] = PEDTYPE_COP)
if (ScriptParams[0] == PEDTYPE_COP)
ScriptParams[1] = COP_SWAT;
break;
case MI_FBI:
if (ScriptParams[0] = PEDTYPE_COP)
if (ScriptParams[0] == PEDTYPE_COP)
ScriptParams[1] = COP_FBI;
break;
case MI_ARMY:
if (ScriptParams[0] = PEDTYPE_COP)
if (ScriptParams[0] == PEDTYPE_COP)
ScriptParams[1] = COP_ARMY;
break;
case MI_MEDIC:
if (ScriptParams[0] = PEDTYPE_EMERGENCY)
if (ScriptParams[0] == PEDTYPE_EMERGENCY)
ScriptParams[1] = PEDTYPE_EMERGENCY;
break;
case MI_FIREMAN:
if (ScriptParams[0] = PEDTYPE_FIREMAN)
if (ScriptParams[0] == PEDTYPE_FIREMAN)
ScriptParams[1] = PEDTYPE_FIREMAN;
break;
default:

2
src/control/Script.h
View File

@ -137,7 +137,7 @@ enum {
class CMissionCleanup
{
CMissionCleanupEntity m_sEntities[MAX_CLEANUP];
uint8 m_bCount;
uint8 m_nCount;
public:
CMissionCleanup();