From 99cb5f4e31818ea432f9eb010a0f6a9ed484b4fe Mon Sep 17 00:00:00 2001 From: Shadooow Date: Fri, 25 Jun 2021 15:46:46 +0000 Subject: [PATCH] fixed corpses on the roof not being added correctly git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9105 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Rotting Corpses.cpp | 2 +- TileEngine/Tile Cache.cpp | 6 +++--- TileEngine/Tile Cache.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tactical/Rotting Corpses.cpp b/Tactical/Rotting Corpses.cpp index 992ac2e7..d91b6ef0 100644 --- a/Tactical/Rotting Corpses.cpp +++ b/Tactical/Rotting Corpses.cpp @@ -651,7 +651,7 @@ INT32 AddRottingCorpse( ROTTING_CORPSE_DEFINITION *pCorpseDef ) GetRootName( zFilename, AniParams.zCachedFile ); // Add structure data..... - CheckForAndAddTileCacheStructInfo( pCorpse->pAniTile->pLevelNode, pCorpse->def.sGridNo, ( UINT16 ) ( pCorpse->iCachedTileID ), GetCorpseStructIndex( pCorpseDef, TRUE ) ); + CheckForAndAddTileCacheStructInfo( pCorpse->pAniTile->pLevelNode, pCorpse->def.sGridNo, pCorpse->def.bLevel, ( UINT16 ) ( pCorpse->iCachedTileID ), GetCorpseStructIndex( pCorpseDef, TRUE ) ); pStructureFileRef = GetCachedTileStructureRefFromFilename( zFilename ); diff --git a/TileEngine/Tile Cache.cpp b/TileEngine/Tile Cache.cpp index 6de109c4..69cc42c5 100644 --- a/TileEngine/Tile Cache.cpp +++ b/TileEngine/Tile Cache.cpp @@ -306,7 +306,7 @@ STRUCTURE_FILE_REF *GetCachedTileStructureRefFromFilename( const STR8 cFilename } -void CheckForAndAddTileCacheStructInfo( LEVELNODE *pNode, INT32 sGridNo, UINT16 usIndex, UINT16 usSubIndex ) +void CheckForAndAddTileCacheStructInfo( LEVELNODE *pNode, INT32 sGridNo, INT8 bLevel, UINT16 usIndex, UINT16 usSubIndex ) { STRUCTURE_FILE_REF *pStructureFileRef; @@ -314,7 +314,7 @@ void CheckForAndAddTileCacheStructInfo( LEVELNODE *pNode, INT32 sGridNo, UINT16 if ( pStructureFileRef != NULL) { - if ( !AddStructureToWorld( sGridNo, 0, &( pStructureFileRef->pDBStructureRef[ usSubIndex ] ), pNode ) ) + if ( !AddStructureToWorld( sGridNo, bLevel, &( pStructureFileRef->pDBStructureRef[ usSubIndex ] ), pNode ) ) { if ( giDefaultStructIndex != -1 ) { @@ -322,7 +322,7 @@ void CheckForAndAddTileCacheStructInfo( LEVELNODE *pNode, INT32 sGridNo, UINT16 if ( pStructureFileRef != NULL) { - AddStructureToWorld( sGridNo, 0, &( pStructureFileRef->pDBStructureRef[ usSubIndex ] ), pNode ); + AddStructureToWorld( sGridNo, bLevel, &( pStructureFileRef->pDBStructureRef[ usSubIndex ] ), pNode ); } } } diff --git a/TileEngine/Tile Cache.h b/TileEngine/Tile Cache.h index 2d1334d6..5cca3600 100644 --- a/TileEngine/Tile Cache.h +++ b/TileEngine/Tile Cache.h @@ -40,7 +40,7 @@ STRUCTURE_FILE_REF *GetCachedTileStructureRefFromFilename( const STR8 cFilename HVOBJECT GetCachedTileVideoObject( INT32 iIndex ); STRUCTURE_FILE_REF *GetCachedTileStructureRef( INT32 iIndex ); -void CheckForAndAddTileCacheStructInfo( LEVELNODE *pNode, INT32 sGridNo, UINT16 usIndex, UINT16 usSubIndex ); +void CheckForAndAddTileCacheStructInfo( LEVELNODE *pNode, INT32 sGridNo, INT8 bLevel, UINT16 usIndex, UINT16 usSubIndex ); void CheckForAndDeleteTileCacheStructInfo( LEVELNODE *pNode, UINT16 usIndex ); void GetRootName( STR8 pDestStr, const STR8 pSrcStr );