archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-29 11:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge with upstream

Browse Source
This commit is contained in:
Nikolay Korolev
2020-01-01 02:42:00 +03:00
parent 80453d3f4d b83adc2cc9
commit 5b0cf80a76
70 changed files with 4022 additions and 840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vehicles/Automobile.cpp
View File

@ -1014,7 +1014,7 @@ CAutomobile::ProcessControl(void)
m_vecMoveSpeed.Magnitude() > 0.0f && CTimer::GetTimeStep() > 0.0f){
FlyingControl(FLIGHT_MODEL_DODO);
}else if(GetModelIndex() == MI_MIAMI_RCBARON){
FlyingControl(FLIGHT_MODEL_HELI);
FlyingControl(FLIGHT_MODEL_RCPLANE);
}else if(GetModelIndex() == MI_MIAMI_RCRAIDER || GetModelIndex() == MI_MIAMI_SPARROW || bAllCarCheat){
if(CPad::GetPad(0)->GetCircleJustDown())
m_aWheelSpeed[0] = max(m_aWheelSpeed[0]-0.03f, 0.0f);
@ -1918,7 +1918,7 @@ CAutomobile::Render(void)
CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex());
if(GetModelIndex() == MI_RHINO && m_aCarNodes[CAR_BONNET]){
// Rhino has no bonnet...what are we doing here?
// Rotate Rhino turret
CMatrix m;
CVector p;
m.Attach(RwFrameGetMatrix(m_aCarNodes[CAR_BONNET]));

4
src/vehicles/Vehicle.h
View File

@ -288,7 +288,7 @@ class cTransmission;
class cVehicleParams
{
public:
uint8 m_bDistancECalculated;
bool m_bDistanceCalculated;
char gap_1[3];
float m_fDistance;
CVehicle *m_pVehicle;
@ -297,4 +297,4 @@ public:
float m_fVelocityChange;
};
static_assert(sizeof(cVehicleParams) == 0x18, "CVehicle: error");
static_assert(sizeof(cVehicleParams) == 0x18, "cVehicleParams: error");