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

- Fix: compiler warning

Browse Source 
- If possible, use the intended macrso to determine sector coordinates

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8018 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-01-10 18:06:55 +00:00
parent f09d7818f0
commit 3af6748b03
6 changed files with 38 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Strategic Movement.cpp
+3 -4
View File
@@ -241,8 +241,8 @@ BOOLEAN AddPlayerToGroup( UINT8 ubGroupID, SOLDIERTYPE *pSoldier )
{
pGroup->pPlayerList = pPlayer;
pGroup->ubGroupSize = 1;
pGroup->ubPrevX = (UINT8)((pSoldier->ubPrevSectorID % 16) + 1);
pGroup->ubPrevY = (UINT8)((pSoldier->ubPrevSectorID / 16) + 1);
pGroup->ubPrevX = SECTORX( pSoldier->ubPrevSectorID );
pGroup->ubPrevY = SECTORY( pSoldier->ubPrevSectorID );
pGroup->ubSectorX = (UINT8)pSoldier->sSectorX;
pGroup->ubSectorY = (UINT8)pSoldier->sSectorY;
pGroup->ubSectorZ = (UINT8)pSoldier->bSectorZ;
@@ -2796,7 +2796,6 @@ void InitiateGroupMovementToNextSector( GROUP *pGroup )
//Calc time to get to next waypoint...
if ( !pGroup->ubSectorZ )
{
BOOLEAN fCalcRegularTime = TRUE;
if ( pGroup->usGroupTeam == ENEMY_TEAM )
{
//Determine if the enemy group is "sleeping". If so, then simply delay their arrival time by the amount of time
@@ -2813,7 +2812,7 @@ void InitiateGroupMovementToNextSector( GROUP *pGroup )
}
else if ( pGroup->usGroupTeam == MILITIA_TEAM )
{
// As the player orders militia to move, a chance-based system is ill-advised - the player would simply cancel and reassign the order, leading to bypassing the mechanci in a tedious way
// As the player orders militia to move, a chance-based system is ill-advised - the player would simply cancel and reassign the order, leading to bypassing the mechanic in a tedious way
// so instead, we always add a penalty, but it will be lower
// however, do not give such a penalty for movement inside a town - the player might just want to redistribute his troops, and this would be tedious
if ( GetWorldHour( ) >= 21 || GetWorldHour( ) <= 4 )