1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

nuke all the #if 0's

Browse Source 
scripted commit:

find . -not -path '*/.*' -and -not -path '*/ext*' -type d -exec coan source -R -E {} ';'

https://coan2.sourceforge.net/coan_man_1.html
This commit is contained in:
Marco Antonio Jaguaribe Costa
2023-01-19 00:13:08 +02:00
committed by Asdow
parent 6afe785f4b
commit 8b1c4effa0
72 changed files with 0 additions and 6657 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/structure.cpp
-20
View File
@@ -660,11 +660,7 @@ BOOLEAN OkayToAddStructureToTile( INT32 sBaseGridNo, INT16 sCubeOffset, DB_STRUC
}
ppTile = pDBStructureRef->ppTile;
#if 0//dnl ch83 080114
sGridNo = sBaseGridNo + ppTile[ubTileIndex]->sPosRelToBase;
#else
sGridNo = AddPosRelToBase(sBaseGridNo, ppTile[ubTileIndex]);
#endif
if (sGridNo < 0 || sGridNo > WORLD_MAX)
{
return( FALSE );
@@ -835,16 +831,8 @@ BOOLEAN OkayToAddStructureToTile( INT32 sBaseGridNo, INT16 sCubeOffset, DB_STRUC
}
for (bLoop2 = 0; bLoop2 < pDBStructure->ubNumberOfTiles; bLoop2++)
{
#if 0//dnl ch83 080114
if ( sBaseGridNo + ppTile[bLoop2]->sPosRelToBase == sOtherGridNo)
{
// obstacle will straddle wall!
return( FALSE );
}
#else
if(AddPosRelToBase(sBaseGridNo, ppTile[bLoop2]) == sOtherGridNo)
return(FALSE);// obstacle will straddle wall!
#endif
}
}
}
@@ -1107,11 +1095,7 @@ STRUCTURE * InternalAddStructureToWorld( INT32 sBaseGridNo, INT8 bLevel, DB_STRU
MemFree( ppStructure );
return( NULL );
}
#if 0//dnl ch83 080114
ppStructure[ubLoop]->sGridNo = sBaseGridNo + ppTile[ubLoop]->sPosRelToBase;
#else
ppStructure[ubLoop]->sGridNo = AddPosRelToBase(sBaseGridNo, ppTile[ubLoop]);
#endif
if (ubLoop != BASE_TILE)
{
#ifdef JA2EDITOR
@@ -1319,11 +1303,7 @@ BOOLEAN DeleteStructureFromWorld( STRUCTURE * pStructure )
// Free all the tiles
for (ubLoop = BASE_TILE; ubLoop < ubNumberOfTiles; ubLoop++)
{
#if 0//dnl ch83 080114
sGridNo = sBaseGridNo + ppTile[ubLoop]->sPosRelToBase;
#else
sGridNo = AddPosRelToBase(sBaseGridNo, ppTile[ubLoop]);
#endif
// there might be two structures in this tile, one on each level, but we just want to
// delete one on each pass
pCurrent = FindStructureByID( sGridNo, usStructureID );