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

- New Feature: Arulco special division controls other features to fight the player. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=343706&#msg_343706

Browse Source 
- New Feature: Enemy helicopters allow the AI to rapidly deploy troops aross the map. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=343707&#msg_343707. GameDir <= r2279 is required.
- Fix: income of mine 0 was not correctly calculated

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8015 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2016-01-09 19:45:30 +00:00
parent 70b832d0b4
commit 7664342746
67 changed files with 3187 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Helicopter.cpp
+65 -7
View File
@@ -43,6 +43,7 @@
#include "Debug Control.h"
#include "expat.h"
#include "merc entering.h" // added by Flugente
#include "ASD.h" // added by Flugente
#endif
#include "Vehicles.h"
@@ -106,6 +107,7 @@ INT32 iHelicopterVehicleId = -1;
// helicopter icon
UINT32 guiHelicopterIcon;
UINT32 guiEnemyHelicopterIcon;
// total distance travelled
INT32 iTotalHeliDistanceSinceRefuel = 0;
@@ -1292,6 +1294,9 @@ void LandHelicopter( void )
HandleKillChopperMeanwhileScene();
#endif
}
// Flugente: once the AI 'learns' of the player using helis, it wants some for itself
SetASDFlag( ASDFACT_HELI_UNLOCKED );
}
@@ -2670,19 +2675,19 @@ void AddHelicopterToMaps( BOOLEAN fAdd, UINT8 ubSite )
InvalidateWorldRedundency();
SetRenderFlags( RENDER_FLAG_FULL );
// ATE: If any mercs here, bump them off!
// ATE: If any mercs here, bump them off!
ConvertGridNoToXY( iGridNo, &sCentreGridX, &sCentreGridY );
for( sGridY = sCentreGridY - 5; sGridY < sCentreGridY + 5; sGridY++ )
{
for( sGridX = sCentreGridX - 5; sGridX < sCentreGridX + 5; sGridX++ )
for( sGridY = sCentreGridY - 5; sGridY < sCentreGridY + 5; sGridY++ )
{
iGridNo = MAPROWCOLTOPOS( sGridY, sGridX );
for( sGridX = sCentreGridX - 5; sGridX < sCentreGridX + 5; sGridX++ )
{
iGridNo = MAPROWCOLTOPOS( sGridY, sGridX );
BumpAnyExistingMerc( iGridNo );
BumpAnyExistingMerc( iGridNo );
}
}
}
}
else
{
// remove from the world
@@ -2695,9 +2700,62 @@ void AddHelicopterToMaps( BOOLEAN fAdd, UINT8 ubSite )
InvalidateWorldRedundency();
SetRenderFlags( RENDER_FLAG_FULL );
}
}
void AddEnemyHelicopterToMaps( BOOLEAN fAdd, BOOLEAN fDestroyed, INT32 aGridno, INT32 aTileIndex )
{
// for safety, remove the old one first
{
// remove from the world
RemoveStruct( aGridno, (UINT16)aTileIndex );
RemoveStruct( aGridno, (UINT16)(aTileIndex + 1) );
RemoveStruct( (aGridno - WORLD_COLS * 5), (UINT16)(aTileIndex + 2) );
RemoveStruct( aGridno, (UINT16)(aTileIndex + 3) );
RemoveStruct( aGridno, (UINT16)(aTileIndex + 4) );
RemoveStruct( (aGridno - WORLD_COLS * 5), (UINT16)(aTileIndex + 5) );
// for safety reasons, both versions are to be removed
RemoveStruct( aGridno, (UINT16)aTileIndex + 6 );
RemoveStruct( aGridno, (UINT16)(aTileIndex + 6 + 1) );
RemoveStruct( (aGridno - WORLD_COLS * 5), (UINT16)(aTileIndex + 6 + 2) );
RemoveStruct( aGridno, (UINT16)(aTileIndex + 6 + 3) );
RemoveStruct( aGridno, (UINT16)(aTileIndex + 6 + 4) );
RemoveStruct( (aGridno - WORLD_COLS * 5), (UINT16)(aTileIndex + 6 + 5) );
InvalidateWorldRedundency( );
SetRenderFlags( RENDER_FLAG_FULL );
}
if ( fAdd )
{
INT16 sCentreGridX, sCentreGridY;
INT16 offset = fDestroyed ? 6 : 0;
AddHeliPiece( aGridno, (UINT16)aTileIndex + offset );
AddHeliPiece( aGridno, (UINT16)(aTileIndex + offset + 1) );
AddHeliPiece( (aGridno - WORLD_COLS * 5), (UINT16)(aTileIndex + offset + 2) );
AddHeliPiece( aGridno, (UINT16)(aTileIndex + offset + 3) );
AddHeliPiece( aGridno, (UINT16)(aTileIndex + offset + 4) );
AddHeliPiece( (aGridno - WORLD_COLS * 5), (UINT16)(aTileIndex + offset + 5) );
InvalidateWorldRedundency( );
SetRenderFlags( RENDER_FLAG_FULL );
// ATE: If any mercs here, bump them off!
ConvertGridNoToXY( aGridno, &sCentreGridX, &sCentreGridY );
for ( INT16 sGridY = sCentreGridY - 5; sGridY < sCentreGridY + 5; sGridY++ )
{
for ( INT16 sGridX = sCentreGridX - 5; sGridX < sCentreGridX + 5; sGridX++ )
{
aGridno = MAPROWCOLTOPOS( sGridY, sGridX );
BumpAnyExistingMerc( aGridno );
}
}
}
}