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: Fixed crash/freeze when clicking "Host" in the host screen

Browse Source 
o It seems the feature "soldier profiles allows defining individual names/bodytypes/hair/skin/traits of soldiers and militia" (revision 6071) makes trouble with multiplayer. So I disabled the feature and initialization of the xml files in a MP game
o Removed the re-initialization of the xml files when clicking on the "Multiplayer Game" menu button. Cause I think the re-initialization is not neede.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6121 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-06-14 00:12:11 +00:00
parent 8f41617845
commit 4e3f468a4c
3 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Init.cpp
+34 -30
View File
@@ -83,6 +83,7 @@
#include "Encyclopedia.h"
#include "Encyclopedia_Data.h"
#include "AimArchives.h"
#include "connect.h"
extern INT16 APBPConstants[TOTAL_APBP_VALUES] = {0};
extern INT16 gubMaxActionPoints[28];//MAXBODYTYPES = 28... JUST GETTING IT TO WORK NOW. GOTTHARD 7/2/08
@@ -1013,41 +1014,44 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
#endif
// Flugente: soldier profiles
strcpy(fileName, directoryName);
strcat(fileName, ENEMY_ADMIN_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[0], fileName), ENEMY_ADMIN_PROFILE_FILENAME);
num_found_soldier_profiles[0] = num_found_profiles;
if (!is_networked)
{
strcpy(fileName, directoryName);
strcat(fileName, ENEMY_ADMIN_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[0], fileName), ENEMY_ADMIN_PROFILE_FILENAME);
num_found_soldier_profiles[0] = num_found_profiles;
strcpy(fileName, directoryName);
strcat(fileName, ENEMY_REGULAR_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[1], fileName), ENEMY_REGULAR_PROFILE_FILENAME);
num_found_soldier_profiles[1] = num_found_profiles;
strcpy(fileName, directoryName);
strcat(fileName, ENEMY_REGULAR_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[1], fileName), ENEMY_REGULAR_PROFILE_FILENAME);
num_found_soldier_profiles[1] = num_found_profiles;
strcpy(fileName, directoryName);
strcat(fileName, ENEMY_ELITE_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[2], fileName), ENEMY_ELITE_PROFILE_FILENAME);
num_found_soldier_profiles[2] = num_found_profiles;
strcpy(fileName, directoryName);
strcat(fileName, ENEMY_ELITE_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[2], fileName), ENEMY_ELITE_PROFILE_FILENAME);
num_found_soldier_profiles[2] = num_found_profiles;
strcpy(fileName, directoryName);
strcat(fileName, MILITIA_GREEN_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[3], fileName), MILITIA_GREEN_PROFILE_FILENAME);
num_found_soldier_profiles[3] = num_found_profiles;
strcpy(fileName, directoryName);
strcat(fileName, MILITIA_GREEN_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[3], fileName), MILITIA_GREEN_PROFILE_FILENAME);
num_found_soldier_profiles[3] = num_found_profiles;
strcpy(fileName, directoryName);
strcat(fileName, MILITIA_REGULAR_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[4], fileName), MILITIA_REGULAR_PROFILE_FILENAME);
num_found_soldier_profiles[4] = num_found_profiles;
strcpy(fileName, directoryName);
strcat(fileName, MILITIA_REGULAR_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[4], fileName), MILITIA_REGULAR_PROFILE_FILENAME);
num_found_soldier_profiles[4] = num_found_profiles;
strcpy(fileName, directoryName);
strcat(fileName, MILITIA_VETERAN_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[5], fileName), MILITIA_VETERAN_PROFILE_FILENAME);
num_found_soldier_profiles[5] = num_found_profiles;
strcpy(fileName, directoryName);
strcat(fileName, MILITIA_VETERAN_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[5], fileName), MILITIA_VETERAN_PROFILE_FILENAME);
num_found_soldier_profiles[5] = num_found_profiles;
}
LoadIMPPortraitsTEMP();