summaryrefslogtreecommitdiffstats
path: root/src/audio/DMAudio.cpp
diff options
context:
space:
mode:
authorRoman Masanin <36927roma@gmail.com>2020-10-25 22:16:46 +0100
committerRoman Masanin <36927roma@gmail.com>2020-10-25 22:16:46 +0100
commit44bbcbd14ac86e22c1514b78bbc2fad2f0f9cf24 (patch)
tree285278bf5fda41d6a528a7912153a892746262ed /src/audio/DMAudio.cpp
parentcleanup processVehicleOneShots, processVehicleX done (diff)
parentsmall glass fix (diff)
downloadre3-44bbcbd14ac86e22c1514b78bbc2fad2f0f9cf24.tar
re3-44bbcbd14ac86e22c1514b78bbc2fad2f0f9cf24.tar.gz
re3-44bbcbd14ac86e22c1514b78bbc2fad2f0f9cf24.tar.bz2
re3-44bbcbd14ac86e22c1514b78bbc2fad2f0f9cf24.tar.lz
re3-44bbcbd14ac86e22c1514b78bbc2fad2f0f9cf24.tar.xz
re3-44bbcbd14ac86e22c1514b78bbc2fad2f0f9cf24.tar.zst
re3-44bbcbd14ac86e22c1514b78bbc2fad2f0f9cf24.zip
Diffstat (limited to 'src/audio/DMAudio.cpp')
-rw-r--r--src/audio/DMAudio.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/audio/DMAudio.cpp b/src/audio/DMAudio.cpp
index ade53d9b..7c99e89f 100644
--- a/src/audio/DMAudio.cpp
+++ b/src/audio/DMAudio.cpp
@@ -5,9 +5,6 @@
#include "AudioManager.h"
#include "AudioScriptObject.h"
#include "sampman.h"
-#include "Font.h"
-#include "Text.h"
-#include "crossplatform.h"
cDMAudio DMAudio;
@@ -241,13 +238,13 @@ cDMAudio::PlayFrontEndSound(uint16 frontend, uint32 volume)
}
void
-cDMAudio::PlayRadioAnnouncement(uint8 announcement)
+cDMAudio::PlayRadioAnnouncement(uint32 announcement)
{
MusicManager.PlayAnnouncement(announcement);
}
void
-cDMAudio::PlayFrontEndTrack(uint8 track, uint8 frontendFlag)
+cDMAudio::PlayFrontEndTrack(uint32 track, uint8 frontendFlag)
{
MusicManager.PlayFrontEndTrack(track, frontendFlag);
}
@@ -271,7 +268,7 @@ cDMAudio::ChangeMusicMode(uint8 mode)
}
void
-cDMAudio::PreloadCutSceneMusic(uint8 track)
+cDMAudio::PreloadCutSceneMusic(uint32 track)
{
MusicManager.PreloadCutSceneMusic(track);
}
@@ -337,7 +334,7 @@ cDMAudio::SetRadioInCar(uint32 radio)
}
void
-cDMAudio::SetRadioChannel(int8 radio, int32 pos)
+cDMAudio::SetRadioChannel(uint32 radio, int32 pos)
{
MusicManager.SetRadioChannelByScript(radio, pos);
}
@@ -373,7 +370,7 @@ cDMAudio::SetPedTalkingStatus(CPed *ped, uint8 status)
}
void
-cDMAudio::SetPlayersMood(uint8 mood, int32 time)
+cDMAudio::SetPlayersMood(uint8 mood, uint32 time)
{
return AudioManager.SetPlayersMood(mood, time);
}