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 Samsites & Helisites xml gridno tags resetting to 0 for big maps (by Buggler)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6649 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-11-25 08:53:31 +00:00
parent 8e4c2b74c1
commit ead725563f
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Helicopter.cpp
+2 -2
View File
@@ -417,7 +417,7 @@ helisiteEndElementHandle(void *userData, const XML_Char *name)
pData->curElement = HELISITE_ELEMENT_REFUEL; pData->curElement = HELISITE_ELEMENT_REFUEL;
pData->curHeliInfo.refuelHeliGridNo = atol(pData->szCharData); pData->curHeliInfo.refuelHeliGridNo = atol(pData->szCharData);
if ( pData->curHeliInfo.refuelHeliGridNo >= WORLD_MAX ) if ( pData->curHeliInfo.refuelHeliGridNo >= MAX_ALLOWED_WORLD_MAX )
{ {
pData->curHeliInfo.refuelHeliGridNo = 0; pData->curHeliInfo.refuelHeliGridNo = 0;
} }
@@ -427,7 +427,7 @@ helisiteEndElementHandle(void *userData, const XML_Char *name)
pData->curElement = HELISITE_ELEMENT_REFUEL; pData->curElement = HELISITE_ELEMENT_REFUEL;
pData->curHeliInfo.refuelSkyriderGridNo = atol(pData->szCharData); pData->curHeliInfo.refuelSkyriderGridNo = atol(pData->szCharData);
if ( pData->curHeliInfo.refuelSkyriderGridNo >= WORLD_MAX ) if ( pData->curHeliInfo.refuelSkyriderGridNo >= MAX_ALLOWED_WORLD_MAX )
{ {
pData->curHeliInfo.refuelSkyriderGridNo = 0; pData->curHeliInfo.refuelSkyriderGridNo = 0;
} }
Strategic/strategicmap.cpp
+3 -4
View File
@@ -681,7 +681,7 @@ samsiteEndElementHandle(void *userData, const XML_Char *name)
pData->curElement = SAMSITE_ELEMENT_SAM; pData->curElement = SAMSITE_ELEMENT_SAM;
pData->curSamInfo.samGridNoA = atol(pData->szCharData); pData->curSamInfo.samGridNoA = atol(pData->szCharData);
if ( pData->curSamInfo.samGridNoA >= WORLD_MAX ) if ( pData->curSamInfo.samGridNoA >= MAX_ALLOWED_WORLD_MAX )
{ {
pData->curSamInfo.samGridNoA = 0; pData->curSamInfo.samGridNoA = 0;
} }
@@ -691,7 +691,7 @@ samsiteEndElementHandle(void *userData, const XML_Char *name)
pData->curElement = SAMSITE_ELEMENT_SAM; pData->curElement = SAMSITE_ELEMENT_SAM;
pData->curSamInfo.samGridNoB = atol(pData->szCharData); pData->curSamInfo.samGridNoB = atol(pData->szCharData);
if ( pData->curSamInfo.samGridNoB >= WORLD_MAX ) if ( pData->curSamInfo.samGridNoB >= MAX_ALLOWED_WORLD_MAX )
{ {
pData->curSamInfo.samGridNoB = 1; pData->curSamInfo.samGridNoB = 1;
} }
@@ -3416,7 +3416,6 @@ void GetSectorIDString( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ , STR16 zS
INT8 bTownNameID; INT8 bTownNameID;
UINT8 ubSectorID = 0; UINT8 ubSectorID = 0;
UINT8 ubLandType = 0; UINT8 ubLandType = 0;
UINT8 ubMineIndex;
if( sSectorX <= 0 || sSectorY <= 0 || bSectorZ < 0 ) if( sSectorX <= 0 || sSectorY <= 0 || bSectorZ < 0 )
{ {
@@ -3721,7 +3720,7 @@ void GetSectorIDString( INT16 sSectorX, INT16 sSectorY, INT8 bSectorZ , STR16 zS
if( fDetailed ) if( fDetailed )
{ {
/* /*
ubMineIndex = GetMineIndexForSector( sSectorX, sSectorY ); UINT8 ubMineIndex = GetMineIndexForSector( sSectorX, sSectorY );
if ( gMineStatus[ubMineIndex].sSectorX == sSectorX && gMineStatus[ubMineIndex].sSectorY == sSectorY ) if ( gMineStatus[ubMineIndex].sSectorX == sSectorX && gMineStatus[ubMineIndex].sSectorY == sSectorY )
{ {
swprintf( zString, L" %s", MineralsName[gMineStatus[ubMineIndex].ubMineType].sType ); swprintf( zString, L" %s", MineralsName[gMineStatus[ubMineIndex].ubMineType].sType );