diff --git a/Init.cpp b/Init.cpp index 857a6459..31632b94 100644 --- a/Init.cpp +++ b/Init.cpp @@ -195,7 +195,7 @@ void ResetEmptyRPCFaceSlots() } } -BOOLEAN LoadExternalGameplayData(STR directoryName) +BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer) { char fileName[MAX_PATH]; @@ -439,12 +439,15 @@ BOOLEAN LoadExternalGameplayData(STR directoryName) strcat(fileName, LBEPOCKETFILENAME); SGP_THROW_IFFALSE(ReadInLBEPocketStats(fileName,FALSE),LBEPOCKETFILENAME); { - using namespace LogicalBodyTypes; - SGP_THROW_IFFALSE(Layers::Instance().LoadFromFile(directoryName, LBT_LAYERSFILENAME), LBT_LAYERSFILENAME); - SGP_THROW_IFFALSE(PaletteDB::Instance().LoadFromFile(directoryName, LBT_PALETTESFILENAME), LBT_PALETTESFILENAME); - SGP_THROW_IFFALSE(SurfaceDB::Instance().LoadFromFile(directoryName, LBT_ANIMSURFACESFILENAME), LBT_ANIMSURFACESFILENAME); - SGP_THROW_IFFALSE(FilterDB::Instance().LoadFromFile(directoryName, LBT_FILTERSFILENAME), LBT_FILTERSFILENAME); - SGP_THROW_IFFALSE(BodyTypeDB::Instance().LoadFromFile(directoryName, LBT_BODYTYPESFILENAME), LBT_BODYTYPESFILENAME); + if (isMultiplayer == false) + { + using namespace LogicalBodyTypes; + SGP_THROW_IFFALSE(Layers::Instance().LoadFromFile(directoryName, LBT_LAYERSFILENAME), LBT_LAYERSFILENAME); + SGP_THROW_IFFALSE(PaletteDB::Instance().LoadFromFile(directoryName, LBT_PALETTESFILENAME), LBT_PALETTESFILENAME); + SGP_THROW_IFFALSE(SurfaceDB::Instance().LoadFromFile(directoryName, LBT_ANIMSURFACESFILENAME), LBT_ANIMSURFACESFILENAME); + SGP_THROW_IFFALSE(FilterDB::Instance().LoadFromFile(directoryName, LBT_FILTERSFILENAME), LBT_FILTERSFILENAME); + SGP_THROW_IFFALSE(BodyTypeDB::Instance().LoadFromFile(directoryName, LBT_BODYTYPESFILENAME), LBT_BODYTYPESFILENAME); + } } #ifndef ENGLISH @@ -1452,7 +1455,7 @@ UINT32 InitializeJA2(void) //{ // return( ERROR_SCREEN ); //} - SGP_TRYCATCH_RETHROW(LoadExternalGameplayData(TABLEDATA_DIRECTORY),L"Loading external data failed"); + SGP_TRYCATCH_RETHROW(LoadExternalGameplayData(TABLEDATA_DIRECTORY, false),L"Loading external data failed"); // Load external text LoadAllExternalText(); diff --git a/Init.h b/Init.h index 5ead7790..a6c53f49 100644 --- a/Init.h +++ b/Init.h @@ -18,7 +18,7 @@ UINT32 InitializeJA2( ); void ShutdownJA2( ); -BOOLEAN LoadExternalGameplayData(STR directoryName); +BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer); void SetupMaxActionPointsAnimation(); //This is an enum to reference to array of ints that holds the values for all these constants. Gotthard 1/18/07 diff --git a/MPConnectScreen.cpp b/MPConnectScreen.cpp index 6970ae76..3e56d831 100644 --- a/MPConnectScreen.cpp +++ b/MPConnectScreen.cpp @@ -438,7 +438,7 @@ void DoneFadeOutForExitMPCScreen( void ) { // ------------------------------------------ // Now Initialize the client again with all the files from the "_MULTIPLAYER" profile!!! - LoadExternalGameplayData(TABLEDATA_DIRECTORY); + LoadExternalGameplayData(TABLEDATA_DIRECTORY, true); LoadAllExternalText(); InitDependingGameStyleOptions(); InitNewGame(false); diff --git a/MPHostScreen.cpp b/MPHostScreen.cpp index 7f2e0c14..d93d3e73 100644 --- a/MPHostScreen.cpp +++ b/MPHostScreen.cpp @@ -2794,7 +2794,7 @@ void BtnMPHStartCallback(GUI_BUTTON *btn,INT32 reason) gGameOptions.ubDifficultyLevel = iMPHDifficulty + 1; // WANNE - MP: Reinit TableData folder and INIs - LoadExternalGameplayData(TABLEDATA_DIRECTORY); + LoadExternalGameplayData(TABLEDATA_DIRECTORY, true); InitDependingGameStyleOptions(); }