mirrors
/
re3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'miami' of github.com:GTAmodding/re3 into miami

This commit is contained in:
aap 2020-11-01 10:29:37 +01:00
parent 7f5806b727 20ea2fde84
commit 9598a90627
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/vehicles/Automobile.cpp
View File

@ -79,7 +79,7 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
bBigWheels = false; bBigWheels = false;
bWaterTight = false; bWaterTight = false;
SetModelIndex(id); CAutomobile::SetModelIndex(id);
// Already done in CVehicle... // Already done in CVehicle...
switch(GetModelIndex()){ switch(GetModelIndex()){

2
src/vehicles/Boat.cpp
View File

@ -60,7 +60,7 @@ CBoat::CBoat(int mi, uint8 owner) : CVehicle(owner)
m_fMovingSpeed = 0.0f; m_fMovingSpeed = 0.0f;
m_skimmerThingTimer = 0.0f; m_skimmerThingTimer = 0.0f;
m_nPoliceShoutTimer = CTimer::GetTimeInMilliseconds(); m_nPoliceShoutTimer = CTimer::GetTimeInMilliseconds();
SetModelIndex(mi); CBoat::SetModelIndex(mi);
pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)minfo->m_handlingId); pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)minfo->m_handlingId);
pFlyingHandling = mod_HandlingManager.GetFlyingPointer((eHandlingId)minfo->m_handlingId); pFlyingHandling = mod_HandlingManager.GetFlyingPointer((eHandlingId)minfo->m_handlingId);

2
src/vehicles/Train.cpp
View File

@ -45,7 +45,7 @@ CTrain::CTrain(int32 id, uint8 CreatedBy)
CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id); CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
m_vehType = VEHICLE_TYPE_TRAIN; m_vehType = VEHICLE_TYPE_TRAIN;
pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)mi->m_handlingId); pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)mi->m_handlingId);
SetModelIndex(id); CTrain::SetModelIndex(id);
Doors[0].Init(0.8f, 0.0f, 1, 0); Doors[0].Init(0.8f, 0.0f, 1, 0);
Doors[1].Init(-0.8f, 0.0f, 0, 0); Doors[1].Init(-0.8f, 0.0f, 0, 0);