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

Thanks to Flugente, he perform quick fix for overhead map crash after sector is cleared from enemy, but actual problem was created by me in r6744, I overwrite one condition by mistake, so this will fix the real source of problem.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6788 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Kriplo
2014-01-19 18:17:58 +00:00
parent b038ab4f0d
commit 056e5e31c5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/overhead map.cpp
+4 -4
View File
@@ -1064,7 +1064,7 @@ void RenderOverheadMap( INT16 sStartPointX_M, INT16 sStartPointY_M, INT16 sStart
pTile = &( gSmTileDB[ pNode->usIndex ] ); pTile = &( gSmTileDB[ pNode->usIndex ] );
// Flugente: uninformed hack // Flugente: uninformed hack
if ( pTile && pTile->vo ) //if ( pTile && pTile->vo )
{ {
sX = sTempPosX_S; sX = sTempPosX_S;
sY = sTempPosY_S; sY = sTempPosY_S;
@@ -1098,7 +1098,7 @@ void RenderOverheadMap( INT16 sStartPointX_M, INT16 sStartPointY_M, INT16 sStart
pTile = &( gSmTileDB[ pNode->usIndex ] ); pTile = &( gSmTileDB[ pNode->usIndex ] );
// Flugente: uninformed hack // Flugente: uninformed hack
if ( pTile && pTile->vo ) //if ( pTile && pTile->vo )
{ {
sX = sTempPosX_S; sX = sTempPosX_S;
sY = sTempPosY_S - sHeight; sY = sTempPosY_S - sHeight;
@@ -1123,7 +1123,7 @@ void RenderOverheadMap( INT16 sStartPointX_M, INT16 sStartPointY_M, INT16 sStart
pNode = gpWorldLevelData[ usTileIndex ].pStructHead; pNode = gpWorldLevelData[ usTileIndex ].pStructHead;
while( pNode != NULL ) while( pNode != NULL )
{ {
if(usTileIndex >= 0 && usTileIndex < GRIDSIZE)//dnl ch82 081213 if ( pNode->usIndex < giNumberOfTiles )//if(usTileIndex >= 0 && usTileIndex < GRIDSIZE)//dnl ch82 081213 190113 fix incorrect condition
{ {
// Don't render itempools! // Don't render itempools!
if ( !( pNode->uiFlags & LEVELNODE_ITEM ) ) if ( !( pNode->uiFlags & LEVELNODE_ITEM ) )
@@ -1131,7 +1131,7 @@ void RenderOverheadMap( INT16 sStartPointX_M, INT16 sStartPointY_M, INT16 sStart
pTile = &( gSmTileDB[ pNode->usIndex ] ); pTile = &( gSmTileDB[ pNode->usIndex ] );
// Flugente: uninformed hack // Flugente: uninformed hack
if ( pTile && pTile->vo ) //if ( pTile && pTile->vo )
{ {
sX = sTempPosX_S; sX = sTempPosX_S;
sY = sTempPosY_S - (gTileDatabase[ pNode->usIndex ].sOffsetHeight/5); sY = sTempPosY_S - (gTileDatabase[ pNode->usIndex ].sOffsetHeight/5);