- Removed the "ENABLE_DISPLAY_EXPLOSIVES" define

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5513 3b4a5df2-a311-0410-b5c6-a8a6f20db521

MainMenuScreen.cpp

@@ -751,8 +751,6 @@ BOOLEAN CreateDestroyMainMenuButtons( BOOLEAN fCreate )
 void RenderMainMenu()
 {
 	HVSURFACE hVSurface;	
-	HVSURFACE hVSaveSurface;
-	//HVOBJECT hPixHandle;
 	UINT32 iCounter2;
 		
 	//Get and display the background image

Tactical/DisplayCover.cpp

@@ -49,7 +49,6 @@ enum COVER_VALUES
 	MAX_COVER=3
 };
 
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
 // Flugente: mines display - stuff needs to be here
 enum MINES_VALUES
 {
@@ -67,7 +66,7 @@ enum COVER_VALUES
 	MINES_LVL_4,
 	MAX_MINES
 };
-#endif
+
 
 struct CoverCell
 {
@@ -75,13 +74,10 @@ struct CoverCell
 	INT8	bCover;
 	BOOLEAN fInverseColor;
 
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
 	INT8	bMines;
 
 	CoverCell() : sGridNo(NOWHERE), bCover(INVALID_COVER), fInverseColor(FALSE), bMines(MINES_ALL) {}
-#else
+
-	CoverCell() : sGridNo(NOWHERE), bCover(INVALID_COVER), fInverseColor(FALSE) {}
-#endif
 };
 
 enum COVER_DRAW_MODE {
@@ -101,7 +97,7 @@ const UINT8 animArr[3] = {
 #define COVER_Y_CELLS WORLD_ROWS_MAX
 #define COVER_Z_CELLS 2 // roof or no roof
 
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
+
 // Flugente: mines display - stuff needs to be here
 enum MINES_DRAW_MODE {
 	MINES_DRAW_OFF,
@@ -114,7 +110,7 @@ const UINT8 animArr[3] = {
 	MINES_DRAW_NET_D,
 	MINES_DRAW_MAX
 };
-#endif
+
 
 //******	Local Variables	*********************************************
 
@@ -126,9 +122,8 @@ DWORD guiCoverNextUpdateTime = 0;
 
 COVER_DRAW_MODE gubDrawMode = COVER_DRAW_OFF;
 
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
 MINES_DRAW_MODE gubDrawModeMine = MINES_DRAW_OFF;	// Flugente: mines display
-#endif
+
 
 //*******	Local Function Prototypes ***********************************
 
@@ -142,9 +137,8 @@ void	RemoveCoverObjectFromWorld( const INT32 sGridNo, const UINT16& usGraphic, c
 void	AddCoverObjectsToViewArea();
 void	RemoveCoverObjectsFromViewArea();
 
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
 void	RemoveMinesObjectsFromViewArea();	// added by Flugente, has to be declared here
-#endif
+
 
 void	CalculateCover();
 void	CalculateCoverForSoldier( SOLDIERTYPE* pForSoldier, const INT32& sTargetGridNo, const BOOLEAN& fRoof, INT8& bCover );
@@ -460,11 +454,10 @@ void CalculateCover()
 		return;
 	}
 
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
+
 	// at we're here, we want to display cover, so remove the mines display
 	if ( gubDrawModeMine != MINES_DRAW_OFF )
 		RemoveMinesObjectsFromViewArea();
-#endif
 
 	GetSoldier( &pSoldier, gusSelectedSoldier );
 
@@ -689,7 +682,7 @@ BOOLEAN IsTheRoofVisible( const INT32& sGridNo )
 	return( FALSE );
 }
 
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
+
 // ----------------------------- Mines display after this ----------------------------------------
 // added by Flugente
 
@@ -1256,4 +1249,4 @@ BOOLEAN IsTheRoofVisible( const INT32& sGridNo )
 		}
 	}
 }
-#endif
+

Tactical/DisplayCover.h

@@ -36,7 +36,7 @@ void ChangeSizeOfLOS( INT32 iNewSize );
 INT8	CalcCoverForGridNoBasedOnTeamKnownEnemies( SOLDIERTYPE *pSoldier, INT16 sTargetGridNo, INT8 bStance );
 //ddd for optimize oppponent turn
 
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
+
 // ----------------------------- Mines display after this ----------------------------------------
 // added by Flugente: display of mine, bombs and tripwire
 void DisplayMines(const BOOLEAN& forceUpdate = FALSE);
@@ -49,6 +49,6 @@ INT8	CalcCoverForGridNoBasedOnTeamKnownEnemies( SOLDIERTYPE *pSoldier, INT16 sTa
 void ToggleHostileTrapsView();
 
 void SwitchMinesDrawModeForNetworks();
-#endif
+
 
 #endif

Tactical/Handle UI.cpp

@@ -656,9 +656,7 @@ UINT32	HandleTacticalUI( void )
 
 	DisplayCover();
 
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
 	DisplayMines();		// added by Flugente
-#endif
 
 	if ( HandleItemPickupMenu( ) )
 	{

Tactical/LOS.cpp

@@ -4137,7 +4137,7 @@ INT8 FireBulletGivenTargetNCTH( SOLDIERTYPE * pFirer, FLOAT dEndX, FLOAT dEndY,
 	UINT8		ubLoop=0;
 	UINT8		ubShots=0;
 	UINT8		ubImpact=0;
-	INT8		bCTGT;
+	INT8		bCTGT = 0;
 	UINT8		ubSpreadIndex = 0;
 	UINT16	usBulletFlags = 0;
 	int n=0;

Tactical/Turn Based Input.cpp

@@ -1405,56 +1405,43 @@ void GetPolledKeyboardInput( UINT32 *puiNewEvent )
 
 	if( _KeyDown( DEL ) && !fDeleteDown)
 	{
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
+
 		if ( _KeyDown( ALT )	)
 			SwitchToHostileTrapsView();	// added by Flugente
 		else
 			SwitchToEnemyView();
-#else
-		SwitchToEnemyView();
-#endif
 
 		fDeleteDown = TRUE;
 	}
 
 	if( !_KeyDown( DEL ) && fDeleteDown )
 	{
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
+
 		if ( _KeyDown( ALT )	)
 			SwitchMineViewOff();	// added by Flugente
 		else
 			SwitchViewOff();
-#else
-			SwitchViewOff();
-#endif
 		
 		fDeleteDown = FALSE;
 	}
 
 	if( _KeyDown( END ) && !fEndDown)
 	{
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
+
 		if ( _KeyDown( ALT )	)
 			SwitchToTrapNetworkView();	// added by Flugente
 		else
 			SwitchToMercView();
-#else
-		SwitchToMercView();
-#endif
 
 		fEndDown = TRUE;
 	}
 
 	if( !_KeyDown( END ) && fEndDown )
 	{
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
 		if ( _KeyDown( ALT )	)
 			SwitchMineViewOff();	// added by Flugente
 		else
 			SwitchViewOff();
-#else
-		SwitchViewOff();
-#endif
 		
 
 		fEndDown = FALSE;
@@ -2980,14 +2967,12 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				break;
 
 			case 'C':
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
+
 				if ( fAlt )
 					ToggleHostileTrapsView();	// added by Flugente
 				else
 					ToggleEnemyView();
-#else
+
-				ToggleEnemyView();
-#endif
 				break;
 			case 'd':
 				if( gTacticalStatus.uiFlags & TURNBASED && gTacticalStatus.uiFlags & INCOMBAT )
@@ -4379,14 +4364,11 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 				break;
 
 			case 'V':
-#ifdef ENABLE_DISPLAY_EXPLOSIVES
 				if( fAlt )
 					ToggleTrapNetworkView();	// added by Flugente
 				else
 					ToggleMercView();
-#else
+
-					ToggleMercView();
-#endif
 				break;
 
 			case 'w':