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 Bugfix:

Browse Source 
- Fixed problems after hosting game in strategy screen (crashes, options not clickable, ...)
o The problems seems to be the reworked taunts initialization from revision 6640. I did not trace down the exact problem, but taunts should anyway be disabled in a multiplayer game
o Now taunts are disabled in a multiplayer game which fixes the above problems

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-11-25 08:45:50 +00:00
parent 376b174d5b
commit 8e4c2b74c1
3 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Init.cpp
+25 -21
View File
@@ -1017,41 +1017,45 @@ BOOLEAN LoadExternalGameplayData(STR directoryName)
}
#endif
// WANNE: Only in a singleplayer game...
// Externalised taunts
GETFILESTRUCT FileInfo;
char tauntFileNamePattern[MAX_PATH];
strcpy(tauntFileNamePattern, directoryName);
strcat(tauntFileNamePattern, TAUNTSFILENAMEBEGINNING"*"TAUNTSFILENAMEENDING);
if( GetFileFirst(tauntFileNamePattern, &FileInfo) )
if (!is_networked)
{
strcpy(fileName, directoryName);
strcat(fileName, FileInfo.zFileName);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
#ifndef ENGLISH
AddLanguagePrefix(fileName);
if ( FileExists(fileName) )
{
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), fileName);
}
#endif
while( GetFileNext(&FileInfo) )
GETFILESTRUCT FileInfo;
char tauntFileNamePattern[MAX_PATH];
strcpy(tauntFileNamePattern, directoryName);
strcat(tauntFileNamePattern, TAUNTSFILENAMEBEGINNING"*"TAUNTSFILENAMEENDING);
if( GetFileFirst(tauntFileNamePattern, &FileInfo) )
{
strcpy(fileName, directoryName);
strcat(fileName, FileInfo.zFileName);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
#ifndef ENGLISH
#ifndef ENGLISH
AddLanguagePrefix(fileName);
if ( FileExists(fileName) )
{
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), fileName);
}
#endif
#endif
while( GetFileNext(&FileInfo) )
{
strcpy(fileName, directoryName);
strcat(fileName, FileInfo.zFileName);
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInTaunts(fileName,FALSE), fileName);
#ifndef ENGLISH
AddLanguagePrefix(fileName);
if ( FileExists(fileName) )
{
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInTaunts(fileName,TRUE), fileName);
}
#endif
}
GetFileClose(&FileInfo);
}
GetFileClose(&FileInfo);
}
// IMP Portraits List by Jazz