summaryrefslogtreecommitdiffstats
path: root/src/peds/Ped.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-27 02:29:54 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-27 02:29:54 +0200
commit408faf8a663672030682d15c5c85cd17dba85cf1 (patch)
tree0f565542461fe3b6185a3a0632c03b5109c0693d /src/peds/Ped.cpp
parentMerge pull request #553 from Sergeanur/VC/audio (diff)
downloadre3-408faf8a663672030682d15c5c85cd17dba85cf1.tar
re3-408faf8a663672030682d15c5c85cd17dba85cf1.tar.gz
re3-408faf8a663672030682d15c5c85cd17dba85cf1.tar.bz2
re3-408faf8a663672030682d15c5c85cd17dba85cf1.tar.lz
re3-408faf8a663672030682d15c5c85cd17dba85cf1.tar.xz
re3-408faf8a663672030682d15c5c85cd17dba85cf1.tar.zst
re3-408faf8a663672030682d15c5c85cd17dba85cf1.zip
Diffstat (limited to 'src/peds/Ped.cpp')
-rw-r--r--src/peds/Ped.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index 691b5195..becd7c70 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -15767,17 +15767,18 @@ CPed::SetEnterCar(CVehicle *car, uint32 unused)
void
CPed::SetRadioStation(void)
{
+ // TODO: this should be gone
static const uint8 radiosPerRadioCategories[10][4] = {
- {JAH_RADIO, RISE_FM, GAME_FM, MSX_FM},
- {HEAD_RADIO, DOUBLE_CLEF, LIPS_106, FLASHBACK},
- {RISE_FM, GAME_FM, MSX_FM, FLASHBACK},
- {HEAD_RADIO, RISE_FM, LIPS_106, MSX_FM},
- {HEAD_RADIO, RISE_FM, MSX_FM, FLASHBACK},
- {JAH_RADIO, RISE_FM, LIPS_106, FLASHBACK},
- {HEAD_RADIO, RISE_FM, LIPS_106, FLASHBACK},
- {HEAD_RADIO, JAH_RADIO, LIPS_106, FLASHBACK},
- {HEAD_RADIO, DOUBLE_CLEF, LIPS_106, FLASHBACK},
- {CHATTERBOX, HEAD_RADIO, LIPS_106, GAME_FM}
+ {KCHAT, FEVER, VCPR, RADIO_ESPANTOSO},
+ {WILDSTYLE, FLASH_FM, V_ROCK, EMOTION},
+ {FEVER, VCPR, RADIO_ESPANTOSO, EMOTION},
+ {WILDSTYLE, FEVER, V_ROCK, RADIO_ESPANTOSO},
+ {WILDSTYLE, FEVER, RADIO_ESPANTOSO, EMOTION},
+ {KCHAT, FEVER, V_ROCK, EMOTION},
+ {WILDSTYLE, FEVER, V_ROCK, EMOTION},
+ {WILDSTYLE, KCHAT, V_ROCK, EMOTION},
+ {WILDSTYLE, FLASH_FM, V_ROCK, EMOTION},
+ {WAVE, WILDSTYLE, V_ROCK, VCPR}
};
uint8 orderInCat = 0; // BUG: this wasn't initialized