- replaced NO_SOLDIER with NOBODY

- 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
+5 -5
View File
@@ -361,7 +361,7 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
fDoubleClickIntercepted = TRUE;
// First check if we clicked on a guy, if so, make selected if it's ours
if( gusSelectedSoldier != NO_SOLDIER )
if( gusSelectedSoldier != NOBODY )
{
// Set movement mode
// OK, only change this if we are stationary!
@@ -507,7 +507,7 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
case CONFIRM_MOVE_MODE:
if ( gusSelectedSoldier != NO_SOLDIER )
if ( gusSelectedSoldier != NOBODY )
{
if ( MercPtrs[ gusSelectedSoldier ]->usAnimState != RUNNING )
{
@@ -533,7 +533,7 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
// Check if we are stationary
//if ( AimCubeUIClick( ) )
//{
// if ( gusSelectedSoldier != NO_SOLDIER )
// if ( gusSelectedSoldier != NOBODY )
// {
// if ( !( gAnimControl[ MercPtrs[ gusSelectedSoldier ]->usAnimState ].uiFlags & ANIM_STATIONARY ) )
// {
@@ -1249,7 +1249,7 @@ void GetRTMousePositionInput( UINT32 *puiNewEvent )
{
UINT16 usMapPos;
static UINT16 usOldMapPos = 0;
static UINT32 uiMoveTargetSoldierId = NO_SOLDIER;
static UINT32 uiMoveTargetSoldierId = NOBODY;
SOLDIERTYPE *pSoldier;
static BOOLEAN fOnValidGuy = FALSE;
@@ -1378,7 +1378,7 @@ void GetRTMousePositionInput( UINT32 *puiNewEvent )
gfUIAllMoveOn = FALSE;
}
uiMoveTargetSoldierId = NO_SOLDIER;
uiMoveTargetSoldierId = NOBODY;
// Check for being on terrain
if( GetSoldier( &pSoldier, gusSelectedSoldier ) )