mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
HAM5.5b2 merged in!
Notes: -There may still be bugs!! (In fact, I almost guarantee it -- there's -Ammo box code added to HR's crate code -Splitting a crate/box also automatically refills half empty magazines -new pathing arrows for map screen not included -code for scouts to know where enemies are going doesn't appear to work... but i'm not sure it was completed. -lots of gobledy gook (chinese?) comments turned back to english -also added Bob's popups -other languages besides english still need to have there language.cpp files updated with array changes -AI enhancements by Warmsteel (reloading, suppression, roaming, avoiding gas, and other fixes) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5181 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -74,6 +74,8 @@
|
||||
#define MAX_PALACE_DISTANCE 20
|
||||
|
||||
INT8 bNumSquadleadersInArmy = 0; // added by SANDRO
|
||||
// HEADROCK HAM 5: Read target coolness by sector
|
||||
UINT32 gCoolnessBySector[256];
|
||||
|
||||
OLD_SOLDIERCREATE_STRUCT_101::OLD_SOLDIERCREATE_STRUCT_101() {
|
||||
initialize();
|
||||
@@ -3237,8 +3239,8 @@ UINT8 GetLocationModifier( UINT8 ubSoldierClass )
|
||||
INT16 sSectorX, sSectorY, sSectorZ;
|
||||
#ifdef JA2UB
|
||||
#else
|
||||
INT8 bTownId;
|
||||
UINT8 ubPalaceDistance;
|
||||
//INT8 bTownId;
|
||||
//UINT8 ubPalaceDistance;
|
||||
#endif
|
||||
BOOLEAN fSuccess;
|
||||
|
||||
@@ -3372,6 +3374,13 @@ UINT8 GetLocationModifier( UINT8 ubSoldierClass )
|
||||
break;
|
||||
}
|
||||
#else
|
||||
// HEADROCK HAM 5:
|
||||
// The calculation has been replaced with an XML table.
|
||||
|
||||
ubLocationModifier = gCoolnessBySector[SECTOR(sSectorX, sSectorY)];
|
||||
|
||||
/*
|
||||
|
||||
// ignore sSectorZ - treat any underground enemies as if they were on the surface!
|
||||
bTownId = GetTownIdForSector( sSectorX, sSectorY );
|
||||
|
||||
@@ -3401,6 +3410,8 @@ UINT8 GetLocationModifier( UINT8 ubSoldierClass )
|
||||
|
||||
// adjust for distance from Queen's palace (P3) (0 to +30)
|
||||
ubLocationModifier = ( ( MAX_PALACE_DISTANCE - ubPalaceDistance ) * DIFF_FACTOR_PALACE_DISTANCE ) / MAX_PALACE_DISTANCE;
|
||||
*/
|
||||
|
||||
#endif
|
||||
return( ubLocationModifier );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user