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

- bugfix: German.Items.xml and Russian.Items.xml strings were not read properly into the game

Browse Source 
This bugfix is also included in the Release & Update which ships today.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@504 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2006-09-01 14:45:59 +00:00
parent dd9a111cde
commit 44cc95de2a
2 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JA2.suo
BIN
View File
Binary file not shown.
Utils/XML_Items.cpp
+50 -21
View File
@@ -72,6 +72,7 @@ itemStartElementHandle(void *userData, const char *name, const char **atts)
{ {
pData->curElement = ELEMENT_LIST; pData->curElement = ELEMENT_LIST;
// WANNE
if ( !localizedTextOnly ) if ( !localizedTextOnly )
memset(pData->curArray,0,sizeof(INVTYPE)*pData->maxArraySize); memset(pData->curArray,0,sizeof(INVTYPE)*pData->maxArraySize);
@@ -81,6 +82,7 @@ itemStartElementHandle(void *userData, const char *name, const char **atts)
{ {
pData->curElement = ELEMENT; pData->curElement = ELEMENT;
// WANNE
if ( !localizedTextOnly ) if ( !localizedTextOnly )
memset(&pData->curItem,0,sizeof(INVTYPE)); memset(&pData->curItem,0,sizeof(INVTYPE));
@@ -282,6 +284,16 @@ itemEndElementHandle(void *userData, const char *name)
// strncpy(pData->curItem.szItemName,pData->szCharData,MAX_CHAR_DATA_LENGTH); // strncpy(pData->curItem.szItemName,pData->szCharData,MAX_CHAR_DATA_LENGTH);
// pData->curItem.szItemName[MAX_CHAR_DATA_LENGTH] = '\0'; // pData->curItem.szItemName[MAX_CHAR_DATA_LENGTH] = '\0';
//} //}
// WANNE
if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
strcpy(pData->curItem.szItemName,pData->szCharData);
else
{
strncpy(pData->curItem.szItemName,pData->szCharData,MAX_CHAR_DATA_LENGTH);
pData->curItem.szItemName[MAX_CHAR_DATA_LENGTH] = '\0';
}
for(int i=0;i<min((int)strlen(pData->szCharData),MAX_CHAR_DATA_LENGTH);i++) for(int i=0;i<min((int)strlen(pData->szCharData),MAX_CHAR_DATA_LENGTH);i++)
{ {
temp = pData->szCharData[i]; temp = pData->szCharData[i];
@@ -294,6 +306,17 @@ itemEndElementHandle(void *userData, const char *name)
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: longitemname"); //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: longitemname");
pData->curElement = ELEMENT; pData->curElement = ELEMENT;
// WANNE
if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
{
strcpy(pData->curItem.szLongItemName,pData->szCharData);
}
else
{
strncpy(pData->curItem.szLongItemName,pData->szCharData,MAX_CHAR_DATA_LENGTH);
pData->curItem.szLongItemName[MAX_CHAR_DATA_LENGTH] = '\0';
}
for(int i=0;i<min((int)strlen(pData->szCharData),MAX_CHAR_DATA_LENGTH);i++) for(int i=0;i<min((int)strlen(pData->szCharData),MAX_CHAR_DATA_LENGTH);i++)
{ {
temp = pData->szCharData[i]; temp = pData->szCharData[i];
@@ -315,13 +338,15 @@ itemEndElementHandle(void *userData, const char *name)
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: itemdesc"); //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: itemdesc");
pData->curElement = ELEMENT; pData->curElement = ELEMENT;
//if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData)) // WANNE
// strcpy(pData->curItem.szItemDesc,pData->szCharData); if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
//else strcpy(pData->curItem.szItemDesc,pData->szCharData);
//{ else
// strncpy(pData->curItem.szItemDesc,pData->szCharData,MAX_CHAR_DATA_LENGTH); {
// pData->curItem.szItemDesc[MAX_CHAR_DATA_LENGTH] = '\0'; strncpy(pData->curItem.szItemDesc,pData->szCharData,MAX_CHAR_DATA_LENGTH);
//} pData->curItem.szItemDesc[MAX_CHAR_DATA_LENGTH] = '\0';
}
for(int i=0;i<min((int)strlen(pData->szCharData),MAX_CHAR_DATA_LENGTH);i++) for(int i=0;i<min((int)strlen(pData->szCharData),MAX_CHAR_DATA_LENGTH);i++)
{ {
temp = pData->szCharData[i]; temp = pData->szCharData[i];
@@ -334,13 +359,15 @@ itemEndElementHandle(void *userData, const char *name)
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: brname"); //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: brname");
pData->curElement = ELEMENT; pData->curElement = ELEMENT;
//if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData)) // WANNE
// strcpy(pData->curItem.szBRName,pData->szCharData); if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
//else strcpy(pData->curItem.szBRName,pData->szCharData);
//{ else
// strncpy(pData->curItem.szBRName,pData->szCharData,MAX_CHAR_DATA_LENGTH); {
// pData->curItem.szBRName[MAX_CHAR_DATA_LENGTH] = '\0'; strncpy(pData->curItem.szBRName,pData->szCharData,MAX_CHAR_DATA_LENGTH);
//} pData->curItem.szBRName[MAX_CHAR_DATA_LENGTH] = '\0';
}
for(int i=0;i<min((int)strlen(pData->szCharData),MAX_CHAR_DATA_LENGTH);i++) for(int i=0;i<min((int)strlen(pData->szCharData),MAX_CHAR_DATA_LENGTH);i++)
{ {
temp = pData->szCharData[i]; temp = pData->szCharData[i];
@@ -353,13 +380,15 @@ itemEndElementHandle(void *userData, const char *name)
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: brdesc"); //DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"itemEndElementHandle: brdesc");
pData->curElement = ELEMENT; pData->curElement = ELEMENT;
//if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData)) // WANNE
// strcpy(pData->curItem.szBRDesc,pData->szCharData); if(MAX_CHAR_DATA_LENGTH >= strlen(pData->szCharData))
//else strcpy(pData->curItem.szBRDesc,pData->szCharData);
//{ else
// strncpy(pData->curItem.szBRDesc,pData->szCharData,MAX_CHAR_DATA_LENGTH); {
// pData->curItem.szBRDesc[MAX_CHAR_DATA_LENGTH] = '\0'; strncpy(pData->curItem.szBRDesc,pData->szCharData,MAX_CHAR_DATA_LENGTH);
//} pData->curItem.szBRDesc[MAX_CHAR_DATA_LENGTH] = '\0';
}
for(int i=0;i<min((int)strlen(pData->szCharData),MAX_CHAR_DATA_LENGTH);i++) for(int i=0;i<min((int)strlen(pData->szCharData),MAX_CHAR_DATA_LENGTH);i++)
{ {
temp = pData->szCharData[i]; temp = pData->szCharData[i];