Merge pull request #2 from GTAmodding/miami

Miami
This commit is contained in:
Fire_Head
2020-05-27 21:51:40 +03:00
committed by GitHub
23 changed files with 3735 additions and 4785 deletions

View File

@ -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