diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-26 22:47:23 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-26 22:47:23 +0200 |
| commit | fa132bb773394764feb453b08c4785364f19adf5 (patch) | |
| tree | 6ca5314aa824d2bf5fefd45698a66c59ee9c3b18 | |
| parent | Merge with upstream (diff) | |
| download | re3-fa132bb773394764feb453b08c4785364f19adf5.tar re3-fa132bb773394764feb453b08c4785364f19adf5.tar.gz re3-fa132bb773394764feb453b08c4785364f19adf5.tar.bz2 re3-fa132bb773394764feb453b08c4785364f19adf5.tar.lz re3-fa132bb773394764feb453b08c4785364f19adf5.tar.xz re3-fa132bb773394764feb453b08c4785364f19adf5.tar.zst re3-fa132bb773394764feb453b08c4785364f19adf5.zip | |
| -rw-r--r-- | src/Streaming.cpp | 1 | ||||
| -rw-r--r-- | src/Streaming.h | 1 | ||||
| -rw-r--r-- | src/audio/DMAudio.cpp | 2 | ||||
| -rw-r--r-- | src/control/Replay.cpp | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/Streaming.cpp b/src/Streaming.cpp index 149de7c3..93232a28 100644 --- a/src/Streaming.cpp +++ b/src/Streaming.cpp @@ -1585,7 +1585,6 @@ CStreaming::UpdateMemoryUsed(void) } WRAPPER void CStreaming::LoadScene(CVector *pos) { EAXJMP(0x40A6D0); } -WRAPPER void CStreaming::LoadAllRequestedModels(bool) { EAXJMP(0x40A440); } bool CStreamingInfo::GetCdPosnAndSize(uint32 &posn, uint32 &size) diff --git a/src/Streaming.h b/src/Streaming.h index e92819e1..d397bb18 100644 --- a/src/Streaming.h +++ b/src/Streaming.h @@ -161,5 +161,4 @@ public: static void LoadInitialVehicles(void); static void LoadScene(CVector *pos); - static void LoadAllRequestedModels(bool); }; diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp index 1a1e47ed..0bed8d4d 100644 --- a/src/audio/DMAudio.cpp +++ b/src/audio/DMAudio.cpp @@ -19,7 +19,9 @@ WRAPPER void cDMAudio::ChangeMusicMode(uint8 mode) { EAXJMP(0x57CCF0); } WRAPPER void cDMAudio::PlayFrontEndSound(uint32, uint32) { EAXJMP(0x57CC20); } WRAPPER void cDMAudio::PlayOneShot(int, uint16, float) { EAXJMP(0x57C840); } + WRAPPER int32 cDMAudio::GetRadioInCar() { EAXJMP(0x57CE40); } +WRAPPER uint8 cDMAudio::IsMP3RadioChannelAvailable() { EAXJMP(0x57C9F0); } WRAPPER void cDMAudio::SetEffectsFadeVol(uint8) { EAXJMP(0x57C8F0); } WRAPPER void cDMAudio::SetMusicFadeVol(uint8) { EAXJMP(0x57C920); } WRAPPER int32 cDMAudio::CreateEntity(int, void*) { EAXJMP(0x57C7C0); } diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp index 1c71f25f..9ac1280e 100644 --- a/src/control/Replay.cpp +++ b/src/control/Replay.cpp @@ -419,7 +419,7 @@ void CReplay::StoreCarUpdate(CVehicle *vehicle, int id) vp->index = id; vp->matrix.CompressFromFullMatrix(vehicle->GetMatrix()); 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->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)); @@ -430,7 +430,7 @@ void CReplay::StoreCarUpdate(CVehicle *vehicle, int id) if (vehicle->GetModelIndex() == MI_RHINO) vp->car_gun = 128.0f / M_PI * ((CAutomobile*)vehicle)->m_fCarGunLR; else - vp->wheel_state = 50.0f * vehicle->m_fWheelState; + vp->wheel_state = 50.0f * vehicle->m_fSteerAngle; if (vehicle->IsCar()){ CAutomobile* car = (CAutomobile*)vehicle; for (int i = 0; i < 4; i++){ |