mirror of
https://github.com/halpz/re3.git
synced 2025-07-11 20:28:25 +00:00
Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgr
CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit
This commit is contained in:
@ -1984,7 +1984,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_START_CUTSCENE:
|
||||
CCutsceneMgr::ms_cutsceneLoadStatus = 1;
|
||||
CCutsceneMgr::StartCutscene();
|
||||
return 0;
|
||||
case COMMAND_GET_CUTSCENE_TIME:
|
||||
SET_INTEGER_PARAM(0, CCutsceneMgr::GetCutsceneTimeInMilleseconds());
|
||||
|
@ -2754,30 +2754,16 @@ void CTheScripts::ReadObjectNamesFromScript()
|
||||
|
||||
void CTheScripts::UpdateObjectIndices()
|
||||
{
|
||||
char name[USED_OBJECT_NAME_LENGTH];
|
||||
char error[112];
|
||||
for (int i = 1; i < NumberOfUsedObjects; i++) {
|
||||
bool found = false;
|
||||
for (int j = 0; j < MODELINFOSIZE && !found; j++) {
|
||||
CBaseModelInfo* pModel = CModelInfo::GetModelInfo(j);
|
||||
if (!pModel)
|
||||
continue;
|
||||
strcpy(name, pModel->GetModelName());
|
||||
#ifdef FIX_BUGS
|
||||
for (int k = 0; k < USED_OBJECT_NAME_LENGTH && name[k]; k++)
|
||||
#else
|
||||
for (int k = 0; k < USED_OBJECT_NAME_LENGTH; k++)
|
||||
#endif
|
||||
name[k] = toupper(name[k]);
|
||||
if (strcmp(name, UsedObjectArray[i].name) == 0) {
|
||||
found = true;
|
||||
UsedObjectArray[i].index = j;
|
||||
}
|
||||
}
|
||||
if (!found) {
|
||||
UsedObjectArray[i].index = -1;
|
||||
CModelInfo::GetModelInfo(UsedObjectArray[i].name, &UsedObjectArray[i].index);
|
||||
#ifndef FINAL
|
||||
if (UsedObjectArray[i].index == -1) {
|
||||
sprintf(error, "CTheScripts::UpdateObjectIndices - Couldn't find %s", UsedObjectArray[i].name);
|
||||
debug("%s\n", error);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1018,7 +1018,7 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
|
||||
return 0;
|
||||
case COMMAND_REMOVE_EVERYTHING_FOR_HUGE_CUTSCENE:
|
||||
{
|
||||
CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver();
|
||||
//CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver();
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_IS_PLAYER_TOUCHING_VEHICLE:
|
||||
|
@ -77,7 +77,7 @@ int8 CRunningScript::ProcessCommands1400To1499(int32 command)
|
||||
case COMMAND_PLAY_ANNOUNCEMENT:
|
||||
{
|
||||
CollectParameters(&m_nIp, 1);
|
||||
DMAudio.PlayRadioAnnouncement(ScriptParams[0] + STREAMED_SOUND_ANNOUNCE_BRIDGE_CLOSED);
|
||||
DMAudio.PlayRadioAnnouncement(ScriptParams[0] + STREAMED_SOUND_NEWS_A);
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_SET_PLAYER_IS_IN_STADIUM:
|
||||
|
Reference in New Issue
Block a user