a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 17:20:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/miami' into lcs

Browse source 
* origin/miami:
  bug of the decade
  big oof
  colmodel fix
This commit is contained in:
Sergeanur 2021-01-12 22:29:50 +02:00
parent 55320a03f1 0afa027ab4
commit f73e870bde
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/collision/ColModel.cpp
View file

@ -24,7 +24,6 @@ CColModel::CColModel(void)
CColModel::~CColModel(void) CColModel::~CColModel(void)
{ {
RemoveCollisionVolumes(); RemoveCollisionVolumes();
RemoveTrianglePlanes();
} }
void* void*

3
src/control/Script4.cpp
View file

@ -106,7 +106,10 @@ int8 CRunningScript::ProcessCommands800To899(int32 command)
printf("Couldn't find zone - %s\n", zone); printf("Couldn't find zone - %s\n", zone);
return 0; return 0;
} }
while (zone_id >= 0) {
CTheZones::SetPedGroup(zone_id, ScriptParams[0], ScriptParams[1]); CTheZones::SetPedGroup(zone_id, ScriptParams[0], ScriptParams[1]);
zone_id = CTheZones::FindNextZoneByLabelAndReturnIndex(zone, ZONE_INFO);
}
return 0; return 0;
} }
case COMMAND_START_CAR_FIRE: case COMMAND_START_CAR_FIRE:

2
src/core/PlayerInfo.cpp
View file

@ -132,7 +132,7 @@ CPlayerInfo::Process(void)
CAutomobile *car = (CAutomobile*)m_pPed->m_pMyVehicle; CAutomobile *car = (CAutomobile*)m_pPed->m_pMyVehicle;
if (car->m_nWheelsOnGround < 3) if (car->m_nWheelsOnGround < 3)
m_nTimeNotFullyOnGround += CTimer::GetTimeInMilliseconds(); m_nTimeNotFullyOnGround += CTimer::GetTimeStepInMilliseconds();
else else
m_nTimeNotFullyOnGround = 0; m_nTimeNotFullyOnGround = 0;