diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-29 19:40:10 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-08-29 19:40:10 +0300 |
| commit | c5c887cc11ce9ac5cbcd9683ab7673da65bab612 (patch) | |
| tree | cc8e4cc133a2aa7d7f15e42adb6f17dfbb05f190 /src/vehicles | |
| parent | 453f8c05a4fc2ef03ba1d4f7bac43ba871c52fbd (diff) | |
| parent | 47c23ba9170ab6df457516292eda100bc09ac2eb (diff) | |
merge
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Boat.cpp | 4 | ||||
| -rw-r--r-- | src/vehicles/Ferry.cpp | 7 | ||||
| -rw-r--r-- | src/vehicles/Vehicle.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index 416f2aa0..cf46f37b 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -1139,8 +1139,8 @@ CBoat::RenderWaterOutPolys(void) RwIm3DVertexSetPos(&KeepWaterOutVertices[3], 1.3f, -2.832f, 0.51f); break; case MI_SQUALO: - RwIm3DVertexSetPos(&KeepWaterOutVertices[0], -1.222f, 2.004f, 0.846f); - RwIm3DVertexSetPos(&KeepWaterOutVertices[1], 1.222f, 2.004f, 0.846f); + RwIm3DVertexSetPos(&KeepWaterOutVertices[0], -1.222f, 2.004f, 1.409f); + RwIm3DVertexSetPos(&KeepWaterOutVertices[1], 1.222f, 2.004f, 1.409f); RwIm3DVertexSetPos(&KeepWaterOutVertices[2], -1.24f, -1.367f, 0.846f); RwIm3DVertexSetPos(&KeepWaterOutVertices[3], 1.24f, -1.367f, 0.846f); break; diff --git a/src/vehicles/Ferry.cpp b/src/vehicles/Ferry.cpp index 89a0de9f..339c2819 100644 --- a/src/vehicles/Ferry.cpp +++ b/src/vehicles/Ferry.cpp @@ -14,6 +14,7 @@ #include "TempColModels.h" #include "WaterLevel.h" #include "World.h" +#include "sampman.h" CFerryInst* CFerry::mspInst; @@ -706,7 +707,7 @@ void CFerry::OpenDoor(void) m_bUseFrontDoor = true; if (fDistToCar4 < fDistToCar1) m_bUseFrontDoor = false; - // AudioManager.DirectlyEnqueueSample(0xb8,0,0,1,0x5622,0x7f,0x14,0); // TODO + AudioManager.DirectlyEnqueueSample(SFX_GATE_START_CLU, SFX_BANK_0, 0, 1, 22050, 127, 20); } void CFerry::CloseDoor(void) @@ -714,7 +715,7 @@ void CFerry::CloseDoor(void) printf("closing the ferry door\n"); m_nDoorState = FERRY_DOOR_CLOSING; m_nDoorTimer = CTimer::GetTimeInMilliseconds() + 10000; - // AudioManager.DirectlyEnqueueSample(0xb8, 0, 0, 1, 0x5622, 0x7f, 0x14, 0); // TODO + AudioManager.DirectlyEnqueueSample(SFX_GATE_START_CLU, SFX_BANK_0, 0, 1, 22050, 127, 20); // shouldn't this be SFX_GATE_STOP_CLU? } bool CFerry::IsDoorOpen(void) @@ -798,7 +799,7 @@ void CFerry::PlayArrivedHorn(void) float fDistToCamera = (GetPosition() - TheCamera.GetPosition()).Magnitude(); if (fDistToCamera < 200.0f) { uint8 volume = (200.0f - fDistToCamera) / 200.0f * 127; - // AudioManager.DirectlyEnqueueSample(0x32, 0, 0, 1, 18000, volume, 0x32, 0); // TODO + AudioManager.DirectlyEnqueueSample(SFX_CAR_HORN_TRUCK, SFX_BANK_0, 0, 1, 18000, volume, 50); } } diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index 763bd56e..7be4e563 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -277,7 +277,7 @@ public: uint8 m_vehLCS_2A4; // some timer uint32 m_nCarHornTimer; uint8 m_nCarHornPattern; - uint8 m_bSirenOrAlarm; + bool m_bSirenOrAlarm; uint8 m_nCarHornDelay; int8 m_comedyControlState; int32 m_vehLCS_2B0; |