summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2019-10-26 14:20:12 +0200
committerSergeanur <s.anureev@yandex.ua>2019-10-26 14:20:12 +0200
commitd5a72fa597e7d0885f7a398e204c4085aff5c241 (patch)
treeb71959c19fa9b88c159ed753ff00c96e9c3b74f9 /src
parentAdded timing to RwTextureGtaStreamRead (diff)
downloadre3-d5a72fa597e7d0885f7a398e204c4085aff5c241.tar
re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.tar.gz
re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.tar.bz2
re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.tar.lz
re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.tar.xz
re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.tar.zst
re3-d5a72fa597e7d0885f7a398e204c4085aff5c241.zip
Diffstat (limited to 'src')
-rw-r--r--src/audio/AudioManager.cpp4
-rw-r--r--src/audio/AudioManager.h131
-rw-r--r--src/audio/AudioSamples.h127
-rw-r--r--src/audio/DMAudio.h1
-rw-r--r--src/audio/MusicManager.cpp17
-rw-r--r--src/audio/MusicManager.h242
-rw-r--r--src/audio/audio.h228
-rw-r--r--src/control/Replay.cpp6
-rw-r--r--src/core/CutsceneMgr.cpp5
-rw-r--r--src/core/Frontend.cpp3
-rw-r--r--src/peds/Ped.cpp1
-rw-r--r--src/skel/win/win.cpp4
-rw-r--r--src/skel/win/win.h1
-rw-r--r--src/vehicles/Vehicle.cpp1
14 files changed, 382 insertions, 389 deletions
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 1428bb9f..19c994e3 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -582,8 +582,8 @@ cAudioManager::ComputePan(float dist, CVector *vec)
return min(107, panTable[index] + 63);
}
-uint32
-cAudioManager::ComputeVolume(int emittingVolume, float soundIntensity, float distance) const
+uint8
+cAudioManager::ComputeVolume(uint8 emittingVolume, float soundIntensity, float distance) const
{
float newSoundIntensity;
if(soundIntensity <= 0.0f) return 0;
diff --git a/src/audio/AudioManager.h b/src/audio/AudioManager.h
index d9224ced..6ac6dda7 100644
--- a/src/audio/AudioManager.h
+++ b/src/audio/AudioManager.h
@@ -1,9 +1,136 @@
#pragma once
-#include "AudioSamples.h"
#include "DMAudio.h"
#include "common.h"
+enum eScriptSounds : int16
+{
+ SCRIPT_SOUND_0 = 0,
+ SCRIPT_SOUND_1 = 1,
+ SCRIPT_SOUND_2 = 2,
+ SCRIPT_SOUND_3 = 3,
+ SCRIPT_SOUND_PARTY_1_LOOP_S = 4,
+ SCRIPT_SOUND_PARTY_1_LOOP_L = 5,
+ SCRIPT_SOUND_PARTY_2_LOOP_S = 6,
+ SCRIPT_SOUND_PARTY_2_LOOP_L = 7,
+ SCRIPT_SOUND_PARTY_3_LOOP_S = 8,
+ SCRIPT_SOUND_PARTY_3_LOOP_L = 9,
+ SCRIPT_SOUND_PARTY_4_LOOP_S = 10,
+ SCRIPT_SOUND_PARTY_4_LOOP_L = 11,
+ SCRIPT_SOUND_PARTY_5_LOOP_S = 12,
+ SCRIPT_SOUND_PARTY_5_LOOP_L = 13,
+ SCRIPT_SOUND_PARTY_6_LOOP_S = 14,
+ SCRIPT_SOUND_PARTY_6_LOOP_L = 15,
+ SCRIPT_SOUND_PARTY_7_LOOP_S = 16,
+ SCRIPT_SOUND_PARTY_7_LOOP_L = 17,
+ SCRIPT_SOUND_PARTY_8_LOOP_S = 18,
+ SCRIPT_SOUND_PARTY_8_LOOP_L = 19,
+ SCRIPT_SOUND_PARTY_9_LOOP_S = 20,
+ SCRIPT_SOUND_PARTY_9_LOOP_L = 21,
+ SCRIPT_SOUND_PARTY_10_LOOP_S = 22,
+ SCRIPT_SOUND_PARTY_10_LOOP_L = 23,
+ SCRIPT_SOUND_PARTY_11_LOOP_S = 24,
+ SCRIPT_SOUND_PARTY_11_LOOP_L = 25,
+ SCRIPT_SOUND_PARTY_12_LOOP_S = 26,
+ SCRIPT_SOUND_PARTY_12_LOOP_L = 27,
+ SCRIPT_SOUND_PARTY_13_LOOP_S = 28,
+ SCRIPT_SOUND_PARTY_13_LOOP_L = 29,
+ SCRIPT_SOUND_STRIP_CLUB_LOOP_1_S = 30,
+ SCRIPT_SOUND_STRIP_CLUB_LOOP_1_L = 31,
+ SCRIPT_SOUND_STRIP_CLUB_LOOP_2_S = 32,
+ SCRIPT_SOUND_STRIP_CLUB_LOOP_2_L = 33,
+ SCRIPT_SOUND_WORK_SHOP_LOOP_S = 34,
+ SCRIPT_SOUND_WORK_SHOP_LOOP_L = 35,
+ SCRIPT_SOUND_SAWMILL_LOOP_S = 36,
+ SCRIPT_SOUND_SAWMILL_LOOP_L = 37,
+ SCRIPT_SOUND_38 = 38,
+ SCRIPT_SOUND_39 = 39,
+ SCRIPT_SOUND_LAUNDERETTE_LOOP_S = 40,
+ SCRIPT_SOUND_LAUNDERETTE_LOOP_L = 41,
+ SCRIPT_SOUND_CHINATOWN_RESTAURANT_S = 42,
+ SCRIPT_SOUND_CHINATOWN_RESTAURANT_L = 43,
+ SCRIPT_SOUND_CIPRIANI_RESAURANT_S = 44,
+ SCRIPT_SOUND_CIPRIANI_RESAURANT_L = 45,
+ SCRIPT_SOUND_46 = 46,
+ SCRIPT_SOUND_47 = 47,
+ SCRIPT_SOUND_MARCO_BISTRO_S = 48,
+ SCRIPT_SOUND_MARCO_BISTRO_L = 49,
+ SCRIPT_SOUND_AIRPORT_LOOP_S = 50,
+ SCRIPT_SOUND_AIRPORT_LOOP_L = 51,
+ SCRIPT_SOUND_SHOP_LOOP_S = 52,
+ SCRIPT_SOUND_SHOP_LOOP_L = 53,
+ SCRIPT_SOUND_CINEMA_LOOP_S = 54,
+ SCRIPT_SOUND_CINEMA_LOOP_L = 55,
+ SCRIPT_SOUND_DOCKS_LOOP_S = 56,
+ SCRIPT_SOUND_DOCKS_LOOP_L = 57,
+ SCRIPT_SOUND_HOME_LOOP_S = 58,
+ SCRIPT_SOUND_HOME_LOOP_L = 59,
+ SCRIPT_SOUND_FRANKIE_PIANO = 60,
+ SCRIPT_SOUND_PARTY_1_LOOP = 61,
+ SCRIPT_SOUND_PORN_CINEMA_1_S = 62,
+ SCRIPT_SOUND_PORN_CINEMA_1_L = 63,
+ SCRIPT_SOUND_PORN_CINEMA_2_S = 64,
+ SCRIPT_SOUND_PORN_CINEMA_2_L = 65,
+ SCRIPT_SOUND_PORN_CINEMA_3_S = 66,
+ SCRIPT_SOUND_PORN_CINEMA_3_L = 67,
+ SCRIPT_SOUND_BANK_ALARM_LOOP_S = 68,
+ SCRIPT_SOUND_BANK_ALARM_LOOP_L = 69,
+ SCRIPT_SOUND_POLICE_BALL_LOOP_S = 70,
+ SCRIPT_SOUND_POLICE_BALL_LOOP_L = 71,
+ SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_S = 72,
+ SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_L = 73,
+ SCRIPT_SOUND_74 = 74,
+ SCRIPT_SOUND_75 = 75,
+ SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_S = 76,
+ SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_L = 77,
+ SCRIPT_SOUND_INJURED_PED_MALE_OUCH_S = 78,
+ SCRIPT_SOUND_INJURED_PED_MALE_OUCH_L = 79,
+ SCRIPT_SOUND_INJURED_PED_FEMALE_OUCH_S = 80,
+ SCRIPT_SOUND_INJURED_PED_FEMALE_OUCH_L = 81,
+ SCRIPT_SOUND_EVIDENCE_PICKUP = 82,
+ SCRIPT_SOUND_UNLOAD_GOLD = 83,
+ SCRIPT_SOUND_RAVE_1_LOOP_S = 84,
+ SCRIPT_SOUND_RAVE_1_LOOP_L = 85,
+ SCRIPT_SOUND_RAVE_2_LOOP_S = 86,
+ SCRIPT_SOUND_RAVE_2_LOOP_L = 87,
+ SCRIPT_SOUND_RAVE_3_LOOP_S = 88,
+ SCRIPT_SOUND_RAVE_3_LOOP_L = 89,
+ SCRIPT_SOUND_MISTY_SEX_S = 90,
+ SCRIPT_SOUND_MISTY_SEX_L = 91,
+ SCRIPT_SOUND_GATE_START_CLUNK = 92,
+ SCRIPT_SOUND_GATE_STOP_CLUNK = 93,
+ SCRIPT_SOUND_PART_MISSION_COMPLETE = 94,
+ SCRIPT_SOUND_CHUNKY_RUN_SHOUT = 95,
+ SCRIPT_SOUND_SECURITY_GUARD_AWAY_SHOUT = 96,
+ SCRIPT_SOUND_RACE_START_3 = 97,
+ SCRIPT_SOUND_RACE_START_2 = 98,
+ SCRIPT_SOUND_RACE_START_1 = 99,
+ SCRIPT_SOUND_RACE_START_GO = 100,
+ SCRIPT_SOUND_SWAT_PED_SHOUT = 101,
+ SCRIPT_SOUND_PRETEND_FIRE_LOOP = 102,
+ SCRIPT_SOUND_AMMUNATION_CHAT_1 = 103,
+ SCRIPT_SOUND_AMMUNATION_CHAT_2 = 104,
+ SCRIPT_SOUND_AMMUNATION_CHAT_3 = 105,
+ SCRIPT_SOUND_BULLET_HIT_GROUND_1 = 106,
+ SCRIPT_SOUND_BULLET_HIT_GROUND_2 = 107,
+ SCRIPT_SOUND_BULLET_HIT_GROUND_3 = 108,
+ SCRIPT_SOUND_109 = 109,
+ SCRIPT_SOUND_110 = 110,
+ SCRIPT_SOUND_111 = 111,
+ SCRIPT_SOUND_PAYPHONE_RINGING = 112,
+ SCRIPT_SOUND_113 = 113,
+ SCRIPT_SOUND_GLASS_BREAK_L = 114,
+ SCRIPT_SOUND_GLASS_BREAK_S = 115,
+ SCRIPT_SOUND_GLASS_CRACK = 116,
+ SCRIPT_SOUND_GLASS_LIGHT_BREAK = 117,
+ SCRIPT_SOUND_BOX_DESTROYED_1 = 118,
+ SCRIPT_SOUND_BOX_DESTROYED_2 = 119,
+ SCRIPT_SOUND_METAL_COLLISION = 120,
+ SCRIPT_SOUND_TIRE_COLLISION = 121,
+ SCRIPT_SOUND_GUNSHELL_DROP = 122,
+ SCRIPT_SOUND_GUNSHELL_DROP_SOFT = 123,
+};
+
class tActiveSample
{
public:
@@ -321,7 +448,7 @@ public:
int32 ComputeDopplerEffectedFrequency(uint32 oldFreq, float position1, float position2,
float speedMultiplier) const; /// ok
int32 ComputePan(float, CVector *); /// ok
- uint32 ComputeVolume(int emittingVolume, float soundIntensity, float distance) const; /// ok
+ uint8 ComputeVolume(uint8 emittingVolume, float soundIntensity, float distance) const; /// ok
int32 CreateEntity(int32 type, CPhysical *entity); /// ok
void DestroyAllGameCreatedEntities(); /// ok
diff --git a/src/audio/AudioSamples.h b/src/audio/AudioSamples.h
index 7d71be54..2c4f8df8 100644
--- a/src/audio/AudioSamples.h
+++ b/src/audio/AudioSamples.h
@@ -3047,130 +3047,3 @@ enum eAudioSamples : uint32 {
SAMPLEBANK_PED_MAX = AUDIO_SAMPLE_AMMUNATION_WELCOME_3+1,
};
-enum eScriptSounds : int16
-{
- SCRIPT_SOUND_0 = 0,
- SCRIPT_SOUND_1 = 1,
- SCRIPT_SOUND_2 = 2,
- SCRIPT_SOUND_3 = 3,
- SCRIPT_SOUND_PARTY_1_LOOP_S = 4,
- SCRIPT_SOUND_PARTY_1_LOOP_L = 5,
- SCRIPT_SOUND_PARTY_2_LOOP_S = 6,
- SCRIPT_SOUND_PARTY_2_LOOP_L = 7,
- SCRIPT_SOUND_PARTY_3_LOOP_S = 8,
- SCRIPT_SOUND_PARTY_3_LOOP_L = 9,
- SCRIPT_SOUND_PARTY_4_LOOP_S = 10,
- SCRIPT_SOUND_PARTY_4_LOOP_L = 11,
- SCRIPT_SOUND_PARTY_5_LOOP_S = 12,
- SCRIPT_SOUND_PARTY_5_LOOP_L = 13,
- SCRIPT_SOUND_PARTY_6_LOOP_S = 14,
- SCRIPT_SOUND_PARTY_6_LOOP_L = 15,
- SCRIPT_SOUND_PARTY_7_LOOP_S = 16,
- SCRIPT_SOUND_PARTY_7_LOOP_L = 17,
- SCRIPT_SOUND_PARTY_8_LOOP_S = 18,
- SCRIPT_SOUND_PARTY_8_LOOP_L = 19,
- SCRIPT_SOUND_PARTY_9_LOOP_S = 20,
- SCRIPT_SOUND_PARTY_9_LOOP_L = 21,
- SCRIPT_SOUND_PARTY_10_LOOP_S = 22,
- SCRIPT_SOUND_PARTY_10_LOOP_L = 23,
- SCRIPT_SOUND_PARTY_11_LOOP_S = 24,
- SCRIPT_SOUND_PARTY_11_LOOP_L = 25,
- SCRIPT_SOUND_PARTY_12_LOOP_S = 26,
- SCRIPT_SOUND_PARTY_12_LOOP_L = 27,
- SCRIPT_SOUND_PARTY_13_LOOP_S = 28,
- SCRIPT_SOUND_PARTY_13_LOOP_L = 29,
- SCRIPT_SOUND_STRIP_CLUB_LOOP_1_S = 30,
- SCRIPT_SOUND_STRIP_CLUB_LOOP_1_L = 31,
- SCRIPT_SOUND_STRIP_CLUB_LOOP_2_S = 32,
- SCRIPT_SOUND_STRIP_CLUB_LOOP_2_L = 33,
- SCRIPT_SOUND_WORK_SHOP_LOOP_S = 34,
- SCRIPT_SOUND_WORK_SHOP_LOOP_L = 35,
- SCRIPT_SOUND_SAWMILL_LOOP_S = 36,
- SCRIPT_SOUND_SAWMILL_LOOP_L = 37,
- SCRIPT_SOUND_38 = 38,
- SCRIPT_SOUND_39 = 39,
- SCRIPT_SOUND_LAUNDERETTE_LOOP_S = 40,
- SCRIPT_SOUND_LAUNDERETTE_LOOP_L = 41,
- SCRIPT_SOUND_CHINATOWN_RESTAURANT_S = 42,
- SCRIPT_SOUND_CHINATOWN_RESTAURANT_L = 43,
- SCRIPT_SOUND_CIPRIANI_RESAURANT_S = 44,
- SCRIPT_SOUND_CIPRIANI_RESAURANT_L = 45,
- SCRIPT_SOUND_46 = 46,
- SCRIPT_SOUND_47 = 47,
- SCRIPT_SOUND_MARCO_BISTRO_S = 48,
- SCRIPT_SOUND_MARCO_BISTRO_L = 49,
- SCRIPT_SOUND_AIRPORT_LOOP_S = 50,
- SCRIPT_SOUND_AIRPORT_LOOP_L = 51,
- SCRIPT_SOUND_SHOP_LOOP_S = 52,
- SCRIPT_SOUND_SHOP_LOOP_L = 53,
- SCRIPT_SOUND_CINEMA_LOOP_S = 54,
- SCRIPT_SOUND_CINEMA_LOOP_L = 55,
- SCRIPT_SOUND_DOCKS_LOOP_S = 56,
- SCRIPT_SOUND_DOCKS_LOOP_L = 57,
- SCRIPT_SOUND_HOME_LOOP_S = 58,
- SCRIPT_SOUND_HOME_LOOP_L = 59,
- SCRIPT_SOUND_FRANKIE_PIANO = 60,
- SCRIPT_SOUND_PARTY_1_LOOP = 61,
- SCRIPT_SOUND_PORN_CINEMA_1_S = 62,
- SCRIPT_SOUND_PORN_CINEMA_1_L = 63,
- SCRIPT_SOUND_PORN_CINEMA_2_S = 64,
- SCRIPT_SOUND_PORN_CINEMA_2_L = 65,
- SCRIPT_SOUND_PORN_CINEMA_3_S = 66,
- SCRIPT_SOUND_PORN_CINEMA_3_L = 67,
- SCRIPT_SOUND_BANK_ALARM_LOOP_S = 68,
- SCRIPT_SOUND_BANK_ALARM_LOOP_L = 69,
- SCRIPT_SOUND_POLICE_BALL_LOOP_S = 70,
- SCRIPT_SOUND_POLICE_BALL_LOOP_L = 71,
- SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_S = 72,
- SCRIPT_SOUND_RAVE_LOOP_INDUSTRIAL_L = 73,
- SCRIPT_SOUND_74 = 74,
- SCRIPT_SOUND_75 = 75,
- SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_S = 76,
- SCRIPT_SOUND_POLICE_CELL_BEATING_LOOP_L = 77,
- SCRIPT_SOUND_INJURED_PED_MALE_OUCH_S = 78,
- SCRIPT_SOUND_INJURED_PED_MALE_OUCH_L = 79,
- SCRIPT_SOUND_INJURED_PED_FEMALE_OUCH_S = 80,
- SCRIPT_SOUND_INJURED_PED_FEMALE_OUCH_L = 81,
- SCRIPT_SOUND_EVIDENCE_PICKUP = 82,
- SCRIPT_SOUND_UNLOAD_GOLD = 83,
- SCRIPT_SOUND_RAVE_1_LOOP_S = 84,
- SCRIPT_SOUND_RAVE_1_LOOP_L = 85,
- SCRIPT_SOUND_RAVE_2_LOOP_S = 86,
- SCRIPT_SOUND_RAVE_2_LOOP_L = 87,
- SCRIPT_SOUND_RAVE_3_LOOP_S = 88,
- SCRIPT_SOUND_RAVE_3_LOOP_L = 89,
- SCRIPT_SOUND_MISTY_SEX_S = 90,
- SCRIPT_SOUND_MISTY_SEX_L = 91,
- SCRIPT_SOUND_GATE_START_CLUNK = 92,
- SCRIPT_SOUND_GATE_STOP_CLUNK = 93,
- SCRIPT_SOUND_PART_MISSION_COMPLETE = 94,
- SCRIPT_SOUND_CHUNKY_RUN_SHOUT = 95,
- SCRIPT_SOUND_SECURITY_GUARD_AWAY_SHOUT = 96,
- SCRIPT_SOUND_RACE_START_3 = 97,
- SCRIPT_SOUND_RACE_START_2 = 98,
- SCRIPT_SOUND_RACE_START_1 = 99,
- SCRIPT_SOUND_RACE_START_GO = 100,
- SCRIPT_SOUND_SWAT_PED_SHOUT = 101,
- SCRIPT_SOUND_PRETEND_FIRE_LOOP = 102,
- SCRIPT_SOUND_AMMUNATION_CHAT_1 = 103,
- SCRIPT_SOUND_AMMUNATION_CHAT_2 = 104,
- SCRIPT_SOUND_AMMUNATION_CHAT_3 = 105,
- SCRIPT_SOUND_BULLET_HIT_GROUND_1 = 106,
- SCRIPT_SOUND_BULLET_HIT_GROUND_2 = 107,
- SCRIPT_SOUND_BULLET_HIT_GROUND_3 = 108,
- SCRIPT_SOUND_109 = 109,
- SCRIPT_SOUND_110 = 110,
- SCRIPT_SOUND_111 = 111,
- SCRIPT_SOUND_PAYPHONE_RINGING = 112,
- SCRIPT_SOUND_113 = 113,
- SCRIPT_SOUND_GLASS_BREAK_L = 114,
- SCRIPT_SOUND_GLASS_BREAK_S = 115,
- SCRIPT_SOUND_GLASS_CRACK = 116,
- SCRIPT_SOUND_GLASS_LIGHT_BREAK = 117,
- SCRIPT_SOUND_BOX_DESTROYED_1 = 118,
- SCRIPT_SOUND_BOX_DESTROYED_2 = 119,
- SCRIPT_SOUND_METAL_COLLISION = 120,
- SCRIPT_SOUND_TIRE_COLLISION = 121,
- SCRIPT_SOUND_GUNSHELL_DROP = 122,
- SCRIPT_SOUND_GUNSHELL_DROP_SOFT = 123,
-};
diff --git a/src/audio/DMAudio.h b/src/audio/DMAudio.h
index 9c551733..4111f64f 100644
--- a/src/audio/DMAudio.h
+++ b/src/audio/DMAudio.h
@@ -1,5 +1,6 @@
#pragma once
+#include "audio.h"
#include "Wanted.h"
enum eSound : int16
diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index de4d0489..1d059a46 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -1,3 +1,4 @@
+#include "common.h"
#include "MusicManager.h"
#include "Camera.h"
#include "Font.h"
@@ -15,12 +16,6 @@ int32 &gNumRetunePresses = *(int32 *)0x650B80;
wchar *pCurrentStation = (wchar *)0x650B9C;
uint8 &cDisplay = *(uint8 *)0x650BA1;
-WRAPPER char *
-cMusicManager::Get3DProviderName(char)
-{
- EAXJMP(0x57A8C0);
-}
-
bool
cMusicManager::PlayerInCar()
{
@@ -183,19 +178,19 @@ cMusicManager::StopFrontEndTrack()
}
WRAPPER void
-cMusicManager::PlayAnnouncement(unsigned char)
+cMusicManager::PlayAnnouncement(uint8)
{
EAXJMP(0x57E430);
}
WRAPPER void
-cMusicManager::PlayFrontEndTrack(unsigned char, unsigned char)
+cMusicManager::PlayFrontEndTrack(uint8, uint8)
{
EAXJMP(0x57E2E0);
}
WRAPPER void
-cMusicManager::PreloadCutSceneMusic(unsigned char)
+cMusicManager::PreloadCutSceneMusic(uint8)
{
EAXJMP(0x57E210);
}
@@ -219,13 +214,13 @@ cMusicManager::GetRadioInCar(void)
}
WRAPPER void
-cMusicManager::SetRadioInCar(unsigned int)
+cMusicManager::SetRadioInCar(uint32)
{
EAXJMP(0x57D2C0);
}
WRAPPER void
-cMusicManager::SetRadioChannelByScript(unsigned char, int)
+cMusicManager::SetRadioChannelByScript(uint8, int32)
{
EAXJMP(0x57D180);
}
diff --git a/src/audio/MusicManager.h b/src/audio/MusicManager.h
index 47f3ad68..7753d638 100644
--- a/src/audio/MusicManager.h
+++ b/src/audio/MusicManager.h
@@ -1,233 +1,6 @@
#pragma once
-#include "common.h"
-
-enum eRadioStation
-{
- HEAD_RADIO,
- DOUBLE_CLEF,
- JAH_RADIO,
- RISE_FM,
- LIPS_106,
- GAME_FM,
- MSX_FM,
- FLASHBACK,
- CHATTERBOX,
- USERTRACK,
- POLICE_RADIO,
- RADIO_OFF,
-};
-
-enum eMusicMode
-{
- MUSICMODE_FRONTEND = 0,
- MUSICMODE_GAME,
- MUSICMODE_CUTSCENE,
- MUSICMODE_OFF,
- MUSICMODE_4,
-};
-
-enum eStreamedSounds
-{
- STREAMED_SOUND_RADIO_HEAD = 0,
- STREAMED_SOUND_RADIO_CLASSIC = 1,
- STREAMED_SOUND_RADIO_KJAH = 2,
- STREAMED_SOUND_RADIO_RISE = 3,
- STREAMED_SOUND_RADIO_LIPS = 4,
- STREAMED_SOUND_RADIO_GAME = 5,
- STREAMED_SOUND_RADIO_MSX = 6,
- STREAMED_SOUND_RADIO_FLASH = 7,
- STREAMED_SOUND_RADIO_CHAT = 8,
- STREAMED_SOUND_RADIO_MP3_PLAYER = 9,
- STREAMED_SOUND_RADIO_POLICE = 10,
- STREAMED_SOUND_CITY_AMBIENT = 11,
- STREAMED_SOUND_WATER_AMBIENT = 12,
- STREAMED_SOUND_ANNOUNCE_COMMERCIAL_OPEN = 13,
- STREAMED_SOUND_ANNOUNCE_SUBURBAN_OPEN = 14,
- STREAMED_SOUND_NEWS_INTRO = 15,
- STREAMED_SOUND_BANK_INTRO = 16,
- STREAMED_SOUND_CUTSCENE_LUIGI1_LG = 17,
- STREAMED_SOUND_CUTSCENE_LUIGI2_DSB = 18,
- STREAMED_SOUND_CUTSCENE_LUIGI3_DM = 19,
- STREAMED_SOUND_CUTSCENE_LUIGI4_PAP = 20,
- STREAMED_SOUND_CUTSCENE_LUIGI5_TFB = 21,
- STREAMED_SOUND_CUTSCENE_JOEY0_DM2 = 22,
- STREAMED_SOUND_CUTSCENE_JOEY1_LFL = 23,
- STREAMED_SOUND_CUTSCENE_JOEY2_KCL = 24,
- STREAMED_SOUND_CUTSCENE_JOEY3_VH = 25,
- STREAMED_SOUND_CUTSCENE_JOEY4_ETH = 26,
- STREAMED_SOUND_CUTSCENE_JOEY5_DST = 27,
- STREAMED_SOUND_CUTSCENE_JOEY6_TBJ = 28,
- STREAMED_SOUND_CUTSCENE_TONI1_TOL = 29,
- STREAMED_SOUND_CUTSCENE_TONI2_TPU = 30,
- STREAMED_SOUND_CUTSCENE_TONI3_MAS = 31,
- STREAMED_SOUND_CUTSCENE_TONI4_TAT = 32,
- STREAMED_SOUND_CUTSCENE_TONI5_BF = 33,
- STREAMED_SOUND_CUTSCENE_SAL0_MAS = 34,
- STREAMED_SOUND_CUTSCENE_SAL1_PF = 35,
- STREAMED_SOUND_CUTSCENE_SAL2_CTG = 36,
- STREAMED_SOUND_CUTSCENE_SAL3_RTC = 37,
- STREAMED_SOUND_CUTSCENE_SAL5_LRQ = 38,
- STREAMED_SOUND_CUTSCENE_SAL4_BDBA = 39,
- STREAMED_SOUND_CUTSCENE_SAL4_BDBB = 40,
- STREAMED_SOUND_CUTSCENE_SAL2_CTG2 = 41,
- STREAMED_SOUND_CUTSCENE_SAL4_BDBD = 42,
- STREAMED_SOUND_CUTSCENE_SAL5_LRQB = 43,
- STREAMED_SOUND_CUTSCENE_SAL5_LRQC = 44,
- STREAMED_SOUND_CUTSCENE_ASUKA_1_SSO = 45,
- STREAMED_SOUND_CUTSCENE_ASUKA_2_PP = 46,
- STREAMED_SOUND_CUTSCENE_ASUKA_3_SS = 47,
- STREAMED_SOUND_CUTSCENE_ASUKA_4_PDR = 48,
- STREAMED_SOUND_CUTSCENE_ASUKA_5_K2FT = 49,
- STREAMED_SOUND_CUTSCENE_KENJI1_KBO = 50,
- STREAMED_SOUND_CUTSCENE_KENJI2_GIS = 51,
- STREAMED_SOUND_CUTSCENE_KENJI3_DS = 52,
- STREAMED_SOUND_CUTSCENE_KENJI4_SHI = 53,
- STREAMED_SOUND_CUTSCENE_KENJI5_SD = 54,
- STREAMED_SOUND_CUTSCENE_RAY0_PDR2 = 55,
- STREAMED_SOUND_CUTSCENE_RAY1_SW = 56,
- STREAMED_SOUND_CUTSCENE_RAY2_AP = 57,
- STREAMED_SOUND_CUTSCENE_RAY3_ED = 58,
- STREAMED_SOUND_CUTSCENE_RAY4_GF = 59,
- STREAMED_SOUND_CUTSCENE_RAY5_PB = 60,
- STREAMED_SOUND_CUTSCENE_RAY6_MM = 61,
- STREAMED_SOUND_CUTSCENE_DONALD1_STOG = 62,
- STREAMED_SOUND_CUTSCENE_DONALD2_KK = 63,
- STREAMED_SOUND_CUTSCENE_DONALD3_ADO = 64,
- STREAMED_SOUND_CUTSCENE_DONALD5_ES = 65,
- STREAMED_SOUND_CUTSCENE_DONALD7_MLD = 66,
- STREAMED_SOUND_CUTSCENE_DONALD4_GTA = 67,
- STREAMED_SOUND_CUTSCENE_DONALD4_GTA2 = 68,
- STREAMED_SOUND_CUTSCENE_DONALD6_STS = 69,
- STREAMED_SOUND_CUTSCENE_ASUKA6_BAIT = 70,
- STREAMED_SOUND_CUTSCENE_ASUKA7_ETG = 71,
- STREAMED_SOUND_CUTSCENE_ASUKA8_PS = 72,
- STREAMED_SOUND_CUTSCENE_ASUKA9_ASD = 73,
- STREAMED_SOUND_CUTSCENE_KENJI4_SHI2 = 74,
- STREAMED_SOUND_CUTSCENE_CATALINA1_TEX = 75,
- STREAMED_SOUND_CUTSCENE_ELBURRO1_PH1 = 76,
- STREAMED_SOUND_CUTSCENE_ELBURRO2_PH2 = 77,
- STREAMED_SOUND_CUTSCENE_ELBURRO3_PH3 = 78,
- STREAMED_SOUND_CUTSCENE_ELBURRO4_PH4 = 79,
- STREAMED_SOUND_CUTSCENE_YARDIE_PH1 = 80,
- STREAMED_SOUND_CUTSCENE_YARDIE_PH2 = 81,
- STREAMED_SOUND_CUTSCENE_YARDIE_PH3 = 82,
- STREAMED_SOUND_CUTSCENE_YARDIE_PH4 = 83,
- STREAMED_SOUND_CUTSCENE_HOODS_PH1 = 84,
- STREAMED_SOUND_CUTSCENE_HOODS_PH2 = 85,
- STREAMED_SOUND_CUTSCENE_HOODS_PH3 = 86,
- STREAMED_SOUND_CUTSCENE_HOODS_PH4 = 87,
- STREAMED_SOUND_CUTSCENE_HOODS_PH5 = 88,
- STREAMED_SOUND_CUTSCENE_MARTY_PH1 = 89,
- STREAMED_SOUND_CUTSCENE_MARTY_PH2 = 90,
- STREAMED_SOUND_CUTSCENE_MARTY_PH3 = 91,
- STREAMED_SOUND_CUTSCENE_MARTY_PH4 = 92,
- STREAMED_SOUND_MISSION_COMPLETED = 93,
- STREAMED_SOUND_GAME_COMPLETED = 94,
- STREAMED_SOUND_MISSION_LIB_A1 = 95,
- STREAMED_SOUND_MISSION_LIB_A2 = 96,
- STREAMED_SOUND_MISSION_LIB_A = 97,
- STREAMED_SOUND_MISSION_LIB_B = 98,
- STREAMED_SOUND_MISSION_LIB_C = 99,
- STREAMED_SOUND_MISSION_LIB_D = 100,
- STREAMED_SOUND_MISSION_L2_A = 101,
- STREAMED_SOUND_MISSION_J4T_1 = 102,
- STREAMED_SOUND_MISSION_J4T_2 = 103,
- STREAMED_SOUND_MISSION_J4T_3 = 104,
- STREAMED_SOUND_MISSION_J4T_4 = 105,
- STREAMED_SOUND_MISSION_J4_A = 106,
- STREAMED_SOUND_MISSION_J4_B = 107,
- STREAMED_SOUND_MISSION_J4_C = 108,
- STREAMED_SOUND_MISSION_J4_D = 109,
- STREAMED_SOUND_MISSION_J4_E = 110,
- STREAMED_SOUND_MISSION_J4_F = 111,
- STREAMED_SOUND_MISSION_J6_1 = 112,
- STREAMED_SOUND_MISSION_J6_A = 113,
- STREAMED_SOUND_MISSION_J6_B = 114,
- STREAMED_SOUND_MISSION_J6_C = 115,
- STREAMED_SOUND_MISSION_J6_D = 116,
- STREAMED_SOUND_MISSION_T4_A = 117,
- STREAMED_SOUND_MISSION_S1_A = 118,
- STREAMED_SOUND_MISSION_S1_A1 = 119,
- STREAMED_SOUND_MISSION_S1_B = 120,
- STREAMED_SOUND_MISSION_S1_C = 121,
- STREAMED_SOUND_MISSION_S1_C1 = 122,
- STREAMED_SOUND_MISSION_S1_D = 123,
- STREAMED_SOUND_MISSION_S1_E = 124,
- STREAMED_SOUND_MISSION_S1_F = 125,
- STREAMED_SOUND_MISSION_S1_G = 126,
- STREAMED_SOUND_MISSION_S1_H = 127,
- STREAMED_SOUND_MISSION_S1_I = 128,
- STREAMED_SOUND_MISSION_S1_J = 129,
- STREAMED_SOUND_MISSION_S1_K = 130,
- STREAMED_SOUND_MISSION_S1_L = 131,
- STREAMED_SOUND_MISSION_S3_A = 132,
- STREAMED_SOUND_MISSION_S3_B = 133,
- STREAMED_SOUND_MISSION_EL3_A = 134,
- STREAMED_SOUND_MISSION_MF1_A = 135,
- STREAMED_SOUND_MISSION_MF2_A = 136,
- STREAMED_SOUND_MISSION_MF3_A = 137,
- STREAMED_SOUND_MISSION_MF3_B = 138,
- STREAMED_SOUND_MISSION_MF3_B1 = 139,
- STREAMED_SOUND_MISSION_MF3_C = 140,
- STREAMED_SOUND_MISSION_MF4_A = 141,
- STREAMED_SOUND_MISSION_MF4_B = 142,
- STREAMED_SOUND_MISSION_MF4_C = 143,
- STREAMED_SOUND_MISSION_A1_A = 144,
- STREAMED_SOUND_MISSION_A3_A = 145,
- STREAMED_SOUND_MISSION_A5_A = 146,
- STREAMED_SOUND_MISSION_A4_A = 147,
- STREAMED_SOUND_MISSION_A4_B = 148,
- STREAMED_SOUND_MISSION_A4_C = 149,
- STREAMED_SOUND_MISSION_A4_D = 150,
- STREAMED_SOUND_MISSION_K1_A = 151,
- STREAMED_SOUND_MISSION_K3_A = 152,
- STREAMED_SOUND_MISSION_R1_A = 153,
- STREAMED_SOUND_MISSION_R2_A = 154,
- STREAMED_SOUND_MISSION_R2_B = 155,
- STREAMED_SOUND_MISSION_R2_C = 156,
- STREAMED_SOUND_MISSION_R2_D = 157,
- STREAMED_SOUND_MISSION_R2_E = 158,
- STREAMED_SOUND_MISSION_R2_F = 159,
- STREAMED_SOUND_MISSION_R2_G = 160,
- STREAMED_SOUND_MISSION_R2_H = 161,
- STREAMED_SOUND_MISSION_R5_A = 162,
- STREAMED_SOUND_MISSION_R6_A = 163,
- STREAMED_SOUND_MISSION_R6_A1 = 164,
- STREAMED_SOUND_MISSION_R6_B = 165,
- STREAMED_SOUND_MISSION_LO2_A = 166,
- STREAMED_SOUND_MISSION_LO6_A = 167,
- STREAMED_SOUND_MISSION_YD2_A = 168,
- STREAMED_SOUND_MISSION_YD2_B = 169,
- STREAMED_SOUND_MISSION_YD2_C = 170,
- STREAMED_SOUND_MISSION_YD2_C1 = 171,
- STREAMED_SOUND_MISSION_YD2_D = 172,
- STREAMED_SOUND_MISSION_YD2_E = 173,
- STREAMED_SOUND_MISSION_YD2_F = 174,
- STREAMED_SOUND_MISSION_YD2_G = 175,
- STREAMED_SOUND_MISSION_YD2_H = 176,
- STREAMED_SOUND_MISSION_YD2_ASS = 177,
- STREAMED_SOUND_MISSION_YD2_OK = 178,
- STREAMED_SOUND_MISSION_H5_A = 179,
- STREAMED_SOUND_MISSION_H5_B = 180,
- STREAMED_SOUND_MISSION_H5_C = 181,
- STREAMED_SOUND_MISSION_AMMU_A = 182,
- STREAMED_SOUND_MISSION_AMMU_B = 183,
- STREAMED_SOUND_MISSION_AMMU_C = 184,
- STREAMED_SOUND_MISSION_DOOR_1 = 185,
- STREAMED_SOUND_MISSION_DOOR_2 = 186,
- STREAMED_SOUND_MISSION_DOOR_3 = 187,
- STREAMED_SOUND_MISSION_DOOR_4 = 188,
- STREAMED_SOUND_MISSION_DOOR_5 = 189,
- STREAMED_SOUND_MISSION_DOOR_6 = 190,
- STREAMED_SOUND_MISSION_T3_A = 191,
- STREAMED_SOUND_MISSION_T3_B = 192,
- STREAMED_SOUND_MISSION_T3_C = 193,
- STREAMED_SOUND_MISSION_K1_B = 194,
- STREAMED_SOUND_MISSION_CAT1 = 195,
- TOTAL_STREAMED_SOUNDS = 196,
- NO_STREAMED_SOUND = 197,
-};
+#include "audio.h"
class tMP3Sample
{
@@ -252,7 +25,7 @@ public:
bool m_bPreviousPlayerInCar;
bool m_bPlayerInCar;
bool m_bAnnouncementInProgress;
- tMP3Sample m_asMP3Samples[196];
+ tMP3Sample m_asMP3Samples[TOTAL_STREAMED_SOUNDS];
uint8 field_2364;
uint8 field_2365;
uint8 field_2366;
@@ -285,18 +58,17 @@ public:
void ChangeMusicMode(int32 mode);
void StopFrontEndTrack();
- char *Get3DProviderName(char);
bool PlayerInCar();
void DisplayRadioStationName();
- void PlayAnnouncement(unsigned char);
- void PlayFrontEndTrack(unsigned char, unsigned char);
- void PreloadCutSceneMusic(unsigned char);
+ void PlayAnnouncement(uint8);
+ void PlayFrontEndTrack(uint8, uint8);
+ void PreloadCutSceneMusic(uint8);
void PlayPreloadedCutSceneMusic(void);
void StopCutSceneMusic(void);
int32 GetRadioInCar(void);
- void SetRadioInCar(unsigned int);
- void SetRadioChannelByScript(unsigned char, int);
+ void SetRadioInCar(uint32);
+ void SetRadioChannelByScript(uint8, int32);
void ResetMusicAfterReload();
diff --git a/src/audio/audio.h b/src/audio/audio.h
new file mode 100644
index 00000000..55bc5b70
--- /dev/null
+++ b/src/audio/audio.h
@@ -0,0 +1,228 @@
+#pragma once
+
+enum eRadioStation
+{
+ HEAD_RADIO,
+ DOUBLE_CLEF,
+ JAH_RADIO,
+ RISE_FM,
+ LIPS_106,
+ GAME_FM,
+ MSX_FM,
+ FLASHBACK,
+ CHATTERBOX,
+ USERTRACK,
+ POLICE_RADIO,
+ RADIO_OFF,
+};
+
+enum eMusicMode
+{
+ MUSICMODE_FRONTEND = 0,
+ MUSICMODE_GAME,
+ MUSICMODE_CUTSCENE,
+ MUSICMODE_OFF,
+ MUSICMODE_4,
+};
+
+enum eStreamedSounds
+{
+ STREAMED_SOUND_RADIO_HEAD = 0,
+ STREAMED_SOUND_RADIO_CLASSIC = 1,
+ STREAMED_SOUND_RADIO_KJAH = 2,
+ STREAMED_SOUND_RADIO_RISE = 3,
+ STREAMED_SOUND_RADIO_LIPS = 4,
+ STREAMED_SOUND_RADIO_GAME = 5,
+ STREAMED_SOUND_RADIO_MSX = 6,
+ STREAMED_SOUND_RADIO_FLASH = 7,
+ STREAMED_SOUND_RADIO_CHAT = 8,
+ STREAMED_SOUND_RADIO_MP3_PLAYER = 9,
+ STREAMED_SOUND_RADIO_POLICE = 10,
+ STREAMED_SOUND_CITY_AMBIENT = 11,
+ STREAMED_SOUND_WATER_AMBIENT = 12,
+ STREAMED_SOUND_ANNOUNCE_COMMERCIAL_OPEN = 13,
+ STREAMED_SOUND_ANNOUNCE_SUBURBAN_OPEN = 14,
+ STREAMED_SOUND_NEWS_INTRO = 15,
+ STREAMED_SOUND_BANK_INTRO = 16,
+ STREAMED_SOUND_CUTSCENE_LUIGI1_LG = 17,
+ STREAMED_SOUND_CUTSCENE_LUIGI2_DSB = 18,
+ STREAMED_SOUND_CUTSCENE_LUIGI3_DM = 19,
+ STREAMED_SOUND_CUTSCENE_LUIGI4_PAP = 20,
+ STREAMED_SOUND_CUTSCENE_LUIGI5_TFB = 21,
+ STREAMED_SOUND_CUTSCENE_JOEY0_DM2 = 22,
+ STREAMED_SOUND_CUTSCENE_JOEY1_LFL = 23,
+ STREAMED_SOUND_CUTSCENE_JOEY2_KCL = 24,
+ STREAMED_SOUND_CUTSCENE_JOEY3_VH = 25,
+ STREAMED_SOUND_CUTSCENE_JOEY4_ETH = 26,
+ STREAMED_SOUND_CUTSCENE_JOEY5_DST = 27,
+ STREAMED_SOUND_CUTSCENE_JOEY6_TBJ = 28,
+ STREAMED_SOUND_CUTSCENE_TONI1_TOL = 29,
+ STREAMED_SOUND_CUTSCENE_TONI2_TPU = 30,
+ STREAMED_SOUND_CUTSCENE_TONI3_MAS = 31,
+ STREAMED_SOUND_CUTSCENE_TONI4_TAT = 32,
+ STREAMED_SOUND_CUTSCENE_TONI5_BF = 33,
+ STREAMED_SOUND_CUTSCENE_SAL0_MAS = 34,
+ STREAMED_SOUND_CUTSCENE_SAL1_PF = 35,
+ STREAMED_SOUND_CUTSCENE_SAL2_CTG = 36,
+ STREAMED_SOUND_CUTSCENE_SAL3_RTC = 37,
+ STREAMED_SOUND_CUTSCENE_SAL5_LRQ = 38,
+ STREAMED_SOUND_CUTSCENE_SAL4_BDBA = 39,
+ STREAMED_SOUND_CUTSCENE_SAL4_BDBB = 40,
+ STREAMED_SOUND_CUTSCENE_SAL2_CTG2 = 41,
+ STREAMED_SOUND_CUTSCENE_SAL4_BDBD = 42,
+ STREAMED_SOUND_CUTSCENE_SAL5_LRQB = 43,
+ STREAMED_SOUND_CUTSCENE_SAL5_LRQC = 44,
+ STREAMED_SOUND_CUTSCENE_ASUKA_1_SSO = 45,
+ STREAMED_SOUND_CUTSCENE_ASUKA_2_PP = 46,
+ STREAMED_SOUND_CUTSCENE_ASUKA_3_SS = 47,
+ STREAMED_SOUND_CUTSCENE_ASUKA_4_PDR = 48,
+ STREAMED_SOUND_CUTSCENE_ASUKA_5_K2FT = 49,
+ STREAMED_SOUND_CUTSCENE_KENJI1_KBO = 50,
+ STREAMED_SOUND_CUTSCENE_KENJI2_GIS = 51,
+ STREAMED_SOUND_CUTSCENE_KENJI3_DS = 52,
+ STREAMED_SOUND_CUTSCENE_KENJI4_SHI = 53,
+ STREAMED_SOUND_CUTSCENE_KENJI5_SD = 54,
+ STREAMED_SOUND_CUTSCENE_RAY0_PDR2 = 55,
+ STREAMED_SOUND_CUTSCENE_RAY1_SW = 56,
+ STREAMED_SOUND_CUTSCENE_RAY2_AP = 57,
+ STREAMED_SOUND_CUTSCENE_RAY3_ED = 58,
+ STREAMED_SOUND_CUTSCENE_RAY4_GF = 59,
+ STREAMED_SOUND_CUTSCENE_RAY5_PB = 60,
+ STREAMED_SOUND_CUTSCENE_RAY6_MM = 61,
+ STREAMED_SOUND_CUTSCENE_DONALD1_STOG = 62,
+ STREAMED_SOUND_CUTSCENE_DONALD2_KK = 63,
+ STREAMED_SOUND_CUTSCENE_DONALD3_ADO = 64,
+ STREAMED_SOUND_CUTSCENE_DONALD5_ES = 65,
+ STREAMED_SOUND_CUTSCENE_DONALD7_MLD = 66,
+ STREAMED_SOUND_CUTSCENE_DONALD4_GTA = 67,
+ STREAMED_SOUND_CUTSCENE_DONALD4_GTA2 = 68,
+ STREAMED_SOUND_CUTSCENE_DONALD6_STS = 69,
+ STREAMED_SOUND_CUTSCENE_ASUKA6_BAIT = 70,
+ STREAMED_SOUND_CUTSCENE_ASUKA7_ETG = 71,
+ STREAMED_SOUND_CUTSCENE_ASUKA8_PS = 72,
+ STREAMED_SOUND_CUTSCENE_ASUKA9_ASD = 73,
+ STREAMED_SOUND_CUTSCENE_KENJI4_SHI2 = 74,
+ STREAMED_SOUND_CUTSCENE_CATALINA1_TEX = 75,
+ STREAMED_SOUND_CUTSCENE_ELBURRO1_PH1 = 76,
+ STREAMED_SOUND_CUTSCENE_ELBURRO2_PH2 = 77,
+ STREAMED_SOUND_CUTSCENE_ELBURRO3_PH3 = 78,
+ STREAMED_SOUND_CUTSCENE_ELBURRO4_PH4 = 79,
+ STREAMED_SOUND_CUTSCENE_YARDIE_PH1 = 80,
+ STREAMED_SOUND_CUTSCENE_YARDIE_PH2 = 81,
+ STREAMED_SOUND_CUTSCENE_YARDIE_PH3 = 82,
+ STREAMED_SOUND_CUTSCENE_YARDIE_PH4 = 83,
+ STREAMED_SOUND_CUTSCENE_HOODS_PH1 = 84,
+ STREAMED_SOUND_CUTSCENE_HOODS_PH2 = 85,
+ STREAMED_SOUND_CUTSCENE_HOODS_PH3 = 86,
+ STREAMED_SOUND_CUTSCENE_HOODS_PH4 = 87,
+ STREAMED_SOUND_CUTSCENE_HOODS_PH5 = 88,
+ STREAMED_SOUND_CUTSCENE_MARTY_PH1 = 89,
+ STREAMED_SOUND_CUTSCENE_MARTY_PH2 = 90,
+ STREAMED_SOUND_CUTSCENE_MARTY_PH3 = 91,
+ STREAMED_SOUND_CUTSCENE_MARTY_PH4 = 92,
+ STREAMED_SOUND_MISSION_COMPLETED = 93,
+ STREAMED_SOUND_GAME_COMPLETED = 94,
+ STREAMED_SOUND_MISSION_LIB_A1 = 95,
+ STREAMED_SOUND_MISSION_LIB_A2 = 96,
+ STREAMED_SOUND_MISSION_LIB_A = 97,
+ STREAMED_SOUND_MISSION_LIB_B = 98,
+ STREAMED_SOUND_MISSION_LIB_C = 99,
+ STREAMED_SOUND_MISSION_LIB_D = 100,
+ STREAMED_SOUND_MISSION_L2_A = 101,
+ STREAMED_SOUND_MISSION_J4T_1 = 102,
+ STREAMED_SOUND_MISSION_J4T_2 = 103,
+ STREAMED_SOUND_MISSION_J4T_3 = 104,
+ STREAMED_SOUND_MISSION_J4T_4 = 105,
+ STREAMED_SOUND_MISSION_J4_A = 106,
+ STREAMED_SOUND_MISSION_J4_B = 107,
+ STREAMED_SOUND_MISSION_J4_C = 108,
+ STREAMED_SOUND_MISSION_J4_D = 109,
+ STREAMED_SOUND_MISSION_J4_E = 110,
+ STREAMED_SOUND_MISSION_J4_F = 111,
+ STREAMED_SOUND_MISSION_J6_1 = 112,
+ STREAMED_SOUND_MISSION_J6_A = 113,
+ STREAMED_SOUND_MISSION_J6_B = 114,
+ STREAMED_SOUND_MISSION_J6_C = 115,
+ STREAMED_SOUND_MISSION_J6_D = 116,
+ STREAMED_SOUND_MISSION_T4_A = 117,
+ STREAMED_SOUND_MISSION_S1_A = 118,
+ STREAMED_SOUND_MISSION_S1_A1 = 119,
+ STREAMED_SOUND_MISSION_S1_B = 120,
+ STREAMED_SOUND_MISSION_S1_C = 121,
+ STREAMED_SOUND_MISSION_S1_C1 = 122,
+ STREAMED_SOUND_MISSION_S1_D = 123,
+ STREAMED_SOUND_MISSION_S1_E = 124,
+ STREAMED_SOUND_MISSION_S1_F = 125,
+ STREAMED_SOUND_MISSION_S1_G = 126,
+ STREAMED_SOUND_MISSION_S1_H = 127,
+ STREAMED_SOUND_MISSION_S1_I = 128,
+ STREAMED_SOUND_MISSION_S1_J = 129,
+ STREAMED_SOUND_MISSION_S1_K = 130,
+ STREAMED_SOUND_MISSION_S1_L = 131,
+ STREAMED_SOUND_MISSION_S3_A = 132,
+ STREAMED_SOUND_MISSION_S3_B = 133,
+ STREAMED_SOUND_MISSION_EL3_A = 134,
+ STREAMED_SOUND_MISSION_MF1_A = 135,
+ STREAMED_SOUND_MISSION_MF2_A = 136,
+ STREAMED_SOUND_MISSION_MF3_A = 137,
+ STREAMED_SOUND_MISSION_MF3_B = 138,
+ STREAMED_SOUND_MISSION_MF3_B1 = 139,
+ STREAMED_SOUND_MISSION_MF3_C = 140,
+ STREAMED_SOUND_MISSION_MF4_A = 141,
+ STREAMED_SOUND_MISSION_MF4_B = 142,
+ STREAMED_SOUND_MISSION_MF4_C = 143,
+ STREAMED_SOUND_MISSION_A1_A = 144,
+ STREAMED_SOUND_MISSION_A3_A = 145,
+ STREAMED_SOUND_MISSION_A5_A = 146,
+ STREAMED_SOUND_MISSION_A4_A = 147,
+ STREAMED_SOUND_MISSION_A4_B = 148,
+ STREAMED_SOUND_MISSION_A4_C = 149,
+ STREAMED_SOUND_MISSION_A4_D = 150,
+ STREAMED_SOUND_MISSION_K1_A = 151,
+ STREAMED_SOUND_MISSION_K3_A = 152,
+ STREAMED_SOUND_MISSION_R1_A = 153,
+ STREAMED_SOUND_MISSION_R2_A = 154,
+ STREAMED_SOUND_MISSION_R2_B = 155,
+ STREAMED_SOUND_MISSION_R2_C = 156,
+ STREAMED_SOUND_MISSION_R2_D = 157,
+ STREAMED_SOUND_MISSION_R2_E = 158,
+ STREAMED_SOUND_MISSION_R2_F = 159,
+ STREAMED_SOUND_MISSION_R2_G = 160,
+ STREAMED_SOUND_MISSION_R2_H = 161,
+ STREAMED_SOUND_MISSION_R5_A = 162,
+ STREAMED_SOUND_MISSION_R6_A = 163,
+ STREAMED_SOUND_MISSION_R6_A1 = 164,
+ STREAMED_SOUND_MISSION_R6_B = 165,
+ STREAMED_SOUND_MISSION_LO2_A = 166,
+ STREAMED_SOUND_MISSION_LO6_A = 167,
+ STREAMED_SOUND_MISSION_YD2_A = 168,
+ STREAMED_SOUND_MISSION_YD2_B = 169,
+ STREAMED_SOUND_MISSION_YD2_C = 170,
+ STREAMED_SOUND_MISSION_YD2_C1 = 171,
+ STREAMED_SOUND_MISSION_YD2_D = 172,
+ STREAMED_SOUND_MISSION_YD2_E = 173,
+ STREAMED_SOUND_MISSION_YD2_F = 174,
+ STREAMED_SOUND_MISSION_YD2_G = 175,
+ STREAMED_SOUND_MISSION_YD2_H = 176,
+ STREAMED_SOUND_MISSION_YD2_ASS = 177,
+ STREAMED_SOUND_MISSION_YD2_OK = 178,
+ STREAMED_SOUND_MISSION_H5_A = 179,
+ STREAMED_SOUND_MISSION_H5_B = 180,
+ STREAMED_SOUND_MISSION_H5_C = 181,
+ STREAMED_SOUND_MISSION_AMMU_A = 182,
+ STREAMED_SOUND_MISSION_AMMU_B = 183,
+ STREAMED_SOUND_MISSION_AMMU_C = 184,
+ STREAMED_SOUND_MISSION_DOOR_1 = 185,
+ STREAMED_SOUND_MISSION_DOOR_2 = 186,
+ STREAMED_SOUND_MISSION_DOOR_3 = 187,
+ STREAMED_SOUND_MISSION_DOOR_4 = 188,
+ STREAMED_SOUND_MISSION_DOOR_5 = 189,
+ STREAMED_SOUND_MISSION_DOOR_6 = 190,
+ STREAMED_SOUND_MISSION_T3_A = 191,
+ STREAMED_SOUND_MISSION_T3_B = 192,
+ STREAMED_SOUND_MISSION_T3_C = 193,
+ STREAMED_SOUND_MISSION_K1_B = 194,
+ STREAMED_SOUND_MISSION_CAT1 = 195,
+ TOTAL_STREAMED_SOUNDS = 196,
+ NO_STREAMED_SOUND = 197,
+}; \ No newline at end of file
diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp
index 473b13d3..1bd1bf4b 100644
--- a/src/control/Replay.cpp
+++ b/src/control/Replay.cpp
@@ -1036,7 +1036,7 @@ void CReplay::TriggerPlayback(uint8 cam_mode, float cam_x, float cam_y, float ca
bAllowLookAroundCam = true;
bPlayingBackFromFile = false;
OldRadioStation = DMAudio.GetRadioInCar();
- DMAudio.ChangeMusicMode(0);
+ DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
DMAudio.SetEffectsFadeVol(0);
DMAudio.SetMusicFadeVol(0);
int current;
@@ -1282,9 +1282,9 @@ void CReplay::RestoreStuffFromMem(void)
}
delete[] pPedAnims;
pPedAnims = nil;
- DMAudio.ChangeMusicMode(0);
+ DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
DMAudio.SetRadioInCar(OldRadioStation);
- DMAudio.ChangeMusicMode(1);
+ DMAudio.ChangeMusicMode(MUSICMODE_GAME);
}
#endif
diff --git a/src/core/CutsceneMgr.cpp b/src/core/CutsceneMgr.cpp
index 95abfcc9..f147e8c9 100644
--- a/src/core/CutsceneMgr.cpp
+++ b/src/core/CutsceneMgr.cpp
@@ -17,7 +17,6 @@
#include "RpAnimBlend.h"
#include "ModelIndices.h"
#include "TempColModels.h"
-#include "MusicManager.h"
const struct {
const char *szTrackName;
@@ -209,7 +208,7 @@ CCutsceneMgr::LoadCutsceneData(const char *szCutsceneName)
CFileMgr::CloseFile(file);
if (strcmpi(ms_cutsceneName, "end")) {
- DMAudio.ChangeMusicMode(2);
+ DMAudio.ChangeMusicMode(MUSICMODE_CUTSCENE);
int trackId = FindCutsceneAudioTrackId(szCutsceneName);
if (trackId != -1) {
printf("Start preload audio %s\n", szCutsceneName);
@@ -368,7 +367,7 @@ CCutsceneMgr::DeleteCutsceneData(void)
if (strcmpi(ms_cutsceneName, "end")) {
DMAudio.StopCutSceneMusic();
if (strcmpi(ms_cutsceneName, "bet"))
- DMAudio.ChangeMusicMode(1);
+ DMAudio.ChangeMusicMode(MUSICMODE_GAME);
}
CTimer::Stop();
//TheCamera.GetScreenFadeStatus() == 2; // what for??
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 0be25e8a..6ba6d5c8 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -11,7 +11,6 @@
#include "Timer.h"
#include "Game.h"
#include "DMAudio.h"
-#include "MusicManager.h"
#include "FileMgr.h"
#include "Streaming.h"
#include "TxdStore.h"
@@ -535,7 +534,7 @@ void CMenuManager::Draw()
if (m_nPrefsAudio3DProviderIndex == -1)
textToPrint[MENUCOLUMN_RIGHT] = TheText.Get("FEA_NAH");
else {
- char *provider = MusicManager.Get3DProviderName(m_nPrefsAudio3DProviderIndex);
+ char *provider = DMAudio.Get3DProviderName(m_nPrefsAudio3DProviderIndex);
AsciiToUnicode(provider, gUString);
textToPrint[MENUCOLUMN_RIGHT] = gUString;
}
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 11141b04..17c79209 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -45,7 +45,6 @@
#include "CarAI.h"
#include "Zones.h"
#include "Cranes.h"
-#include "MusicManager.h"
#include "Timecycle.h"
#include "ParticleObject.h"
#include "Floater.h"
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index fc82e51e..4da63fe6 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -2162,7 +2162,7 @@ _WinMain(HINSTANCE instance,
CPad::ResetCheats();
CPad::StopPadsShaking();
- DMAudio.ChangeMusicMode(_TODOCONST(3));
+ DMAudio.ChangeMusicMode(MUSICMODE_OFF);
CTimer::Stop();
@@ -2170,7 +2170,7 @@ _WinMain(HINSTANCE instance,
{
CGame::ShutDownForRestart();
CGame::InitialiseWhenRestarting();
- DMAudio.ChangeMusicMode(_TODOCONST(1));
+ DMAudio.ChangeMusicMode(MUSICMODE_GAME);
LoadSplash(GetLevelSplashScreen(CGame::currLevel));
FrontEndMenuManager.m_bLoadingSavedGame = false;
}
diff --git a/src/skel/win/win.h b/src/skel/win/win.h
index 8c32e57d..ae2c7eec 100644
--- a/src/skel/win/win.h
+++ b/src/skel/win/win.h
@@ -90,4 +90,5 @@ void HandleExit();
#endif /* __cplusplus */
+extern DWORD &_dwOperatingSystemVersion;
#endif /* (!defined(_PLATFORM_WIN_H)) */
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 7229992d..3d02dd25 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -15,7 +15,6 @@
#include "PointLights.h"
#include "Renderer.h"
#include "DMAudio.h"
-#include "MusicManager.h"
#include "Radar.h"
bool &CVehicle::bWheelsOnlyCheat = *(bool *)0x95CD78;