mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
**********************************************************
** Big Maps Projects code (incl. Multiplayer v1.5 ** ********************************************************** - Merged Big Maps Project code from BMP+MP trunk (Revision: 3340) o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP - Before THIS merge, I made a branch of the existing 1.13 source o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src - Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago - I will add VS 2010 projects and solution file in the next few days git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
+113
-112
@@ -29,31 +29,32 @@ void Add3X3Pit( INT32 iMapIndex )
|
||||
EXITGRID ExitGrid;
|
||||
if( !gfEditMode )
|
||||
ApplyMapChangesToMapTempFile( TRUE );
|
||||
AddObjectToTail( iMapIndex + 159, REGWATERTEXTURE1 );
|
||||
AddObjectToTail( iMapIndex - 1, REGWATERTEXTURE2 );
|
||||
AddObjectToTail( iMapIndex - 161, REGWATERTEXTURE3 );
|
||||
AddObjectToTail( iMapIndex + 160, REGWATERTEXTURE4 );
|
||||
AddObjectToTail( iMapIndex, REGWATERTEXTURE5 );
|
||||
AddObjectToTail( iMapIndex - 160, REGWATERTEXTURE6 );
|
||||
AddObjectToTail( iMapIndex + 161, REGWATERTEXTURE7 );
|
||||
AddObjectToTail( iMapIndex + 1, REGWATERTEXTURE8 );
|
||||
AddObjectToTail( iMapIndex - 159, REGWATERTEXTURE9 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS-1, REGWATERTEXTURE1 );
|
||||
AddObjectToTail( iMapIndex - 1, REGWATERTEXTURE2 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS+1, REGWATERTEXTURE3 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS, REGWATERTEXTURE4 );
|
||||
AddObjectToTail( iMapIndex, REGWATERTEXTURE5 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS, REGWATERTEXTURE6 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS+1, REGWATERTEXTURE7 );
|
||||
AddObjectToTail( iMapIndex + 1, REGWATERTEXTURE8 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS-1, REGWATERTEXTURE9 );
|
||||
if( !gfEditMode )
|
||||
{ //Add the exitgrids associated with the pit.
|
||||
{
|
||||
//Add the exitgrids associated with the pit.
|
||||
ExitGrid.ubGotoSectorX = (UINT8)gWorldSectorX;
|
||||
ExitGrid.ubGotoSectorY = (UINT8)gWorldSectorY;
|
||||
ExitGrid.ubGotoSectorZ = (UINT8)(gbWorldSectorZ+1);
|
||||
ExitGrid.sGridNo = (INT16)iMapIndex;
|
||||
AddExitGridToWorld( iMapIndex + 159, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 161, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 160, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 160, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 161, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 159, &ExitGrid );
|
||||
RecompileLocalMovementCostsFromRadius( (INT16)iMapIndex, 2 );
|
||||
ExitGrid.usGridNo = iMapIndex;
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS-1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS+1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS+1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS-1, &ExitGrid );
|
||||
RecompileLocalMovementCostsFromRadius( iMapIndex, 2 );
|
||||
}
|
||||
|
||||
MarkWorldDirty();
|
||||
@@ -66,63 +67,63 @@ void Add5X5Pit( INT32 iMapIndex )
|
||||
EXITGRID ExitGrid;
|
||||
if( !gfEditMode )
|
||||
ApplyMapChangesToMapTempFile( TRUE );
|
||||
AddObjectToTail( iMapIndex + 318, REGWATERTEXTURE10 );
|
||||
AddObjectToTail( iMapIndex + 158, REGWATERTEXTURE11 );
|
||||
AddObjectToTail( iMapIndex - 2, REGWATERTEXTURE12 );
|
||||
AddObjectToTail( iMapIndex - 162, REGWATERTEXTURE13 );
|
||||
AddObjectToTail( iMapIndex - 322, REGWATERTEXTURE14 );
|
||||
AddObjectToTail( iMapIndex + 319, REGWATERTEXTURE15 );
|
||||
AddObjectToTail( iMapIndex + 159, REGWATERTEXTURE16 );
|
||||
AddObjectToTail( iMapIndex - 1, REGWATERTEXTURE17 );
|
||||
AddObjectToTail( iMapIndex - 161, REGWATERTEXTURE18 );
|
||||
AddObjectToTail( iMapIndex - 321, REGWATERTEXTURE19 );
|
||||
AddObjectToTail( iMapIndex + 320, REGWATERTEXTURE20 );
|
||||
AddObjectToTail( iMapIndex + 160, REGWATERTEXTURE21 );
|
||||
AddObjectToTail( iMapIndex, REGWATERTEXTURE22 );
|
||||
AddObjectToTail( iMapIndex - 160, REGWATERTEXTURE23 );
|
||||
AddObjectToTail( iMapIndex - 320, REGWATERTEXTURE24 );
|
||||
AddObjectToTail( iMapIndex + 321, REGWATERTEXTURE25 );
|
||||
AddObjectToTail( iMapIndex + 161, REGWATERTEXTURE26 );
|
||||
AddObjectToTail( iMapIndex + 1, REGWATERTEXTURE27 );
|
||||
AddObjectToTail( iMapIndex - 159, REGWATERTEXTURE28 );
|
||||
AddObjectToTail( iMapIndex - 319, REGWATERTEXTURE29 );
|
||||
AddObjectToTail( iMapIndex + 322, REGWATERTEXTURE30 );
|
||||
AddObjectToTail( iMapIndex + 162, REGWATERTEXTURE31 );
|
||||
AddObjectToTail( iMapIndex + 2, REGWATERTEXTURE32 );
|
||||
AddObjectToTail( iMapIndex - 158, REGWATERTEXTURE33 );
|
||||
AddObjectToTail( iMapIndex - 318, REGWATERTEXTURE34 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS*2-2, REGWATERTEXTURE10 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS-2, REGWATERTEXTURE11 );
|
||||
AddObjectToTail( iMapIndex - 2, REGWATERTEXTURE12 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS+2, REGWATERTEXTURE13 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS*2+2, REGWATERTEXTURE14 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS*2-1, REGWATERTEXTURE15 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS-1, REGWATERTEXTURE16 );
|
||||
AddObjectToTail( iMapIndex - 1, REGWATERTEXTURE17 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS+1, REGWATERTEXTURE18 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS*2+1, REGWATERTEXTURE19 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS*2, REGWATERTEXTURE20 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS, REGWATERTEXTURE21 );
|
||||
AddObjectToTail( iMapIndex, REGWATERTEXTURE22 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS, REGWATERTEXTURE23 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS*2, REGWATERTEXTURE24 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS*2+1, REGWATERTEXTURE25 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS+1, REGWATERTEXTURE26 );
|
||||
AddObjectToTail( iMapIndex + 1, REGWATERTEXTURE27 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS-1, REGWATERTEXTURE28 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS*2-1, REGWATERTEXTURE29 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS*2+2, REGWATERTEXTURE30 );
|
||||
AddObjectToTail( iMapIndex + WORLD_COLS+2, REGWATERTEXTURE31 );
|
||||
AddObjectToTail( iMapIndex + 2, REGWATERTEXTURE32 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS-2, REGWATERTEXTURE33 );
|
||||
AddObjectToTail( iMapIndex - WORLD_COLS*2-2, REGWATERTEXTURE34 );
|
||||
if( !gfEditMode )
|
||||
{ //Add the exitgrids associated with the pit.
|
||||
ExitGrid.ubGotoSectorX = (UINT8)gWorldSectorX;
|
||||
ExitGrid.ubGotoSectorY = (UINT8)gWorldSectorY;
|
||||
ExitGrid.ubGotoSectorZ = (UINT8)(gbWorldSectorZ+1);
|
||||
ExitGrid.sGridNo = (INT16)iMapIndex;
|
||||
AddExitGridToWorld( iMapIndex + 318, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 158, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 162, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 322, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 319, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 159, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 161, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 321, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 320, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 160, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 160, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 320, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 321, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 161, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 159, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 319, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 322, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 162, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 158, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 318, &ExitGrid );
|
||||
RecompileLocalMovementCostsFromRadius( (INT16)iMapIndex, 3 );
|
||||
ExitGrid.usGridNo = iMapIndex;
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS*2-2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS-2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS+2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS*2+2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS*2-1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS-1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - 1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS+1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS*2+1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS*2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS*2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS*2+1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS+1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS-1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS*2-1, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS*2+2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + WORLD_COLS+2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex + 2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS-2, &ExitGrid );
|
||||
AddExitGridToWorld( iMapIndex - WORLD_COLS*2-2, &ExitGrid );
|
||||
RecompileLocalMovementCostsFromRadius( iMapIndex, 3 );
|
||||
}
|
||||
MarkWorldDirty();
|
||||
if( !gfEditMode )
|
||||
@@ -131,45 +132,45 @@ void Add5X5Pit( INT32 iMapIndex )
|
||||
|
||||
void Remove3X3Pit( INT32 iMapIndex )
|
||||
{
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 159, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 161, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 160, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 160, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 161, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 159, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS-1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS+1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS+1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS-1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
MarkWorldDirty();
|
||||
}
|
||||
|
||||
void Remove5X5Pit( INT32 iMapIndex )
|
||||
{
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 318, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 158, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 162, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 322, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 319, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 159, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 161, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 321, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 320, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 160, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 160, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 320, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 321, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 161, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 159, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 319, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 322, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 162, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 158, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 318, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS*2-2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS-2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS+2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS*2+2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS*2-1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS-1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - 1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS+1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS*2+1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS*2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS*2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS*2+1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS+1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS-1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS*2-1, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS*2+2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + WORLD_COLS+2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex + 2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS-2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
RemoveAllObjectsOfTypeRange( iMapIndex - WORLD_COLS*2-2, REGWATERTEXTURE, REGWATERTEXTURE );
|
||||
MarkWorldDirty();
|
||||
}
|
||||
|
||||
@@ -203,9 +204,9 @@ void RemoveAllPits()
|
||||
}
|
||||
}
|
||||
|
||||
void SearchForOtherMembersWithinPitRadiusAndMakeThemFall( INT16 sGridNo, INT16 sRadius )
|
||||
void SearchForOtherMembersWithinPitRadiusAndMakeThemFall( INT32 sGridNo, INT16 sRadius )
|
||||
{
|
||||
INT16 x, y, sNewGridNo;
|
||||
INT32 x, y, sNewGridNo;
|
||||
UINT8 ubID;
|
||||
SOLDIERTYPE *pSoldier;
|
||||
|
||||
@@ -240,16 +241,16 @@ void HandleFallIntoPitFromAnimation( UINT8 ubID )
|
||||
{
|
||||
SOLDIERTYPE *pSoldier = MercPtrs[ ubID ];
|
||||
EXITGRID ExitGrid;
|
||||
INT16 sPitGridNo;
|
||||
INT32 sPitGridNo;
|
||||
// OK, get exit grid...
|
||||
|
||||
sPitGridNo = (INT16)pSoldier->aiData.uiPendingActionData4;
|
||||
sPitGridNo = pSoldier->aiData.uiPendingActionData4;
|
||||
|
||||
GetExitGrid( sPitGridNo, &ExitGrid );
|
||||
|
||||
// Given exit grid, make buddy move to next sector....
|
||||
pSoldier->ubStrategicInsertionCode = INSERTION_CODE_GRIDNO;
|
||||
pSoldier->usStrategicInsertionData = ExitGrid.sGridNo;
|
||||
pSoldier->usStrategicInsertionData = ExitGrid.usGridNo;
|
||||
|
||||
pSoldier->sSectorX = ExitGrid.ubGotoSectorX;
|
||||
pSoldier->sSectorY = ExitGrid.ubGotoSectorY;
|
||||
|
||||
Reference in New Issue
Block a user