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

- Removed the "ENABLE_DISPLAY_EXPLOSIVES" define

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-08-24 07:59:13 +00:00
parent 9fc9f09472
commit 061ea16cea
6 changed files with 527 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainMenuScreen.cpp
+1 -3
View File
@@ -750,9 +750,7 @@ BOOLEAN CreateDestroyMainMenuButtons( BOOLEAN fCreate )
void RenderMainMenu() void RenderMainMenu()
{ {
HVSURFACE hVSurface; HVSURFACE hVSurface;
HVSURFACE hVSaveSurface;
//HVOBJECT hPixHandle;
UINT32 iCounter2; UINT32 iCounter2;
//Get and display the background image //Get and display the background image
Tactical/DisplayCover.cpp
+508 -515
View File
File diff suppressed because it is too large Load Diff
Tactical/DisplayCover.h
+11 -11
View File
@@ -36,19 +36,19 @@ void ChangeSizeOfLOS( INT32 iNewSize );
INT8 CalcCoverForGridNoBasedOnTeamKnownEnemies( SOLDIERTYPE *pSoldier, INT16 sTargetGridNo, INT8 bStance ); INT8 CalcCoverForGridNoBasedOnTeamKnownEnemies( SOLDIERTYPE *pSoldier, INT16 sTargetGridNo, INT8 bStance );
//ddd for optimize oppponent turn //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);
void SwitchToTrapNetworkView(); // ----------------------------- Mines display after this ----------------------------------------
void SwitchToHostileTrapsView(); // added by Flugente: display of mine, bombs and tripwire
void SwitchMineViewOff(); void DisplayMines(const BOOLEAN& forceUpdate = FALSE);
void ToggleTrapNetworkView(); void SwitchToTrapNetworkView();
void ToggleHostileTrapsView(); void SwitchToHostileTrapsView();
void SwitchMineViewOff();
void ToggleTrapNetworkView();
void ToggleHostileTrapsView();
void SwitchMinesDrawModeForNetworks();
void SwitchMinesDrawModeForNetworks();
#endif
#endif #endif
Tactical/Handle UI.cpp
-2
View File
@@ -656,9 +656,7 @@ UINT32 HandleTacticalUI( void )
DisplayCover(); DisplayCover();
#ifdef ENABLE_DISPLAY_EXPLOSIVES
DisplayMines(); // added by Flugente DisplayMines(); // added by Flugente
#endif
if ( HandleItemPickupMenu( ) ) if ( HandleItemPickupMenu( ) )
{ {
Tactical/LOS.cpp
+1 -1
View File
@@ -4137,7 +4137,7 @@ INT8 FireBulletGivenTargetNCTH( SOLDIERTYPE * pFirer, FLOAT dEndX, FLOAT dEndY,
UINT8 ubLoop=0; UINT8 ubLoop=0;
UINT8 ubShots=0; UINT8 ubShots=0;
UINT8 ubImpact=0; UINT8 ubImpact=0;
INT8 bCTGT; INT8 bCTGT = 0;
UINT8 ubSpreadIndex = 0; UINT8 ubSpreadIndex = 0;
UINT16 usBulletFlags = 0; UINT16 usBulletFlags = 0;
int n=0; int n=0;
Tactical/Turn Based Input.cpp
+6 -24
View File
@@ -1405,56 +1405,43 @@ void GetPolledKeyboardInput( UINT32 *puiNewEvent )
if( _KeyDown( DEL ) && !fDeleteDown) if( _KeyDown( DEL ) && !fDeleteDown)
{ {
#ifdef ENABLE_DISPLAY_EXPLOSIVES
if ( _KeyDown( ALT ) ) if ( _KeyDown( ALT ) )
SwitchToHostileTrapsView(); // added by Flugente SwitchToHostileTrapsView(); // added by Flugente
else else
SwitchToEnemyView(); SwitchToEnemyView();
#else
SwitchToEnemyView();
#endif
fDeleteDown = TRUE; fDeleteDown = TRUE;
} }
if( !_KeyDown( DEL ) && fDeleteDown ) if( !_KeyDown( DEL ) && fDeleteDown )
{ {
#ifdef ENABLE_DISPLAY_EXPLOSIVES
if ( _KeyDown( ALT ) ) if ( _KeyDown( ALT ) )
SwitchMineViewOff(); // added by Flugente SwitchMineViewOff(); // added by Flugente
else else
SwitchViewOff(); SwitchViewOff();
#else
SwitchViewOff();
#endif
fDeleteDown = FALSE; fDeleteDown = FALSE;
} }
if( _KeyDown( END ) && !fEndDown) if( _KeyDown( END ) && !fEndDown)
{ {
#ifdef ENABLE_DISPLAY_EXPLOSIVES
if ( _KeyDown( ALT ) ) if ( _KeyDown( ALT ) )
SwitchToTrapNetworkView(); // added by Flugente SwitchToTrapNetworkView(); // added by Flugente
else else
SwitchToMercView(); SwitchToMercView();
#else
SwitchToMercView();
#endif
fEndDown = TRUE; fEndDown = TRUE;
} }
if( !_KeyDown( END ) && fEndDown ) if( !_KeyDown( END ) && fEndDown )
{ {
#ifdef ENABLE_DISPLAY_EXPLOSIVES
if ( _KeyDown( ALT ) ) if ( _KeyDown( ALT ) )
SwitchMineViewOff(); // added by Flugente SwitchMineViewOff(); // added by Flugente
else else
SwitchViewOff(); SwitchViewOff();
#else
SwitchViewOff();
#endif
fEndDown = FALSE; fEndDown = FALSE;
@@ -2980,14 +2967,12 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
break; break;
case 'C': case 'C':
#ifdef ENABLE_DISPLAY_EXPLOSIVES
if ( fAlt ) if ( fAlt )
ToggleHostileTrapsView(); // added by Flugente ToggleHostileTrapsView(); // added by Flugente
else else
ToggleEnemyView(); ToggleEnemyView();
#else
ToggleEnemyView();
#endif
break; break;
case 'd': case 'd':
if( gTacticalStatus.uiFlags & TURNBASED && gTacticalStatus.uiFlags & INCOMBAT ) if( gTacticalStatus.uiFlags & TURNBASED && gTacticalStatus.uiFlags & INCOMBAT )
@@ -4379,14 +4364,11 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
break; break;
case 'V': case 'V':
#ifdef ENABLE_DISPLAY_EXPLOSIVES
if( fAlt ) if( fAlt )
ToggleTrapNetworkView(); // added by Flugente ToggleTrapNetworkView(); // added by Flugente
else else
ToggleMercView(); ToggleMercView();
#else
ToggleMercView();
#endif
break; break;
case 'w': case 'w':