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

Fixes (by Buggler)

Browse Source 
- Fixed CTD when displaying militia assignment box that has regions beyond sector P16
- Corrected variable for heli tile gridno calculation 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-11-18 08:26:42 +00:00
parent bee0294665
commit 79a62c1750
2 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Helicopter.cpp
+4 -4
View File
@@ -2322,10 +2322,10 @@ void AddHelicopterToMaps( BOOLEAN fAdd, UINT8 ubSite )
{ {
AddHeliPiece( iGridNo, ( UINT16 ) iTileIndexNo ); // AddHeliPiece( iGridNo, sOStruct ); AddHeliPiece( iGridNo, ( UINT16 ) iTileIndexNo ); // AddHeliPiece( iGridNo, sOStruct );
AddHeliPiece( iGridNo, ( UINT16 )( iTileIndexNo + 1 ) ); AddHeliPiece( iGridNo, ( UINT16 )( iTileIndexNo + 1 ) );
AddHeliPiece( ( iGridNo - WORLD_ROWS * 5 ), ( UINT16 )( iTileIndexNo + 2 ) ); // ( iGridNo - 800 ) AddHeliPiece( ( iGridNo - WORLD_COLS * 5 ), ( UINT16 )( iTileIndexNo + 2 ) ); // ( iGridNo - 800 )
AddHeliPiece( iGridNo, ( UINT16 )( iTileIndexNo + 3 ) ); AddHeliPiece( iGridNo, ( UINT16 )( iTileIndexNo + 3 ) );
AddHeliPiece( iGridNo, ( UINT16 )( iTileIndexNo + 4 ) ); AddHeliPiece( iGridNo, ( UINT16 )( iTileIndexNo + 4 ) );
AddHeliPiece( ( iGridNo - WORLD_ROWS * 5 ), ( UINT16 )( iTileIndexNo + 5 ) ); // ( iGridNo - 800 ) AddHeliPiece( ( iGridNo - WORLD_COLS * 5 ), ( UINT16 )( iTileIndexNo + 5 ) ); // ( iGridNo - 800 )
InvalidateWorldRedundency(); InvalidateWorldRedundency();
SetRenderFlags( RENDER_FLAG_FULL ); SetRenderFlags( RENDER_FLAG_FULL );
@@ -2348,10 +2348,10 @@ void AddHelicopterToMaps( BOOLEAN fAdd, UINT8 ubSite )
// remove from the world // remove from the world
RemoveStruct( iGridNo, ( UINT16 )iTileIndexNo ); RemoveStruct( iGridNo, ( UINT16 )iTileIndexNo );
RemoveStruct( iGridNo, ( UINT16 )( iTileIndexNo + 1 ) ); RemoveStruct( iGridNo, ( UINT16 )( iTileIndexNo + 1 ) );
RemoveStruct( ( iGridNo - WORLD_ROWS * 5 ), ( UINT16 )( iTileIndexNo + 2 ) ); // ( iGridNo - 800 ) RemoveStruct( ( iGridNo - WORLD_COLS * 5 ), ( UINT16 )( iTileIndexNo + 2 ) ); // ( iGridNo - 800 )
RemoveStruct( iGridNo, ( UINT16 )( iTileIndexNo + 3 ) ); RemoveStruct( iGridNo, ( UINT16 )( iTileIndexNo + 3 ) );
RemoveStruct( iGridNo, ( UINT16 )( iTileIndexNo + 4 ) ); RemoveStruct( iGridNo, ( UINT16 )( iTileIndexNo + 4 ) );
RemoveStruct( ( iGridNo - WORLD_ROWS * 5 ), ( UINT16 )( iTileIndexNo + 5 ) ); // ( iGridNo - 800 ) RemoveStruct( ( iGridNo - WORLD_COLS * 5 ), ( UINT16 )( iTileIndexNo + 5 ) ); // ( iGridNo - 800 )
InvalidateWorldRedundency(); InvalidateWorldRedundency();
SetRenderFlags( RENDER_FLAG_FULL ); SetRenderFlags( RENDER_FLAG_FULL );
Strategic/Map Screen Interface Map.cpp
+36
View File
@@ -5732,6 +5732,12 @@ void RenderIconsPerSectorForSelectedTown( void )
// grab current sector value // grab current sector value
sCurrentSectorValue = sBaseSectorValue + ( ( iCounter % MILITIA_BOX_ROWS ) + ( iCounter / MILITIA_BOX_ROWS ) * ( 16 ) ); sCurrentSectorValue = sBaseSectorValue + ( ( iCounter % MILITIA_BOX_ROWS ) + ( iCounter / MILITIA_BOX_ROWS ) * ( 16 ) );
// skip sectors that's beyond sector P16
if( sCurrentSectorValue > SEC_P16 )
{
continue;
}
sSectorX = SECTORX( sCurrentSectorValue ); sSectorX = SECTORX( sCurrentSectorValue );
sSectorY = SECTORY( sCurrentSectorValue ); sSectorY = SECTORY( sCurrentSectorValue );
@@ -6129,6 +6135,12 @@ BOOLEAN IsThisMilitiaTownSectorAllowable( INT16 sSectorIndexValue )
sBaseSectorValue = GetBaseSectorForCurrentTown( ); sBaseSectorValue = GetBaseSectorForCurrentTown( );
sGlobalMapSector = sBaseSectorValue + ( ( sSectorIndexValue % MILITIA_BOX_ROWS ) + ( sSectorIndexValue / MILITIA_BOX_ROWS ) * 16 ); sGlobalMapSector = sBaseSectorValue + ( ( sSectorIndexValue % MILITIA_BOX_ROWS ) + ( sSectorIndexValue / MILITIA_BOX_ROWS ) * 16 );
// skip sectors that's beyond sector P16
if( sGlobalMapSector > SEC_P16 )
{
return( FALSE );
}
sSectorX = SECTORX( sGlobalMapSector ); sSectorX = SECTORX( sGlobalMapSector );
sSectorY = SECTORY( sGlobalMapSector ); sSectorY = SECTORY( sGlobalMapSector );
@@ -6359,6 +6371,12 @@ DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"Map Screen4");
// grab current sector value // grab current sector value
sCurrentSectorValue = sBaseSectorValue + ( ( iCounter % MILITIA_BOX_ROWS ) + ( iCounter / MILITIA_BOX_ROWS ) * ( 16 ) ); sCurrentSectorValue = sBaseSectorValue + ( ( iCounter % MILITIA_BOX_ROWS ) + ( iCounter / MILITIA_BOX_ROWS ) * ( 16 ) );
// skip sectors that's beyond sector P16
if( sCurrentSectorValue > SEC_P16 )
{
continue;
}
sSectorX = SECTORX( sCurrentSectorValue ); sSectorX = SECTORX( sCurrentSectorValue );
sSectorY = SECTORY( sCurrentSectorValue ); sSectorY = SECTORY( sCurrentSectorValue );
@@ -6643,6 +6661,12 @@ void RenderShadingForUnControlledSectors( void )
// grab current sector value // grab current sector value
sCurrentSectorValue = sBaseSectorValue + ( ( iCounter % MILITIA_BOX_ROWS ) + ( iCounter / MILITIA_BOX_ROWS ) * ( 16 ) ); sCurrentSectorValue = sBaseSectorValue + ( ( iCounter % MILITIA_BOX_ROWS ) + ( iCounter / MILITIA_BOX_ROWS ) * ( 16 ) );
// skip sectors that's beyond sector P16
if( sCurrentSectorValue > SEC_P16 )
{
continue;
}
sSectorX = SECTORX( sCurrentSectorValue ); sSectorX = SECTORX( sCurrentSectorValue );
sSectorY = SECTORY( sCurrentSectorValue ); sSectorY = SECTORY( sCurrentSectorValue );
@@ -7507,6 +7531,12 @@ BOOLEAN CanMilitiaAutoDistribute( void )
// grab current sector value // grab current sector value
sCurrentSectorValue = sBaseSectorValue + ( ( iCounter % MILITIA_BOX_ROWS ) + ( iCounter / MILITIA_BOX_ROWS ) * ( 16 ) ); sCurrentSectorValue = sBaseSectorValue + ( ( iCounter % MILITIA_BOX_ROWS ) + ( iCounter / MILITIA_BOX_ROWS ) * ( 16 ) );
// skip sectors that's beyond sector P16
if( sCurrentSectorValue > SEC_P16 )
{
continue;
}
sSectorX = SECTORX( sCurrentSectorValue ); sSectorX = SECTORX( sCurrentSectorValue );
sSectorY = SECTORY( sCurrentSectorValue ); sSectorY = SECTORY( sCurrentSectorValue );
@@ -7830,6 +7860,12 @@ BOOLEAN CanRedistributeMilitiaInSector( INT16 sClickedSectorX, INT16 sClickedSec
// grab current sector value // grab current sector value
sCurrentSectorValue = sBaseSectorValue + ( ( iCounter % MILITIA_BOX_ROWS ) + ( iCounter / MILITIA_BOX_ROWS ) * ( 16 ) ); sCurrentSectorValue = sBaseSectorValue + ( ( iCounter % MILITIA_BOX_ROWS ) + ( iCounter / MILITIA_BOX_ROWS ) * ( 16 ) );
// skip sectors that's beyond sector P16
if( sCurrentSectorValue > SEC_P16 )
{
continue;
}
sSectorX = SECTORX( sCurrentSectorValue ); sSectorX = SECTORX( sCurrentSectorValue );
sSectorY = SECTORY( sCurrentSectorValue ); sSectorY = SECTORY( sCurrentSectorValue );