shithub: choc

Info  •  Files  •  Log  •  Branches

Move SCREENHEIGHT_4_3 to doomdef.h; remove some unused constants.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 950

--- a/src/doomdef.h

+++ b/src/doomdef.h

@@ -81,32 +81,15 @@

 #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

--- 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,

--- 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)