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

Import changes from the local SVN working copy

Browse Source
This commit is contained in:
Asdow
2022-10-10 10:08:44 +03:00
parent 9cc567644f
commit 1f0a8f46e8
170 changed files with 1798 additions and 1764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/worldman.cpp
+4 -4
View File
@@ -3758,7 +3758,7 @@ BOOLEAN IsRoofVisible2( INT32 sMapPos )
}
UINT8 WhoIsThere2( INT32 sGridNo, INT8 bLevel )
UINT16 WhoIsThere2( INT32 sGridNo, INT8 bLevel )
{
STRUCTURE * pStructure;
@@ -3782,7 +3782,7 @@ UINT8 WhoIsThere2( INT32 sGridNo, INT8 bLevel )
{
// found a person, on the right level!
// structure ID and merc ID are identical for merc structures
return( (UINT8) pStructure->usStructureID );
return( pStructure->usStructureID );
}
}
pStructure = pStructure->pNext;
@@ -3790,7 +3790,7 @@ UINT8 WhoIsThere2( INT32 sGridNo, INT8 bLevel )
}
return( (UINT8)NOBODY );
return( NOBODY );
}
UINT8 GetTerrainType( INT32 sGridNo )
@@ -4167,7 +4167,7 @@ void UpdateTreeVisibility()
// find visible soldier near spot
if (!TileIsOutOfBounds(sSpot) && !fHideTree)
{
for (UINT8 uiLoop = 0; uiLoop < guiNumMercSlots; uiLoop++)
for (UINT16 uiLoop = 0; uiLoop < guiNumMercSlots; uiLoop++)
{
pOpponent = MercSlots[uiLoop];