joshua
/
re3-mirror
mirror of https://github.com/GTAmodding/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes

This commit is contained in:
Sergeanur 2020-06-08 16:22:49 +03:00
parent 8cd87236c9
commit 95e9fe7693
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/AudioLogic.cpp
View File

@ -5700,7 +5700,7 @@ cAudioManager::IsMissionAudioSamplePlaying(uint8 slot) const
} else {
static int32 cPretendFrame[MISSION_AUDIO_SLOTS] = { 1, 1 };
return (cPretendFrame[MISSION_AUDIO_SLOTS]++ % 64) != 0;
return (cPretendFrame[slot]++ % 64) != 0;
}
}
@ -5716,7 +5716,7 @@ cAudioManager::IsMissionAudioSampleFinished(uint8 slot)
static int32 cPretendFrame[MISSION_AUDIO_SLOTS] = { 1, 1 };
return (cPretendFrame[MISSION_AUDIO_SLOTS]++ % 64) == 0;
return (cPretendFrame[slot]++ % 64) == 0;
}
void

8
src/control/GameLogic.cpp
View File

@ -193,15 +193,15 @@ CGameLogic::Update()
pPlayerInfo.m_nBustedAudioStatus = BUSTEDAUDIO_LOADING;
char name[12];
sprintf(name, pPlayerInfo.m_nCurrentBustedAudio >= 10 ? "bust_%d" : "bust_0%d", pPlayerInfo.m_nCurrentBustedAudio);
DMAudio.ClearMissionAudio(0); // TODO(MIAMI): argument is 0
DMAudio.PreloadMissionAudio(0, name); // TODO(MIAMI): argument is 0
DMAudio.ClearMissionAudio(0);
DMAudio.PreloadMissionAudio(0, name);
pPlayerInfo.m_nCurrentBustedAudio = pPlayerInfo.m_nCurrentBustedAudio % 28 + 1; // enum? const? TODO
}
}
if (CTimer::GetTimeInMilliseconds() - pPlayerInfo.m_nWBTime > 4000 &&
pPlayerInfo.m_nBustedAudioStatus == BUSTEDAUDIO_LOADING &&
DMAudio.GetMissionAudioLoadingStatus(0) == 1) { // TODO: argument is 0
DMAudio.PlayLoadedMissionAudio(0); // TODO: argument is 0
DMAudio.GetMissionAudioLoadingStatus(0) == 1) {
DMAudio.PlayLoadedMissionAudio(0);
pPlayerInfo.m_nBustedAudioStatus = BUSTEDAUDIO_DONE;
}

1
src/control/Script.cpp
View File

@ -8662,7 +8662,6 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
strncpy(str, (char*)&CTheScripts::ScriptSpace[m_nIp], KEY_LENGTH_IN_SCRIPT);
for (int i = 0; i < KEY_LENGTH_IN_SCRIPT; i++)
str[i] = tolower(str[i]);
static bool bShowed = false;
m_nIp += KEY_LENGTH_IN_SCRIPT;
DMAudio.PreloadMissionAudio(ScriptParams[0] - 1, str);
return 0;