Merge pull request #702 from Sergeanur/VC/MusicManager

cMusicManager, cDMAudio, radio position save/load, a few commands imp…
This commit is contained in:
Sergeanur
2020-09-13 03:10:14 +03:00
committed by GitHub
22 changed files with 1444 additions and 762 deletions

View File

@ -11936,7 +11936,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
return 0;
case COMMAND_SHUT_CHAR_UP:
CollectParameters(&m_nIp, 2);
debug("SHUT_CHAR_UP not implemented"); // TODO(MIAMI)
DMAudio.SetPedTalkingStatus(CPools::GetPedPool()->GetAt(ScriptParams[0]), ScriptParams[1] == 0);
return 0;
case COMMAND_SET_ENABLE_RC_DETONATE:
CollectParameters(&m_nIp, 1);
@ -12563,13 +12563,13 @@ int8 CRunningScript::ProcessCommands1200To1299(int32 command)
case COMMAND_SHUT_PLAYER_UP:
{
CollectParameters(&m_nIp, 2);
debug("SHUT_PLAYER_UP is not implemented\n"); // TODO(MIAMI)
DMAudio.ShutUpPlayerTalking(!!ScriptParams[1]);
return 0;
}
case COMMAND_SET_PLAYER_MOOD:
{
CollectParameters(&m_nIp, 3);
debug("SET_PLAYER_MOOD is not implemented\n"); // TODO(MIAMI)
DMAudio.SetPlayersMood(ScriptParams[1], ScriptParams[2]);
return 0;
}
case COMMAND_REQUEST_COLLISION:
@ -13001,7 +13001,7 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
}
case COMMAND_DISABLE_CUTSCENE_SHADOWS:
{
debug("DISABLE_CUTSCENE_SHADOWS not implemented, skipping\n"); // TODO(MIAMI)
CCutsceneMgr::DisableCutsceneShadows();
return 0;
}
case COMMAND_HAS_GLASS_BEEN_SHATTERED_NEARBY:
@ -13186,7 +13186,7 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
return 0;
case COMMAND_REMOVE_EVERYTHING_FOR_HUGE_CUTSCENE:
{
debug("REMOVE_EVERYTHING_FOR_HUGE_CUTSCENE not implemented, skipping\n");
CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver();
return 0;
}
case COMMAND_IS_PLAYER_TOUCHING_VEHICLE:

View File

@ -282,12 +282,12 @@ class CTheScripts
static uint8 UseTextCommands;
static uint16 CommandsExecuted;
static uint16 ScriptsUpdated;
static uint8 RiotIntensity;
static uint32 LastMissionPassedTime;
static uint16 NumberOfExclusiveMissionScripts;
static bool bPlayerIsInTheStatium;
public:
static uint8 RiotIntensity;
static bool bPlayerHasMetDebbieHarry;
public:
static void Init();
static void Process();