mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-11-15 10:39:00 +00:00
Code Issues Projects Releases Wiki Activity

Fixed merge errors

Browse source
This commit is contained in:
Nikolay Korolev 2019-06-26 23:47:23 +03:00
parent 08b053a568
commit fa132bb773
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Streaming.cpp
View file

@ -1585,7 +1585,6 @@ CStreaming::UpdateMemoryUsed(void)
} }
WRAPPER void CStreaming::LoadScene(CVector *pos) { EAXJMP(0x40A6D0); } WRAPPER void CStreaming::LoadScene(CVector *pos) { EAXJMP(0x40A6D0); }
WRAPPER void CStreaming::LoadAllRequestedModels(bool) { EAXJMP(0x40A440); }
bool bool
CStreamingInfo::GetCdPosnAndSize(uint32 &posn, uint32 &size) CStreamingInfo::GetCdPosnAndSize(uint32 &posn, uint32 &size)

1
src/Streaming.h
View file

@ -161,5 +161,4 @@ public:
static void LoadInitialVehicles(void); static void LoadInitialVehicles(void);
static void LoadScene(CVector *pos); static void LoadScene(CVector *pos);
static void LoadAllRequestedModels(bool);
}; };

2
src/audio/DMAudio.cpp
View file

@ -19,7 +19,9 @@ WRAPPER void cDMAudio::ChangeMusicMode(uint8 mode) { EAXJMP(0x57CCF0); }
WRAPPER void cDMAudio::PlayFrontEndSound(uint32, uint32) { EAXJMP(0x57CC20); } WRAPPER void cDMAudio::PlayFrontEndSound(uint32, uint32) { EAXJMP(0x57CC20); }
WRAPPER void cDMAudio::PlayOneShot(int, uint16, float) { EAXJMP(0x57C840); } WRAPPER void cDMAudio::PlayOneShot(int, uint16, float) { EAXJMP(0x57C840); }
WRAPPER int32 cDMAudio::GetRadioInCar() { EAXJMP(0x57CE40); } WRAPPER int32 cDMAudio::GetRadioInCar() { EAXJMP(0x57CE40); }
WRAPPER uint8 cDMAudio::IsMP3RadioChannelAvailable() { EAXJMP(0x57C9F0); }
WRAPPER void cDMAudio::SetEffectsFadeVol(uint8) { EAXJMP(0x57C8F0); } WRAPPER void cDMAudio::SetEffectsFadeVol(uint8) { EAXJMP(0x57C8F0); }
WRAPPER void cDMAudio::SetMusicFadeVol(uint8) { EAXJMP(0x57C920); } WRAPPER void cDMAudio::SetMusicFadeVol(uint8) { EAXJMP(0x57C920); }
WRAPPER int32 cDMAudio::CreateEntity(int, void*) { EAXJMP(0x57C7C0); } WRAPPER int32 cDMAudio::CreateEntity(int, void*) { EAXJMP(0x57C7C0); }

4
src/control/Replay.cpp
View file

@ -419,7 +419,7 @@ void CReplay::StoreCarUpdate(CVehicle *vehicle, int id)
vp->index = id; vp->index = id;
vp->matrix.CompressFromFullMatrix(vehicle->GetMatrix()); vp->matrix.CompressFromFullMatrix(vehicle->GetMatrix());
vp->health = vehicle->m_fHealth / 4.0f; /* Not anticipated that health can be > 1000. */ vp->health = vehicle->m_fHealth / 4.0f; /* Not anticipated that health can be > 1000. */
vp->acceleration = vehicle->m_fAcceleration * 100.0f; vp->acceleration = vehicle->m_fGasPedal * 100.0f;
vp->panels = vehicle->IsCar() ? ((CAutomobile*)vehicle)->m_DamageManager.m_abPanelsStatus : 0; vp->panels = vehicle->IsCar() ? ((CAutomobile*)vehicle)->m_DamageManager.m_abPanelsStatus : 0;
vp->velocityX = 8000.0f * max(-4.0f, min(4.0f, vehicle->GetSpeed().x)); /* 8000!? */ vp->velocityX = 8000.0f * max(-4.0f, min(4.0f, vehicle->GetSpeed().x)); /* 8000!? */
vp->velocityY = 8000.0f * max(-4.0f, min(4.0f, vehicle->GetSpeed().y)); vp->velocityY = 8000.0f * max(-4.0f, min(4.0f, vehicle->GetSpeed().y));
@ -430,7 +430,7 @@ void CReplay::StoreCarUpdate(CVehicle *vehicle, int id)
if (vehicle->GetModelIndex() == MI_RHINO) if (vehicle->GetModelIndex() == MI_RHINO)
vp->car_gun = 128.0f / M_PI * ((CAutomobile*)vehicle)->m_fCarGunLR; vp->car_gun = 128.0f / M_PI * ((CAutomobile*)vehicle)->m_fCarGunLR;
else else
vp->wheel_state = 50.0f * vehicle->m_fWheelState; vp->wheel_state = 50.0f * vehicle->m_fSteerAngle;
if (vehicle->IsCar()){ if (vehicle->IsCar()){
CAutomobile* car = (CAutomobile*)vehicle; CAutomobile* car = (CAutomobile*)vehicle;
for (int i = 0; i < 4; i++){ for (int i = 0; i < 4; i++){