CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit

This commit is contained in:
Sergeanur 2021-01-11 19:53:15 +02:00
parent cf11b32849
commit a223157000
32 changed files with 1588 additions and 3128 deletions

View file

@ -37,6 +37,7 @@
#include "Font.h"
#include "Frontend.h"
#include "VarConsole.h"
#include "KeyGen.h"
//--MIAMI: file done (possibly bugs)
@ -948,53 +949,45 @@ CStreaming::RequestIslands(eLevelName level)
}
}
static char *IGnames[] = {
"player",
"player2",
"player3",
"player4",
"player5",
"player6",
"player7",
"player8",
"player9",
"play10",
"play11",
"igken",
"igcandy",
"igsonny",
"igbuddy",
"igjezz",
"ighlary",
"igphil",
"igmerc",
"igdick",
"igdiaz",
const char *csPlayerNames[] =
{
"csplr",
"csplr2",
"csplr3",
"csplr4",
"csplr5",
"csplr6",
"csplr7",
"csplr8",
"csplr9",
"csplr10",
"csplr11",
"csplr12",
"csplr13",
"csplr14",
"csplr15",
"csplr16",
""
};
static char *CSnames[] = {
"csplay",
"csplay2",
"csplay3",
"csplay4",
"csplay5",
"csplay6",
"csplay7",
"csplay8",
"csplay9",
"csplay10",
"csplay11",
"csken",
"cscandy",
"cssonny",
"csbuddy",
"csjezz",
"cshlary",
"csphil",
"csmerc",
"csdick",
"csdiaz",
const char* playerNames[] =
{
"plr",
"plr2",
"plr3",
"plr4",
"plr5",
"plr6",
"plr7",
"plr8",
"plr9",
"plr10",
"plr11",
"plr12",
"plr13",
"plr14",
"plr15",
"plr16",
""
};
@ -1008,15 +1001,17 @@ CStreaming::RequestSpecialModel(int32 modelId, const char *modelName, int32 flag
int i, n;
mi = CModelInfo::GetModelInfo(modelId);
if(strncasecmp("CSPlay", modelName, 6) == 0){
char *curname = CModelInfo::GetModelInfo(MI_PLAYER)->GetModelName();
for(int i = 0; CSnames[i][0]; i++){
if(strcasecmp(curname, IGnames[i]) == 0){
modelName = CSnames[i];
if (CKeyGen::GetUppercaseKey(modelName) == CKeyGen::GetUppercaseKey("cstoni_a")) {
i = 0;
while (csPlayerNames[i][0] != '\0') {
if (CModelInfo::GetModelInfo(0)->GetNameHashKey() == CKeyGen::GetUppercaseKey(playerNames[i])) {
modelName = csPlayerNames[i];
break;
}
i++;
}
}
if(!CGeneral::faststrcmp(mi->GetModelName(), modelName)){
// Already have the correct name, just request it
RequestModel(modelId, flags);