Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove non-working terrain outline feature 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2945 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-12-01 20:46:08 +00:00
parent 97006ed5a9
commit 466b3c6248
5 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/display3d.c
View File

@ -179,9 +179,6 @@ static Vector3i imdRot,imdRot2;
/* How far away are we from the terrain */ /* How far away are we from the terrain */
UDWORD distance = START_DISTANCE;//(DISTANCE - (DISTANCE/6)); UDWORD distance = START_DISTANCE;//(DISTANCE - (DISTANCE/6));
/* Are we outlining the terrain tile triangles */
UDWORD terrainOutline = FALSE;
/* Stores the screen coordinates of the transformed terrain tiles */ /* Stores the screen coordinates of the transformed terrain tiles */
TERRAIN_VERTEX tileScreenInfo[LAND_YGRD][LAND_XGRD]; TERRAIN_VERTEX tileScreenInfo[LAND_YGRD][LAND_XGRD];
@ -4015,19 +4012,6 @@ static void drawTerrainTile(UDWORD i, UDWORD j, BOOL onWaterEdge)
pie_DrawTerrainTriangle(i * 2 + j * VISIBLE_XTILES * 2 + 1, vertices); pie_DrawTerrainTriangle(i * 2 + j * VISIBLE_XTILES * 2 + 1, vertices);
} }
/* Outline the tile if necessary */
if(!onWaterEdge && terrainOutline)
{
iV_Line(tileScreenInfo[i+0][j+0].screen.x, tileScreenInfo[i+0][j+0].screen.y,
tileScreenInfo[i+0][j+1].screen.x, tileScreenInfo[i+0][j+1].screen.y, 255);
iV_Line(tileScreenInfo[i+0][j+1].screen.x, tileScreenInfo[i+0][j+1].screen.y,
tileScreenInfo[i+1][j+1].screen.x, tileScreenInfo[i+1][j+1].screen.y, 255);
iV_Line(tileScreenInfo[i+1][j+1].screen.x, tileScreenInfo[i+1][j+1].screen.y,
tileScreenInfo[i+1][j+0].screen.x, tileScreenInfo[i+1][j+0].screen.y, 255);
iV_Line(tileScreenInfo[i+1][j+0].screen.x, tileScreenInfo[i+1][j+0].screen.y,
tileScreenInfo[i+0][j+0].screen.x, tileScreenInfo[i+0][j+0].screen.y, 255);
}
if(!onWaterEdge && bOutlined) if(!onWaterEdge && bOutlined)
{ {
if(outlineColour3D == outlineOK3D) if(outlineColour3D == outlineOK3D)

1
src/display3d.h
View File

@ -87,7 +87,6 @@ extern BOOL init3DView(void);
extern void initViewPosition(void); extern void initViewPosition(void);
extern iView player; extern iView player;
extern UDWORD distance; extern UDWORD distance;
extern UDWORD terrainOutline;
extern UDWORD xOffset,yOffset; extern UDWORD xOffset,yOffset;
extern BOOL selectAttempt; extern BOOL selectAttempt;
extern BOOL draggingTile; extern BOOL draggingTile;

16
src/keybind.c
View File

@ -346,22 +346,6 @@ void kf_ToggleRadar( void )
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
/* Toggles the outline around the map tiles */
void kf_ToggleOutline( void )
{
if(terrainOutline)
{
terrainOutline = FALSE;
}
else
{
terrainOutline = TRUE;
}
addConsoleMessage("Tile outline display toggled",DEFAULT_JUSTIFY);
}
// --------------------------------------------------------------------------
/* Toggles infinite power on/off */ /* Toggles infinite power on/off */
void kf_TogglePower( void ) void kf_TogglePower( void )
{ {

1
src/keybind.h
View File

@ -27,7 +27,6 @@ extern void kf_BuildInfo( void );
extern void kf_FrameRate( void ); extern void kf_FrameRate( void );
extern void kf_ShowNumObjects( void ); extern void kf_ShowNumObjects( void );
extern void kf_ToggleRadar( void ); extern void kf_ToggleRadar( void );
extern void kf_ToggleOutline( void );
extern void kf_TogglePower( void ); extern void kf_TogglePower( void );
extern void kf_RecalcLighting( void ); extern void kf_RecalcLighting( void );
extern void kf_RaiseGamma( void ); extern void kf_RaiseGamma( void );

11
src/keymap.c
View File

@ -242,7 +242,7 @@ _keymapsave keyMapSaveTable[] =
kf_SystemClose, kf_SystemClose,
kf_ToggleShadows, kf_ToggleShadows,
kf_RaiseTile, kf_RaiseTile,
kf_ToggleOutline, kf_NOOP, // unused
kf_TriFlip, kf_TriFlip,
kf_RaiseGamma, kf_RaiseGamma,
kf_LowerGamma, kf_LowerGamma,
@ -483,16 +483,7 @@ void keyInitMappings( BOOL bForceDefaults )
keyAddMapping(KEYMAP__DEBUG,KEY_LALT,KEY_F6,KEYMAP_PRESSED,kf_SelectPlayer, "Select player 5"); keyAddMapping(KEYMAP__DEBUG,KEY_LALT,KEY_F6,KEYMAP_PRESSED,kf_SelectPlayer, "Select player 5");
keyAddMapping(KEYMAP__DEBUG,KEY_LALT,KEY_F7,KEYMAP_PRESSED,kf_SelectPlayer, "Select player 6"); keyAddMapping(KEYMAP__DEBUG,KEY_LALT,KEY_F7,KEYMAP_PRESSED,kf_SelectPlayer, "Select player 6");
keyAddMapping(KEYMAP__DEBUG,KEY_LALT,KEY_F8,KEYMAP_PRESSED,kf_SelectPlayer, "Select player 7"); keyAddMapping(KEYMAP__DEBUG,KEY_LALT,KEY_F8,KEYMAP_PRESSED,kf_SelectPlayer, "Select player 7");
// would be nice, but does not currently work - Per
keyAddMapping(KEYMAP__DEBUG,KEY_LCTRL,KEY_P,KEYMAP_PRESSED,kf_ToggleOutline, "Tile Outline");
*/ */
// ------------------------ OLD STUFF - Store here!
} }
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------