- Fix: VS2010 debug build issue with reading in StructureConstruct.xml

- replaced a few hardcoded values with enums
- use TANK(...) macro instead of checking for bodytype by hand

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7959 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-08-05 19:01:11 +00:00
parent 90486b015b
commit 7dbff83e24
17 changed files with 163 additions and 162 deletions
+8 -8
View File
@@ -1926,7 +1926,7 @@ INT8 DecideActionYellow(SOLDIERTYPE *pSoldier)
if ( pSoldier->flags.lastFlankLeft )
{
if ( origDir > currDir )
origDir -= 8;
origDir -= NUM_WORLD_DIRECTIONS;
if ( (currDir - origDir) >= 4 )
{
@@ -1944,7 +1944,7 @@ INT8 DecideActionYellow(SOLDIERTYPE *pSoldier)
else
{
if ( origDir < currDir )
origDir += 8;
origDir += NUM_WORLD_DIRECTIONS;
if ( (origDir - currDir) >= 4 )
{
@@ -3354,7 +3354,7 @@ INT8 DecideActionRed(SOLDIERTYPE *pSoldier, UINT8 ubUnconsciousOK)
if ( pSoldier->flags.lastFlankLeft )
{
if ( origDir > currDir )
origDir -= 8;
origDir -= NUM_WORLD_DIRECTIONS;
if ( (currDir - origDir) >= 4 )
{
@@ -3373,7 +3373,7 @@ INT8 DecideActionRed(SOLDIERTYPE *pSoldier, UINT8 ubUnconsciousOK)
else
{
if ( origDir < currDir )
origDir += 8;
origDir += NUM_WORLD_DIRECTIONS;
if ( (origDir - currDir) >= 4 )
{
@@ -7141,7 +7141,7 @@ void DecideAlertStatus( SOLDIERTYPE *pSoldier )
if ( pSoldier->flags.lastFlankLeft )
{
if ( origDir > currDir )
origDir -= 8;
origDir -= NUM_WORLD_DIRECTIONS;
if ( (currDir - origDir) >= 4 )
{
@@ -7159,7 +7159,7 @@ void DecideAlertStatus( SOLDIERTYPE *pSoldier )
else
{
if ( origDir < currDir )
origDir += 8;
origDir += NUM_WORLD_DIRECTIONS;
if ( (origDir - currDir) >= 4 )
{
@@ -7296,7 +7296,7 @@ void DecideAlertStatus( SOLDIERTYPE *pSoldier )
if ( pSoldier->flags.lastFlankLeft )
{
if ( origDir > currDir )
origDir -= 8;
origDir -= NUM_WORLD_DIRECTIONS;
if ( (currDir - origDir) >= 4 )
{
@@ -7315,7 +7315,7 @@ void DecideAlertStatus( SOLDIERTYPE *pSoldier )
else
{
if ( origDir < currDir )
origDir += 8;
origDir += NUM_WORLD_DIRECTIONS;
if ( (origDir - currDir) >= 4 )
{