Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

renamed flag to R* name

Browse Source
This commit is contained in:
aap 2019-07-27 13:02:49 +02:00
parent 0aaaab3622
commit 8de701dd70
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/vehicles/Automobile.cpp
View File

@ -207,7 +207,7 @@ CAutomobile::ProcessControl(void)
int i; int i;
CColModel *colModel; CColModel *colModel;
if(bUseSpecialColModel) if(bUsingSpecialColModel)
colModel = &CWorld::Players[CWorld::PlayerInFocus].m_ColModel; colModel = &CWorld::Players[CWorld::PlayerInFocus].m_ColModel;
else else
colModel = GetColModel(); colModel = GetColModel();
@ -1423,7 +1423,7 @@ CAutomobile::ProcessEntityCollision(CEntity *ent, CColPoint *colpoints)
if(m_status != STATUS_SIMPLE) if(m_status != STATUS_SIMPLE)
bVehicleColProcessed = true; bVehicleColProcessed = true;
if(bUseSpecialColModel) if(bUsingSpecialColModel)
colModel = &CWorld::Players[CWorld::PlayerInFocus].m_ColModel; colModel = &CWorld::Players[CWorld::PlayerInFocus].m_ColModel;
else else
colModel = GetColModel(); colModel = GetColModel();
@ -1805,7 +1805,7 @@ CAutomobile::HydraulicControl(void)
if(m_status != STATUS_PLAYER){ if(m_status != STATUS_PLAYER){
// reset hydraulics for non-player cars // reset hydraulics for non-player cars
if(!bUseSpecialColModel) if(!bUsingSpecialColModel)
return; return;
if(specialColModel != nil) // this is always true if(specialColModel != nil) // this is always true
for(i = 0; i < 4; i++) for(i = 0; i < 4; i++)
@ -1825,7 +1825,7 @@ CAutomobile::HydraulicControl(void)
if(playerInfo->m_pVehicleEx == this) if(playerInfo->m_pVehicleEx == this)
playerInfo->m_pVehicleEx = nil; playerInfo->m_pVehicleEx = nil;
bUseSpecialColModel = false; bUsingSpecialColModel = false;
m_hydraulicState = 0; m_hydraulicState = 0;
return; return;
} }
@ -1839,14 +1839,14 @@ CAutomobile::HydraulicControl(void)
float extendedLowerLimit = normalLowerLimit - 0.2f; float extendedLowerLimit = normalLowerLimit - 0.2f;
float extendedSpringLength = extendedUpperLimit - extendedLowerLimit; float extendedSpringLength = extendedUpperLimit - extendedLowerLimit;
if(!bUseSpecialColModel){ if(!bUsingSpecialColModel){
// Init special col model // Init special col model
if(playerInfo->m_pVehicleEx && playerInfo->m_pVehicleEx == this) if(playerInfo->m_pVehicleEx && playerInfo->m_pVehicleEx == this)
playerInfo->m_pVehicleEx->bUseSpecialColModel = false; playerInfo->m_pVehicleEx->bUsingSpecialColModel = false;
playerInfo->m_pVehicleEx = this; playerInfo->m_pVehicleEx = this;
playerInfo->m_ColModel = *normalColModel; playerInfo->m_ColModel = *normalColModel;
bUseSpecialColModel = true; bUsingSpecialColModel = true;
specialColModel = &playerInfo->m_ColModel; specialColModel = &playerInfo->m_ColModel;
if(m_fVelocityChangeForAudio > 0.1f) if(m_fVelocityChangeForAudio > 0.1f)

2
src/vehicles/Vehicle.cpp
View File

@ -70,7 +70,7 @@ CVehicle::CVehicle(uint8 CreatedBy)
bHasBeenOwnedByPlayer = false; bHasBeenOwnedByPlayer = false;
m_veh_flagC20 = false; m_veh_flagC20 = false;
bCanBeDamaged = true; bCanBeDamaged = true;
bUseSpecialColModel = false; bUsingSpecialColModel = false;
m_veh_flagD1 = false; m_veh_flagD1 = false;
m_veh_flagD2 = false; m_veh_flagD2 = false;
m_nGunFiringTime = 0; m_nGunFiringTime = 0;

2
src/vehicles/Vehicle.h
View File

@ -191,7 +191,7 @@ public:
uint8 m_veh_flagC10 : 1; uint8 m_veh_flagC10 : 1;
uint8 m_veh_flagC20 : 1; uint8 m_veh_flagC20 : 1;
uint8 bCanBeDamaged : 1; // Set to FALSE during cut scenes to avoid explosions uint8 bCanBeDamaged : 1; // Set to FALSE during cut scenes to avoid explosions
uint8 bUseSpecialColModel : 1; uint8 bUsingSpecialColModel : 1;// Is player vehicle using special collision model, stored in player strucure
uint8 m_veh_flagD1 : 1; uint8 m_veh_flagD1 : 1;
uint8 m_veh_flagD2 : 1; uint8 m_veh_flagD2 : 1;