1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Multiplayer LOBOT fix (by Asdow).

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-02-27 18:23:38 +00:00
parent a94a32aa97
commit a09c0a8b33
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Init.cpp
+11 -8
View File
@@ -195,7 +195,7 @@ void ResetEmptyRPCFaceSlots()
} }
} }
BOOLEAN LoadExternalGameplayData(STR directoryName) BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer)
{ {
char fileName[MAX_PATH]; char fileName[MAX_PATH];
@@ -439,12 +439,15 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
strcat(fileName, LBEPOCKETFILENAME); strcat(fileName, LBEPOCKETFILENAME);
SGP_THROW_IFFALSE(ReadInLBEPocketStats(fileName,FALSE),LBEPOCKETFILENAME); SGP_THROW_IFFALSE(ReadInLBEPocketStats(fileName,FALSE),LBEPOCKETFILENAME);
{ {
using namespace LogicalBodyTypes; if (isMultiplayer == false)
SGP_THROW_IFFALSE(Layers::Instance().LoadFromFile(directoryName, LBT_LAYERSFILENAME), LBT_LAYERSFILENAME); {
SGP_THROW_IFFALSE(PaletteDB::Instance().LoadFromFile(directoryName, LBT_PALETTESFILENAME), LBT_PALETTESFILENAME); using namespace LogicalBodyTypes;
SGP_THROW_IFFALSE(SurfaceDB::Instance().LoadFromFile(directoryName, LBT_ANIMSURFACESFILENAME), LBT_ANIMSURFACESFILENAME); SGP_THROW_IFFALSE(Layers::Instance().LoadFromFile(directoryName, LBT_LAYERSFILENAME), LBT_LAYERSFILENAME);
SGP_THROW_IFFALSE(FilterDB::Instance().LoadFromFile(directoryName, LBT_FILTERSFILENAME), LBT_FILTERSFILENAME); SGP_THROW_IFFALSE(PaletteDB::Instance().LoadFromFile(directoryName, LBT_PALETTESFILENAME), LBT_PALETTESFILENAME);
SGP_THROW_IFFALSE(BodyTypeDB::Instance().LoadFromFile(directoryName, LBT_BODYTYPESFILENAME), LBT_BODYTYPESFILENAME); 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 #ifndef ENGLISH
@@ -1452,7 +1455,7 @@ UINT32 InitializeJA2(void)
//{ //{
// return( ERROR_SCREEN ); // 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 // Load external text
LoadAllExternalText(); LoadAllExternalText();
Init.h
+1 -1
View File
@@ -18,7 +18,7 @@
UINT32 InitializeJA2( ); UINT32 InitializeJA2( );
void ShutdownJA2( ); void ShutdownJA2( );
BOOLEAN LoadExternalGameplayData(STR directoryName); BOOLEAN LoadExternalGameplayData(STR directoryName, BOOLEAN isMultiplayer);
void SetupMaxActionPointsAnimation(); void SetupMaxActionPointsAnimation();
//This is an enum to reference to array of ints that holds the values for all these constants. Gotthard 1/18/07 //This is an enum to reference to array of ints that holds the values for all these constants. Gotthard 1/18/07
MPConnectScreen.cpp
+1 -1
View File
@@ -438,7 +438,7 @@ void DoneFadeOutForExitMPCScreen( void )
{ {
// ------------------------------------------ // ------------------------------------------
// Now Initialize the client again with all the files from the "_MULTIPLAYER" profile!!! // Now Initialize the client again with all the files from the "_MULTIPLAYER" profile!!!
LoadExternalGameplayData(TABLEDATA_DIRECTORY); LoadExternalGameplayData(TABLEDATA_DIRECTORY, true);
LoadAllExternalText(); LoadAllExternalText();
InitDependingGameStyleOptions(); InitDependingGameStyleOptions();
InitNewGame(false); InitNewGame(false);
MPHostScreen.cpp
+1 -1
View File
@@ -2794,7 +2794,7 @@ void BtnMPHStartCallback(GUI_BUTTON *btn,INT32 reason)
gGameOptions.ubDifficultyLevel = iMPHDifficulty + 1; gGameOptions.ubDifficultyLevel = iMPHDifficulty + 1;
// WANNE - MP: Reinit TableData folder and INIs // WANNE - MP: Reinit TableData folder and INIs
LoadExternalGameplayData(TABLEDATA_DIRECTORY); LoadExternalGameplayData(TABLEDATA_DIRECTORY, true);
InitDependingGameStyleOptions(); InitDependingGameStyleOptions();
} }