1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfix: Only init the profile xml filenames, if exist

Browse Source 
o This fixes the crash when starting a "Vanilla" game (Vanilla 1.13 does not have any profile xml filenames)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-09-04 16:54:27 +00:00
parent 89194ff11b
commit 3b8ba34ecf
1 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Init.cpp
+36 -18
View File
@@ -1024,39 +1024,57 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
{ {
strcpy(fileName, directoryName); strcpy(fileName, directoryName);
strcat(fileName, ENEMY_ADMIN_PROFILE_FILENAME); strcat(fileName, ENEMY_ADMIN_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); if ( FileExists(fileName) )
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[0], fileName), ENEMY_ADMIN_PROFILE_FILENAME); {
num_found_soldier_profiles[0] = num_found_profiles; 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); strcpy(fileName, directoryName);
strcat(fileName, ENEMY_REGULAR_PROFILE_FILENAME); strcat(fileName, ENEMY_REGULAR_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); if ( FileExists(fileName) )
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[1], fileName), ENEMY_REGULAR_PROFILE_FILENAME); {
num_found_soldier_profiles[1] = num_found_profiles; 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); strcpy(fileName, directoryName);
strcat(fileName, ENEMY_ELITE_PROFILE_FILENAME); strcat(fileName, ENEMY_ELITE_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); if ( FileExists(fileName) )
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[2], fileName), ENEMY_ELITE_PROFILE_FILENAME); {
num_found_soldier_profiles[2] = num_found_profiles; 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); strcpy(fileName, directoryName);
strcat(fileName, MILITIA_GREEN_PROFILE_FILENAME); strcat(fileName, MILITIA_GREEN_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); if ( FileExists(fileName) )
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[3], fileName), MILITIA_GREEN_PROFILE_FILENAME); {
num_found_soldier_profiles[3] = num_found_profiles; 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); strcpy(fileName, directoryName);
strcat(fileName, MILITIA_REGULAR_PROFILE_FILENAME); strcat(fileName, MILITIA_REGULAR_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); if ( FileExists(fileName) )
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[4], fileName), MILITIA_REGULAR_PROFILE_FILENAME); {
num_found_soldier_profiles[4] = num_found_profiles; 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); strcpy(fileName, directoryName);
strcat(fileName, MILITIA_VETERAN_PROFILE_FILENAME); strcat(fileName, MILITIA_VETERAN_PROFILE_FILENAME);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); if ( FileExists(fileName) )
SGP_THROW_IFFALSE(ReadInSoldierProfiles(zSoldierProfile[5], fileName), MILITIA_VETERAN_PROFILE_FILENAME); {
num_found_soldier_profiles[5] = num_found_profiles; 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(); LoadIMPPortraitsTEMP();