mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
Editor: Disable light sprites that are not in bounds. Actually happens in some sectors (ie Drassen)
Editor: Fix for use of uninitialized variable in undo Editor: Fix for clipping bounds that are offscreen (causes crash) Fix for AP bonus reading from INI Fix mine indexes when looking for creature infestation of mines Final (?) fix for militia reinforcements. Also a change: If you refuse reinforcements, none will come for the entirety of the battle Increase size of cover and LOS grids to fit max radius Fix for uninitialized light level in DistanceVisible Move CheckForEndOfBattle to end of ReduceAttackBusy, to remove a possible militia invalidate upon promotion Change the way Alt-L handles reloading git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1142 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -1730,15 +1730,18 @@ BOOLEAN SetCurrentWorldSector( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
|
||||
// is the sector already loaded?
|
||||
if( ( gWorldSectorX == sMapX ) && ( sMapY == gWorldSectorY) && ( bMapZ == gbWorldSectorZ) )
|
||||
{
|
||||
//Inserts the enemies into the newly loaded map based on the strategic information.
|
||||
//Inserts the enemies into the already loaded map based on the strategic information.
|
||||
//Note, the flag will return TRUE only if enemies were added. The game may wish to
|
||||
//do something else in a case where no enemies are present.
|
||||
|
||||
PrepareMilitiaForTactical( FALSE);
|
||||
|
||||
SetPendingNewScreen(GAME_SCREEN);
|
||||
if( !NumEnemyInSector( ) )
|
||||
{
|
||||
PrepareEnemyForSectorBattle();
|
||||
}
|
||||
|
||||
if( gubNumCreaturesAttackingTown && !gbWorldSectorZ &&
|
||||
gubSectorIDOfCreatureAttack == SECTOR( gWorldSectorX, gWorldSectorY ) )
|
||||
{
|
||||
@@ -2072,7 +2075,7 @@ void PrepareLoadedSector()
|
||||
|
||||
PrepareCreaturesForBattle();
|
||||
|
||||
PrepareMilitiaForTactical();
|
||||
PrepareMilitiaForTactical(TRUE);
|
||||
|
||||
// OK, set varibles for entring this new sector...
|
||||
gTacticalStatus.fVirginSector = TRUE;
|
||||
|
||||
Reference in New Issue
Block a user