From 7a157912616e6d3fdde89f0ae154c62ddb6d839b Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 8 Aug 2007 18:04:35 +0000
Subject: Move SCREENHEIGHT_4_3 to doomdef.h; remove some unused constants.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 950
---
 src/doomdef.h  | 27 +++++----------------------
 src/i_video.c  |  4 ----
 src/st_stuff.h |  2 +-
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/src/doomdef.h b/src/doomdef.h
index 46fad73c..37c6810c 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -81,32 +81,15 @@ typedef enum
 #define RANGECHECK
 
 
-// This one switches between MIT SHM (no proper mouse)
-// and XFree86 DGA (mickey sampling). The original
-// linuxdoom used SHM, which is default.
-//#define X11_DGA		1
 
+// Screen width and height.
 
-//
-// For resize of screen, at start of game.
-// It will not work dynamically, see visplanes.
-//
-#define	BASE_WIDTH		320
-
-// It is educational but futile to change this
-//  scaling e.g. to 2. Drawing of status bar,
-//  menues etc. is tied to the scale implied
-//  by the graphics.
-#define	SCREEN_MUL		1
-#define	INV_ASPECT_RATIO	0.625 // 0.75, ideally
-
-// Defines suck. C sucks.
-// C++ might sucks for OOP, but it sure is a better C.
-// So there.
 #define SCREENWIDTH  320
-//SCREEN_MUL*BASE_WIDTH //320
 #define SCREENHEIGHT 200
-//(int)(SCREEN_MUL*BASE_WIDTH*INV_ASPECT_RATIO) //200
+
+// Alternate screenheight for letterbox/aspect ratio corrected mode
+
+#define SCREENHEIGHT_4_3 240
 
 
 
diff --git a/src/i_video.c b/src/i_video.c
index 42361f7b..fe5aca8d 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -49,10 +49,6 @@
 #include "w_wad.h"
 #include "z_zone.h"
 
-// Alternate screenheight for letterbox mode
-
-#define SCREENHEIGHT_4_3 240
-
 enum
 {
     FULLSCREEN_OFF,
diff --git a/src/st_stuff.h b/src/st_stuff.h
index 51398e62..c6b56fd6 100644
--- a/src/st_stuff.h
+++ b/src/st_stuff.h
@@ -35,7 +35,7 @@
 
 // Size of statusbar.
 // Now sensitive for scaling.
-#define ST_HEIGHT	32*SCREEN_MUL
+#define ST_HEIGHT	32
 #define ST_WIDTH	SCREENWIDTH
 #define ST_Y		(SCREENHEIGHT - ST_HEIGHT)
 
-- 
cgit v1.2.3