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

- Fixed compilation error in NON English builds

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7266 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-06-05 14:22:01 +00:00
parent 97db703fe4
commit ca03cb86c0
3 changed files with 8 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+1 -9
View File
@@ -584,7 +584,7 @@ BOOLEAN InitTacticalEngine( )
if ( FileExists(fileName) ) if ( FileExists(fileName) )
{ {
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName)); DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInLocks(fileName,FALSE), LOCKSFILENAME); SGP_THROW_IFFALSE(ReadInLocks(fileName), LOCKSFILENAME);
} }
else else
{ {
@@ -592,14 +592,6 @@ BOOLEAN InitTacticalEngine( )
if( !LoadLockTable() ) if( !LoadLockTable() )
return(FALSE); return(FALSE);
} }
#ifndef ENGLISH
AddLanguagePrefix(fileName);
if ( FileExists(fileName) )
{
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,String("LoadExternalGameplayData, fileName = %s", fileName));
SGP_THROW_IFFALSE(ReadInLocks(fileName,TRUE), LOCKSFILENAME);
}
#endif
strcpy(fileName, TABLEDATA_DIRECTORY); strcpy(fileName, TABLEDATA_DIRECTORY);
strcat(fileName, KEYSFILENAME); strcat(fileName, KEYSFILENAME);
Tactical/XML.h
+1 -1
View File
@@ -498,7 +498,7 @@ extern BOOLEAN ReadInAdditionalTileProperties(STR fileName );
extern BOOLEAN WriteAdditionalTileProperties( STR fileName ); extern BOOLEAN WriteAdditionalTileProperties( STR fileName );
// anv: externalised locks and keys // anv: externalised locks and keys
extern BOOLEAN ReadInLocks(STR fileName, BOOLEAN localizedVersion ); extern BOOLEAN ReadInLocks(STR fileName );
extern BOOLEAN WriteLocks( STR fileName ); extern BOOLEAN WriteLocks( STR fileName );
extern BOOLEAN ReadInKeys( STR fileName ); extern BOOLEAN ReadInKeys( STR fileName );
Tactical/XML_Locks.cpp
+4 -22
View File
@@ -25,8 +25,6 @@ struct
} }
typedef lockParseData; typedef lockParseData;
BOOLEAN localizedTextOnly_Locks;
UINT16 num_found_lock = 0; // the correct number is set on reading the xml UINT16 num_found_lock = 0; // the correct number is set on reading the xml
static void XMLCALL static void XMLCALL
@@ -46,8 +44,7 @@ lockStartElementHandle(void *userData, const XML_Char *name, const XML_Char **at
{ {
pData->curElement = ELEMENT; pData->curElement = ELEMENT;
if ( !localizedTextOnly_Locks ) memset(&pData->curLock,0,sizeof(LOCK));
memset(&pData->curLock,0,sizeof(LOCK));
pData->maxReadDepth++; //we are not skipping this element pData->maxReadDepth++; //we are not skipping this element
} }
@@ -100,21 +97,9 @@ lockEndElementHandle(void *userData, const XML_Char *name)
//if(pData->curLock.uiIndex < pData->maxArraySize) //if(pData->curLock.uiIndex < pData->maxArraySize)
if(num_found_lock < pData->maxArraySize) if(num_found_lock < pData->maxArraySize)
{ {
if ( localizedTextOnly_Locks ) pData->curArray[pData->curIndex] = pData->curLock;
{ num_found_lock++;
//wcscpy(zTaunt[offset_index + pData->curLock.ubLockID].szText,pData->curLock.szText);
//wcscpy(zTaunt[offset_index + pData->curLock.ubLockID].szCensoredText,pData->curLock.szCensoredText);
}
else
{
pData->curArray[pData->curIndex] = pData->curLock;
//pData->curArray[num_found_lock-1] = pData->curLock;
num_found_lock++;
}
} }
//num_found_lock++;
//num_found_lock = pData->curLock.uiIndex;
} }
else if(strcmp(name, "ubLockID") == 0) else if(strcmp(name, "ubLockID") == 0)
{ {
@@ -129,7 +114,6 @@ lockEndElementHandle(void *userData, const XML_Char *name)
pData->curElement = ELEMENT; pData->curElement = ELEMENT;
strcpy( (CHAR8*)pData->curLock.ubEditorName, pData->szCharData ); strcpy( (CHAR8*)pData->curLock.ubEditorName, pData->szCharData );
//pData->curLock.ubEditorName[sizeof(pData->curLock.ubEditorName)/sizeof(pData->curLock.ubEditorName[0]) - 1] = '\0';
} }
else if(strcmp(name, "usKeyItem") == 0) else if(strcmp(name, "usKeyItem") == 0)
{ {
@@ -157,7 +141,7 @@ lockEndElementHandle(void *userData, const XML_Char *name)
pData->currentDepth--; pData->currentDepth--;
} }
BOOLEAN ReadInLocks(STR fileName, BOOLEAN localizedVersion) BOOLEAN ReadInLocks(STR fileName)
{ {
HWFILE hFile; HWFILE hFile;
UINT32 uiBytesRead; UINT32 uiBytesRead;
@@ -169,8 +153,6 @@ BOOLEAN ReadInLocks(STR fileName, BOOLEAN localizedVersion)
DebugMsg(TOPIC_JA2, DBG_LEVEL_3, "Loading Locks.xml" ); DebugMsg(TOPIC_JA2, DBG_LEVEL_3, "Loading Locks.xml" );
localizedTextOnly_Locks = localizedVersion;
// Open file // Open file
hFile = FileOpen( fileName, FILE_ACCESS_READ, FALSE ); hFile = FileOpen( fileName, FILE_ACCESS_READ, FALSE );
if ( !hFile ) if ( !hFile )