1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up code.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8593 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-08-15 14:37:15 +00:00
parent ce80ab68e6
commit cb2002af2a
3 changed files with 40 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Strategic Town Loyalty.cpp
+6 -14
View File
@@ -1116,7 +1116,6 @@ void RemoveRandomItemsInSector( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ,
// stealing should fail anyway 'cause there shouldn't be a temp file for unvisited sectors, but let's check anyway
Assert( GetSectorFlagStatus( sSectorX, sSectorY, ( UINT8 ) sSectorZ, SF_ALREADY_VISITED ) == TRUE );
// get sector name string
GetSectorIDString( sSectorX, sSectorY, ( INT8 ) sSectorZ, wSectorName, TRUE );
@@ -1140,15 +1139,15 @@ void RemoveRandomItemsInSector( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ,
uiNewTotal = uiNumberOfItems;
// set up item list ptrs
for( iCounter = 0; iCounter < uiNumberOfItems ; iCounter++ )
for( iCounter = 0; iCounter < uiNumberOfItems ; ++iCounter )
{
//if the item exists, and is visible and reachable, see if it should be stolen
if ( pItemList[ iCounter ].fExists && pItemList[ iCounter ].bVisible == TRUE && pItemList[ iCounter ].usFlags & WORLD_ITEM_REACHABLE )
{
if( Random( 100 ) < ubChance )
if ( Chance( ubChance ) )
{
// remove
uiNewTotal--;
--uiNewTotal;
pItemList[ iCounter ].fExists = FALSE;
// debug message
@@ -1165,12 +1164,12 @@ void RemoveRandomItemsInSector( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ,
}
else // handle a loaded sector
{
for( iCounter = 0; iCounter < guiNumWorldItems; iCounter++ )
for( iCounter = 0; iCounter < guiNumWorldItems; ++iCounter )
{
// note, can't do reachable test here because we'd have to do a path call...
if ( gWorldItems[ iCounter ].fExists && gWorldItems[ iCounter ].bVisible == TRUE )
{
if( Random( 100 ) < ubChance )
if ( Chance( ubChance ) )
{
RemoveItemFromPool( gWorldItems[ iCounter ].sGridNo , iCounter, gWorldItems[ iCounter ].ubLevel );
// debug message
@@ -1179,11 +1178,8 @@ void RemoveRandomItemsInSector( INT16 sSectorX, INT16 sSectorY, INT16 sSectorZ,
}
}
}
return;
}
/* ARM: Civilian theft of items was removed
void HandleTheftByCiviliansInSector( INT16 sX, INT16 sY, INT32 iLoyalty )
{
@@ -1231,15 +1227,11 @@ void HandleTownTheft( void )
HandleTheftByCiviliansInSector( ( INT16 )( pTownLocationsList[ iCounter ] % MAP_WORLD_X ), ( INT16 )( pTownLocationsList[ iCounter ] / MAP_WORLD_X ), gTownLoyalty[ ubTown ].ubRating );
}
iCounter++;
++iCounter;
}
return;
}
*/
void BuildListOfTownSectors( void )
{
INT32 iCounterX = 0, iCounterY = 0, iCounter = 0;