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

Add bike leftovers

Browse source
This commit is contained in:
Sergeanur 2020-12-28 13:44:20 +02:00
parent dc96a49dfd
commit 7eb96d5373
3 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/entities/Physical.cpp
View file

@ -16,6 +16,7 @@
#include "DMAudio.h" #include "DMAudio.h"
#include "Automobile.h" #include "Automobile.h"
#include "Physical.h" #include "Physical.h"
#include "Bike.h"
CPhysical::CPhysical(void) CPhysical::CPhysical(void)
{ {
@ -1917,7 +1918,11 @@ CPhysical::ProcessCollision(void)
car->m_aSuspensionSpringRatio[2] = 1.0f; car->m_aSuspensionSpringRatio[2] = 1.0f;
car->m_aSuspensionSpringRatio[3] = 1.0f; car->m_aSuspensionSpringRatio[3] = 1.0f;
}else if(veh->m_vehType == VEHICLE_TYPE_BIKE){ }else if(veh->m_vehType == VEHICLE_TYPE_BIKE){
assert(0 && "TODO - but unused"); CBike* bike = (CBike*)this;
bike->m_aSuspensionSpringRatio[0] = 1.0f;
bike->m_aSuspensionSpringRatio[1] = 1.0f;
bike->m_aSuspensionSpringRatio[2] = 1.0f;
bike->m_aSuspensionSpringRatio[3] = 1.0f;
} }
} }
} }

7
src/peds/Population.cpp
View file

@ -22,6 +22,7 @@
#include "DummyObject.h" #include "DummyObject.h"
#include "Script.h" #include "Script.h"
#include "Shadows.h" #include "Shadows.h"
#include "Bike.h"
#define MIN_CREATION_DIST 40.0f // not for start of the game (look at the GeneratePedsAtStartOfGame) #define MIN_CREATION_DIST 40.0f // not for start of the game (look at the GeneratePedsAtStartOfGame)
#define CREATION_RANGE 10.0f // added over the MIN_CREATION_DIST. #define CREATION_RANGE 10.0f // added over the MIN_CREATION_DIST.
@ -833,11 +834,11 @@ CPopulation::AddPedInCar(CVehicle* car)
newPed->SetCurrentWeapon(WEAPONTYPE_COLT45); newPed->SetCurrentWeapon(WEAPONTYPE_COLT45);
newPed->RemoveWeaponModel(CWeaponInfo::GetWeaponInfo(newPed->GetWeapon()->m_eWeaponType)->m_nModelId); newPed->RemoveWeaponModel(CWeaponInfo::GetWeaponInfo(newPed->GetWeapon()->m_eWeaponType)->m_nModelId);
} }
/*
// Miami leftover // Miami leftover
if (car->m_vehType == VEHICLE_TYPE_BIKE) { if (car->m_vehType == VEHICLE_TYPE_BIKE) {
newPed->m_pVehicleAnim = CAnimManager::BlendAnimation(newPed->GetClump(), ASSOCGRP_STD, *((CBike*)car + 308h), 100.0f); newPed->m_pVehicleAnim = CAnimManager::BlendAnimation(newPed->GetClump(), ASSOCGRP_STD, ((CBike*)car)->m_bikeSitAnimation, 100.0f);
} else */ } else
// FIX: Make peds comfortable while driving car/boat // FIX: Make peds comfortable while driving car/boat
#ifdef FIX_BUGS #ifdef FIX_BUGS

10
src/vehicles/Bike.h
View file

@ -13,3 +13,13 @@ enum eBikeNodes {
BIKE_HANDLEBARS, BIKE_HANDLEBARS,
BIKE_NUM_NODES BIKE_NUM_NODES
}; };
class CBike : public CVehicle
{
public:
RwFrame *m_aBikeNodes[BIKE_NUM_NODES]; // assuming
uint8 unk1[96];
AnimationId m_bikeSitAnimation;
uint8 unk2[180];
float m_aSuspensionSpringRatio[4];
};