diff --git a/Init.cpp b/Init.cpp index f9243793..b372050a 100644 --- a/Init.cpp +++ b/Init.cpp @@ -1271,16 +1271,31 @@ if ( ReadXMLEmail == TRUE ) } #endif -BackupBRandEncyclopedia ( gBriefingRoomData, gBriefingRoomDataBackup, 0); + BackupBRandEncyclopedia ( gBriefingRoomData, gBriefingRoomDataBackup, 0); #endif //ENABLE_BRIEFINGROOM - UINT8 p; - for(p=0; p + + diff --git a/Strategic/Strategic_VS2008.vcproj b/Strategic/Strategic_VS2008.vcproj index cc514b3c..8d575cb0 100644 --- a/Strategic/Strategic_VS2008.vcproj +++ b/Strategic/Strategic_VS2008.vcproj @@ -766,6 +766,10 @@ RelativePath=".\XML_FacilityTypes.cpp" > + + diff --git a/Strategic/Strategic_VS2010.vcxproj b/Strategic/Strategic_VS2010.vcxproj index 45dc290b..904cf0e7 100644 --- a/Strategic/Strategic_VS2010.vcxproj +++ b/Strategic/Strategic_VS2010.vcxproj @@ -131,6 +131,7 @@ + diff --git a/Strategic/Strategic_VS2010.vcxproj.filters b/Strategic/Strategic_VS2010.vcxproj.filters index 078e58f4..eacdd124 100644 --- a/Strategic/Strategic_VS2010.vcxproj.filters +++ b/Strategic/Strategic_VS2010.vcxproj.filters @@ -341,5 +341,8 @@ Source Files + + Source Files + \ No newline at end of file diff --git a/Strategic/XML_Minerals.cpp b/Strategic/XML_Minerals.cpp new file mode 100644 index 00000000..eb2b101b --- /dev/null +++ b/Strategic/XML_Minerals.cpp @@ -0,0 +1,193 @@ +#ifdef PRECOMPILEDHEADERS + #include "Tactical All.h" +#else + #include "sgp.h" + #include "Debug Control.h" + #include "expat.h" + #include "XML.h" + #include "Interface.h" + #include "Map Screen Interface Map.h" +#endif + +struct +{ + PARSE_STAGE curElement; + + CHAR8 szCharData[MAX_CHAR_DATA_LENGTH+1]; + MINERALS_VALUES curMinerals; + MINERALS_VALUES * curArray; + + UINT32 maxArraySize; + UINT32 curIndex; + UINT32 currentDepth; + UINT32 maxReadDepth; +} +typedef mineralsParseData; + +BOOLEAN Minerals_TextOnly; + +static void XMLCALL +mineralsStartElementHandle(void *userData, const XML_Char *name, const XML_Char **atts) +{ + mineralsParseData * pData = (mineralsParseData *)userData; + + if(pData->currentDepth <= pData->maxReadDepth) //are we reading this element? + { + if(strcmp(name, "MINERALS") == 0 && pData->curElement == ELEMENT_NONE) + { + pData->curElement = ELEMENT_LIST; + + pData->maxReadDepth++; //we are not skipping this element + } + else if(strcmp(name, "TYPE") == 0 && pData->curElement == ELEMENT_LIST) + { + pData->curElement = ELEMENT; + + pData->maxReadDepth++; //we are not skipping this element + } + else if(pData->curElement == ELEMENT && + (strcmp(name, "uiIndex") == 0 || + strcmp(name, "sNameType") == 0 || + strcmp(name, "sMineral") == 0 + )) + { + pData->curElement = ELEMENT_PROPERTY; + + pData->maxReadDepth++; //we are not skipping this element + } + + pData->szCharData[0] = '\0'; + } + + pData->currentDepth++; + +} + +static void XMLCALL +mineralsCharacterDataHandle(void *userData, const XML_Char *str, int len) +{ + mineralsParseData * pData = (mineralsParseData *)userData; + + if( (pData->currentDepth <= pData->maxReadDepth) && + (strlen(pData->szCharData) < MAX_CHAR_DATA_LENGTH) + ){ + strncat(pData->szCharData,str,__min((unsigned int)len,MAX_CHAR_DATA_LENGTH-strlen(pData->szCharData))); + } +} + + +static void XMLCALL +mineralsEndElementHandle(void *userData, const XML_Char *name) +{ + mineralsParseData * pData = (mineralsParseData *)userData; + + if(pData->currentDepth <= pData->maxReadDepth) + { + if(strcmp(name, "MINERALS") == 0) + { + pData->curElement = ELEMENT_NONE; + } + else if(strcmp(name, "TYPE") == 0) + { + pData->curElement = ELEMENT_LIST; + + if (!Minerals_TextOnly) + { + wcscpy(MineralsName[pData->curMinerals.uiIndex].sMinerals, pData->curMinerals.sMinerals); + wcscpy(MineralsName[pData->curMinerals.uiIndex].sType, pData->curMinerals.sType); + MineralsName[pData->curMinerals.uiIndex].Type = pData->curMinerals.Type; + } + else + { + wcscpy(MineralsName[pData->curMinerals.uiIndex].sMinerals, pData->curMinerals.sMinerals); + wcscpy(MineralsName[pData->curMinerals.uiIndex].sType, pData->curMinerals.sType); + } + } + else if(strcmp(name, "uiIndex") == 0) + { + pData->curElement = ELEMENT; + pData->curMinerals.uiIndex = (UINT16) atol(pData->szCharData); + } + else if(strcmp(name, "sNameType") == 0 ) + { + pData->curElement = ELEMENT; + + MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curMinerals.sType, sizeof(pData->curMinerals.sType)/sizeof(pData->curMinerals.sType[0]) ); + pData->curMinerals.sType[sizeof(pData->curMinerals.sType)/sizeof(pData->curMinerals.sType[0]) - 1] = '\0'; + } + else if(strcmp(name, "sMineral") == 0 ) + { + pData->curElement = ELEMENT; + + MultiByteToWideChar( CP_UTF8, 0, pData->szCharData, -1, pData->curMinerals.sMinerals, sizeof(pData->curMinerals.sMinerals)/sizeof(pData->curMinerals.sMinerals[0]) ); + pData->curMinerals.sMinerals[sizeof(pData->curMinerals.sMinerals)/sizeof(pData->curMinerals.sMinerals[0]) - 1] = '\0'; + } + pData->maxReadDepth--; + } + pData->currentDepth--; +} + + + + +BOOLEAN ReadInMinerals(STR fileName, BOOLEAN localizedVersion) +{ + HWFILE hFile; + UINT32 uiBytesRead; + UINT32 uiFSize; + CHAR8 * lpcBuffer; + XML_Parser parser = XML_ParserCreate(NULL); + + mineralsParseData pData; + + DebugMsg(TOPIC_JA2, DBG_LEVEL_3, "Loading Minerals.xml" ); + + Minerals_TextOnly = localizedVersion; + + // Open file + hFile = FileOpen( fileName, FILE_ACCESS_READ, FALSE ); + if ( !hFile ) + return( localizedVersion ); + + uiFSize = FileGetSize(hFile); + lpcBuffer = (CHAR8 *) MemAlloc(uiFSize+1); + + //Read in block + if ( !FileRead( hFile, lpcBuffer, uiFSize, &uiBytesRead ) ) + { + MemFree(lpcBuffer); + return( FALSE ); + } + + lpcBuffer[uiFSize] = 0; //add a null terminator + + FileClose( hFile ); + + + XML_SetElementHandler(parser, mineralsStartElementHandle, mineralsEndElementHandle); + XML_SetCharacterDataHandler(parser, mineralsCharacterDataHandle); + + + memset(&pData,0,sizeof(pData)); + XML_SetUserData(parser, &pData); + + + if(!XML_Parse(parser, lpcBuffer, uiFSize, TRUE)) + { + CHAR8 errorBuf[511]; + + sprintf(errorBuf, "XML Parser Error in Minerals.xml: %s at line %d", XML_ErrorString(XML_GetErrorCode(parser)), XML_GetCurrentLineNumber(parser)); + LiveMessage(errorBuf); + + MemFree(lpcBuffer); + return FALSE; + } + + MemFree(lpcBuffer); + + + XML_ParserFree(parser); + + + return( TRUE ); +} diff --git a/Strategic/strategicmap.cpp b/Strategic/strategicmap.cpp index 6a2d9ee2..1eeafa33 100644 --- a/Strategic/strategicmap.cpp +++ b/Strategic/strategicmap.cpp @@ -3416,6 +3416,7 @@ void GetSectorIDString( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ , STR16 zS INT8 bTownNameID; UINT8 ubSectorID = 0; UINT8 ubLandType = 0; + UINT8 ubMineIndex; if( sSectorX <= 0 || sSectorY <= 0 || bSectorZ < 0 ) { @@ -3719,6 +3720,13 @@ void GetSectorIDString( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ , STR16 zS wcscat( zString, pTownNames[ bTownNameID ] ); if( fDetailed ) { + /* + ubMineIndex = GetMineIndexForSector( sSectorX, sSectorY ); + if ( gMineStatus[ubMineIndex].sSectorX == sSectorX && gMineStatus[ubMineIndex].sSectorY == sSectorY ) + { + swprintf( zString, L" %s", MineralsName[gMineStatus[ubMineIndex].ubMineType].sType ); + } + */ switch( ubSectorID ) { //Append the word, "mine" for town sectors containing a mine. case SEC_B2: diff --git a/Tactical/XML.h b/Tactical/XML.h index 44ea4aa7..dd944eb0 100644 --- a/Tactical/XML.h +++ b/Tactical/XML.h @@ -209,6 +209,7 @@ typedef PARSE_STAGE; #define LAYOUTMAINMENU "Layout\\LayoutMainMenu.xml" +#define MINERALSFILENAME "Map\\Minerals.xml" #define AIMAVAILABILITY "AimAvailability.xml" #define CIVGROUPNAMESFILENAME "CivGroupNames.xml" @@ -501,9 +502,9 @@ extern BOOLEAN WriteInActionItems( STR fileName); extern BOOLEAN ReadInEmailMercAvailable(STR fileName, BOOLEAN localizedVersion); extern BOOLEAN ReadInEmailMercLevelUp(STR fileName, BOOLEAN localizedVersion); extern BOOLEAN ReadInEmailOther(STR fileName, BOOLEAN localizedVersion); -//extern BOOLEAN ReadInInsurance(STR fileName, BOOLEAN localizedVersion); extern BOOLEAN ReadInBriefingRoom(STR fileName, BOOLEAN localizedVersion, BRIEFINGROOM_M_DATA *Ency, UINT32 FileType2 ); +extern BOOLEAN ReadInMinerals(STR fileName, BOOLEAN localizedVersion); extern BOOLEAN ReadInNewVehicles(STR fileName, BOOLEAN localizedVersion); extern BOOLEAN WriteNewVehicles(STR fileName);