From 439a4b158b47c635100b0006470a7ed1e44e29f3 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 6 Sep 2008 20:06:14 +0000 Subject: Remove includes of doomdef.h where possible, move generic parts into top level. Subversion-branch: /branches/raven-branch Subversion-revision: 1204 --- src/doom/doomdef.h | 110 +---------------------------------------------------- 1 file changed, 2 insertions(+), 108 deletions(-) (limited to 'src/doom/doomdef.h') diff --git a/src/doom/doomdef.h b/src/doom/doomdef.h index 52964242..6db199d4 100644 --- a/src/doom/doomdef.h +++ b/src/doom/doomdef.h @@ -31,38 +31,7 @@ #include #include -// #define macros to provide functions missing in Windows. -// Outside Windows, we use strings.h for str[n]casecmp. - - -#ifdef _WIN32 - -#define snprintf _snprintf -#define vsnprintf _vsnprintf -#define strcasecmp stricmp -#define strncasecmp strnicmp - -#else - -#include - -#endif - - -// -// The packed attribute forces structures to be packed into the minimum -// space necessary. If this is not done, the compiler may align structure -// fields differently to optimise memory access, inflating the overall -// structure size. It is important to use the packed attribute on certain -// structures where alignment is important, particularly data read/written -// to disk. -// - -#ifdef __GNUC__ -#define PACKEDATTR __attribute__((packed)) -#else -#define PACKEDATTR -#endif +#include "i_timer.h" // // Global parameters/defines. @@ -114,27 +83,6 @@ typedef enum // most parameter validation debugging code will not be compiled #define RANGECHECK - - -// Screen width and height. - -#define SCREENWIDTH 320 -#define SCREENHEIGHT 200 - -// Screen width used for "squash" scale functions - -#define SCREENWIDTH_4_3 256 - -// Screen height used for "stretch" scale functions. - -#define SCREENHEIGHT_4_3 240 - -// The maximum number of players, multiplayer/networking. -#define MAXPLAYERS 4 - -// State updates, number of tics / second. -#define TICRATE 35 - // The current state of the game: whether we are // playing, gazing at the intermission screen, // the game final animation, or a demo. @@ -254,59 +202,5 @@ typedef enum } powerduration_t; - -// fraggle: moved key definitions to a separate file - -#include "doomkeys.h" - - -// DOOM basic types (boolean), -// and max/min values. -//#include "doomtype.h" - -// Fixed point. -//#include "m_fixed.h" - -// Endianess handling. -//#include "m_swap.h" - - -// Binary Angles, sine/cosine/atan lookups. -//#include "tables.h" - -// Event type. -//#include "d_event.h" - -// Game function, skills. -//#include "g_game.h" - -// All external data is defined here. -//#include "doomdata.h" - -// All important printed strings. -// Language selection (message strings). -//#include "dstrings.h" - -// Player is a special actor. -//struct player_s; - - -//#include "d_items.h" -//#include "d_player.h" -//#include "p_mobj.h" -//#include "d_net.h" - -// PLAY -//#include "p_tick.h" - - - - -// Header, generated by sound utility. -// The utility was written by Dave Taylor. -//#include "sounds.h" - - - - #endif // __DOOMDEF__ + -- cgit v1.2.3