1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +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
-2
View File
@@ -751,8 +751,6 @@ 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
+71 -78
View File
@@ -49,10 +49,9 @@ enum COVER_VALUES
MAX_COVER=3 MAX_COVER=3
}; };
#ifdef ENABLE_DISPLAY_EXPLOSIVES // Flugente: mines display - stuff needs to be here
// Flugente: mines display - stuff needs to be here enum MINES_VALUES
enum MINES_VALUES {
{
MINES_ALL = MAX_COVER + 1, MINES_ALL = MAX_COVER + 1,
MINE_BOMB, MINE_BOMB,
MINE_WIRE, MINE_WIRE,
@@ -66,8 +65,8 @@ enum COVER_VALUES
MINES_LVL_3, MINES_LVL_3,
MINES_LVL_4, MINES_LVL_4,
MAX_MINES MAX_MINES
}; };
#endif
struct CoverCell struct CoverCell
{ {
@@ -75,13 +74,10 @@ struct CoverCell
INT8 bCover; INT8 bCover;
BOOLEAN fInverseColor; BOOLEAN fInverseColor;
#ifdef ENABLE_DISPLAY_EXPLOSIVES
INT8 bMines; INT8 bMines;
CoverCell() : sGridNo(NOWHERE), bCover(INVALID_COVER), fInverseColor(FALSE), bMines(MINES_ALL) {} 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 { enum COVER_DRAW_MODE {
@@ -101,9 +97,9 @@ const UINT8 animArr[3] = {
#define COVER_Y_CELLS WORLD_ROWS_MAX #define COVER_Y_CELLS WORLD_ROWS_MAX
#define COVER_Z_CELLS 2 // roof or no roof #define COVER_Z_CELLS 2 // roof or no roof
#ifdef ENABLE_DISPLAY_EXPLOSIVES
// Flugente: mines display - stuff needs to be here // Flugente: mines display - stuff needs to be here
enum MINES_DRAW_MODE { enum MINES_DRAW_MODE {
MINES_DRAW_OFF, MINES_DRAW_OFF,
MINES_DRAW_DETECT_ENEMY, MINES_DRAW_DETECT_ENEMY,
MINES_DRAW_PLAYERTEAM_NETWORKS, MINES_DRAW_PLAYERTEAM_NETWORKS,
@@ -113,8 +109,8 @@ const UINT8 animArr[3] = {
MINES_DRAW_NET_C, MINES_DRAW_NET_C,
MINES_DRAW_NET_D, MINES_DRAW_NET_D,
MINES_DRAW_MAX MINES_DRAW_MAX
}; };
#endif
//****** Local Variables ********************************************* //****** Local Variables *********************************************
@@ -126,9 +122,8 @@ DWORD guiCoverNextUpdateTime = 0;
COVER_DRAW_MODE gubDrawMode = COVER_DRAW_OFF; COVER_DRAW_MODE gubDrawMode = COVER_DRAW_OFF;
#ifdef ENABLE_DISPLAY_EXPLOSIVES MINES_DRAW_MODE gubDrawModeMine = MINES_DRAW_OFF; // Flugente: mines display
MINES_DRAW_MODE gubDrawModeMine = MINES_DRAW_OFF; // Flugente: mines display
#endif
//******* Local Function Prototypes *********************************** //******* Local Function Prototypes ***********************************
@@ -142,9 +137,8 @@ void RemoveCoverObjectFromWorld( const INT32 sGridNo, const UINT16& usGraphic, c
void AddCoverObjectsToViewArea(); void AddCoverObjectsToViewArea();
void RemoveCoverObjectsFromViewArea(); void RemoveCoverObjectsFromViewArea();
#ifdef ENABLE_DISPLAY_EXPLOSIVES void RemoveMinesObjectsFromViewArea(); // added by Flugente, has to be declared here
void RemoveMinesObjectsFromViewArea(); // added by Flugente, has to be declared here
#endif
void CalculateCover(); void CalculateCover();
void CalculateCoverForSoldier( SOLDIERTYPE* pForSoldier, const INT32& sTargetGridNo, const BOOLEAN& fRoof, INT8& bCover ); void CalculateCoverForSoldier( SOLDIERTYPE* pForSoldier, const INT32& sTargetGridNo, const BOOLEAN& fRoof, INT8& bCover );
@@ -460,11 +454,10 @@ void CalculateCover()
return; return;
} }
#ifdef ENABLE_DISPLAY_EXPLOSIVES
// at we're here, we want to display cover, so remove the mines display // at we're here, we want to display cover, so remove the mines display
if ( gubDrawModeMine != MINES_DRAW_OFF ) if ( gubDrawModeMine != MINES_DRAW_OFF )
RemoveMinesObjectsFromViewArea(); RemoveMinesObjectsFromViewArea();
#endif
GetSoldier( &pSoldier, gusSelectedSoldier ); GetSoldier( &pSoldier, gusSelectedSoldier );
@@ -689,81 +682,81 @@ BOOLEAN IsTheRoofVisible( const INT32& sGridNo )
return( FALSE ); return( FALSE );
} }
#ifdef ENABLE_DISPLAY_EXPLOSIVES
// ----------------------------- Mines display after this ----------------------------------------
// added by Flugente
//****** Local Variables ********************************************* // ----------------------------- Mines display after this ----------------------------------------
// added by Flugente
INT16 gsMineMinCellX, gsMineMinCellY, gsMineMaxCellX, gsMineMaxCellY = -1; //****** Local Variables *********************************************
DWORD guiMinesNextUpdateTime = 0; INT16 gsMineMinCellX, gsMineMinCellY, gsMineMaxCellX, gsMineMaxCellY = -1;
//******* Local Function Prototypes *********************************** DWORD guiMinesNextUpdateTime = 0;
TileDefines GetTileMinesIndex( const INT8& bMines ); //******* Local Function Prototypes ***********************************
void AddMinesObjectsToViewArea(); TileDefines GetTileMinesIndex( const INT8& bMines );
void CalculateMines(); void AddMinesObjectsToViewArea();
void DetermineMineDisplayInTile( INT32 sGridNo, INT8 bLevel, INT8& bMines, BOOLEAN fWithMineDetector = FALSE );
BOOLEAN MineTileHasAdjTile( const INT32& ubX, const INT32& ubY, const INT32& ubZ ); void CalculateMines();
void DetermineMineDisplayInTile( INT32 sGridNo, INT8 bLevel, INT8& bMines, BOOLEAN fWithMineDetector = FALSE );
//******* Functions ************************************************** BOOLEAN MineTileHasAdjTile( const INT32& ubX, const INT32& ubY, const INT32& ubZ );
///BEGIN key binding functions //******* Functions **************************************************
void SwitchToTrapNetworkView()
{ ///BEGIN key binding functions
void SwitchToTrapNetworkView()
{
if (gubDrawModeMine == MINES_DRAW_PLAYERTEAM_NETWORKS) if (gubDrawModeMine == MINES_DRAW_PLAYERTEAM_NETWORKS)
return; return;
gubDrawModeMine = MINES_DRAW_PLAYERTEAM_NETWORKS; gubDrawModeMine = MINES_DRAW_PLAYERTEAM_NETWORKS;
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Display trap network"); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Display trap network");
DisplayMines(TRUE); DisplayMines(TRUE);
} }
void SwitchToHostileTrapsView() void SwitchToHostileTrapsView()
{ {
if (gubDrawModeMine == MINES_DRAW_DETECT_ENEMY) if (gubDrawModeMine == MINES_DRAW_DETECT_ENEMY)
return; return;
gubDrawModeMine = MINES_DRAW_DETECT_ENEMY; gubDrawModeMine = MINES_DRAW_DETECT_ENEMY;
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Display nearby traps"); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Display nearby traps");
DisplayMines(TRUE); DisplayMines(TRUE);
} }
void SwitchMineViewOff() void SwitchMineViewOff()
{ {
if (gubDrawModeMine == MINES_DRAW_OFF) if (gubDrawModeMine == MINES_DRAW_OFF)
return; return;
gubDrawModeMine = MINES_DRAW_OFF; gubDrawModeMine = MINES_DRAW_OFF;
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Turning off trap display"); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Turning off trap display");
DisplayMines(TRUE); DisplayMines(TRUE);
} }
void ToggleHostileTrapsView() void ToggleHostileTrapsView()
{ {
if (gubDrawModeMine == MINES_DRAW_DETECT_ENEMY) { if (gubDrawModeMine == MINES_DRAW_DETECT_ENEMY) {
SwitchMineViewOff(); SwitchMineViewOff();
} else { } else {
SwitchToHostileTrapsView(); SwitchToHostileTrapsView();
} }
} }
void ToggleTrapNetworkView() void ToggleTrapNetworkView()
{ {
SwitchMinesDrawModeForNetworks(); SwitchMinesDrawModeForNetworks();
/*if (gubDrawModeMine == MINES_DRAW_PLAYERTEAM_NETWORKS) { /*if (gubDrawModeMine == MINES_DRAW_PLAYERTEAM_NETWORKS) {
SwitchMineViewOff(); SwitchMineViewOff();
} else { } else {
SwitchToTrapNetworkView(); SwitchToTrapNetworkView();
}*/ }*/
} }
void SwitchMinesDrawModeForNetworks() void SwitchMinesDrawModeForNetworks()
{ {
switch ( gubDrawModeMine ) switch ( gubDrawModeMine )
{ {
case MINES_DRAW_OFF: case MINES_DRAW_OFF:
@@ -819,11 +812,11 @@ BOOLEAN IsTheRoofVisible( const INT32& sGridNo )
SwitchMineViewOff(); SwitchMineViewOff();
break; break;
}*/ }*/
} }
///END key binding functions ///END key binding functions
TileDefines GetTileMinesIndex( const INT8& bMines ) TileDefines GetTileMinesIndex( const INT8& bMines )
{ {
switch(bMines) switch(bMines)
{ {
case MINES_ALL: case MINES_ALL:
@@ -846,10 +839,10 @@ BOOLEAN IsTheRoofVisible( const INT32& sGridNo )
default: default:
return SPECIALTILE_COVER_5; // light green, can be used to denote that you just don't know. looks just like normal green, though... return SPECIALTILE_COVER_5; // light green, can be used to denote that you just don't know. looks just like normal green, though...
} }
} }
BOOLEAN MineTileHasAdjTile( const INT32& ubX, const INT32& ubY, const INT32& ubZ ) BOOLEAN MineTileHasAdjTile( const INT32& ubX, const INT32& ubY, const INT32& ubZ )
{ {
// no search for adjacent tiles wehn looking at a specific network (we have only 4 colours, need them all :-) // no search for adjacent tiles wehn looking at a specific network (we have only 4 colours, need them all :-)
if ( gubDrawModeMine == MINES_DRAW_NETWORKCOLOURING || gubDrawModeMine == MINES_DRAW_NET_A || gubDrawModeMine == MINES_DRAW_NET_B || gubDrawModeMine == MINES_DRAW_NET_C || gubDrawModeMine == MINES_DRAW_NET_D ) if ( gubDrawModeMine == MINES_DRAW_NETWORKCOLOURING || gubDrawModeMine == MINES_DRAW_NET_A || gubDrawModeMine == MINES_DRAW_NET_B || gubDrawModeMine == MINES_DRAW_NET_C || gubDrawModeMine == MINES_DRAW_NET_D )
return FALSE; return FALSE;
@@ -880,10 +873,10 @@ BOOLEAN IsTheRoofVisible( const INT32& sGridNo )
} }
return FALSE; return FALSE;
} }
void AddMinesObjectsToViewArea() void AddMinesObjectsToViewArea()
{ {
if (gsMineMaxCellY == -1) if (gsMineMaxCellY == -1)
{ {
return; return;
@@ -915,10 +908,10 @@ BOOLEAN IsTheRoofVisible( const INT32& sGridNo )
{ {
SetRenderFlags( RENDER_FLAG_FULL ); SetRenderFlags( RENDER_FLAG_FULL );
} }
} }
void RemoveMinesObjectsFromViewArea() void RemoveMinesObjectsFromViewArea()
{ {
if (gsMineMaxCellY == -1) if (gsMineMaxCellY == -1)
{ {
return; return;
@@ -951,10 +944,10 @@ BOOLEAN IsTheRoofVisible( const INT32& sGridNo )
{ {
SetRenderFlags( RENDER_FLAG_FULL ); SetRenderFlags( RENDER_FLAG_FULL );
} }
} }
void DisplayMines( const BOOLEAN& forceUpdate ) void DisplayMines( const BOOLEAN& forceUpdate )
{ {
if ( gGameExternalOptions.ubCoverDisplayUpdateWait == -1 ) if ( gGameExternalOptions.ubCoverDisplayUpdateWait == -1 )
{ {
return; return;
@@ -965,10 +958,10 @@ BOOLEAN IsTheRoofVisible( const INT32& sGridNo )
CalculateMines(); CalculateMines();
guiMinesNextUpdateTime = GetTickCount() + gGameExternalOptions.ubCoverDisplayUpdateWait; guiMinesNextUpdateTime = GetTickCount() + gGameExternalOptions.ubCoverDisplayUpdateWait;
} }
} }
void CalculateMines() void CalculateMines()
{ {
INT32 ubX, ubY, ubZ; INT32 ubX, ubY, ubZ;
SOLDIERTYPE* pSoldier; SOLDIERTYPE* pSoldier;
@@ -1062,11 +1055,11 @@ BOOLEAN IsTheRoofVisible( const INT32& sGridNo )
} }
AddMinesObjectsToViewArea(); AddMinesObjectsToViewArea();
} }
void DetermineMineDisplayInTile( INT32 sGridNo, INT8 bLevel, INT8& bMines, BOOLEAN fWithMineDetector ) void DetermineMineDisplayInTile( INT32 sGridNo, INT8 bLevel, INT8& bMines, BOOLEAN fWithMineDetector )
{ {
// if there is a bomb at that grid and level, and it isn't disabled // if there is a bomb at that grid and level, and it isn't disabled
for (UINT32 uiWorldBombIndex = 0; uiWorldBombIndex < guiNumWorldBombs; ++uiWorldBombIndex) for (UINT32 uiWorldBombIndex = 0; uiWorldBombIndex < guiNumWorldBombs; ++uiWorldBombIndex)
{ {
@@ -1255,5 +1248,5 @@ BOOLEAN IsTheRoofVisible( const INT32& sGridNo )
} }
} }
} }
} }
#endif
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':