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

- replaced NO_SOLDIER with NOBODY

Browse Source 
- replaced NO_MAP_POS with NOWHERE

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1252 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-08-22 14:54:41 +00:00
parent f035858e3f
commit 85152e7a05
24 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/Isometric Utils.h
+1 -1
View File
@@ -10,7 +10,7 @@
#define RIGHTMOSTGRID (MAXCOL - 1)
#define LASTROWSTART (GRIDSIZE - MAXCOL)
#define NOWHERE (GRIDSIZE + 1)
#define NO_MAP_POS NOWHERE
//#define NO_MAP_POS NOWHERE
#define MAPWIDTH (WORLD_COLS)
#define MAPHEIGHT (WORLD_ROWS)
#define MAPLENGTH (MAPHEIGHT*MAPWIDTH)
TileEngine/physics.cpp
+1 -1
View File
@@ -1977,7 +1977,7 @@ void CalculateLaunchItemBasicParams( SOLDIERTYPE *pSoldier, OBJECTTYPE *pItem, I
if ( ubLevel == 1 && !fThroughIntermediateGridNo )
{
// Is there a guy here...?
if ( WhoIsThere2( sGridNo, ubLevel ) != NO_SOLDIER )
if ( WhoIsThere2( sGridNo, ubLevel ) != NOBODY )
{
dMagForce = (float)( dMagForce * 0.85 );
TileEngine/worlddef.cpp
+3 -3
View File
@@ -3158,11 +3158,11 @@ BOOLEAN LoadWorld( const STR8 puiFilename )
gfForceLoad = FALSE;
// CHECK IF OUR SELECTED GUY IS GONE!
if ( gusSelectedSoldier != NO_SOLDIER )
if ( gusSelectedSoldier != NOBODY )
{
if ( MercPtrs[ gusSelectedSoldier ]->bActive == FALSE )
{
gusSelectedSoldier = NO_SOLDIER;
gusSelectedSoldier = NOBODY;
}
}
@@ -3219,7 +3219,7 @@ BOOLEAN NewWorld( void )
UINT16 NewIndex;
INT32 cnt;
gusSelectedSoldier = gusOldSelectedSoldier = NO_SOLDIER;
gusSelectedSoldier = gusOldSelectedSoldier = NOBODY;
AdjustSoldierCreationStartValues( );