Remove definitions from heretic/doomdef.h and use common headers. Merge

heretic ticcmd_t to common type.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1261

1 files changed, 3 insertions, 59 deletions

diff --git a/src/heretic/doomdef.h b/src/heretic/doomdef.h
index 4a4e5299..d9f7f35c 100644
--- a/src/heretic/doomdef.h
+++ b/src/heretic/doomdef.h
@@ -65,6 +65,9 @@
 // gamemode/mission
 #include "d_mode.h"
 
+// ticcmd_t
+#include "d_ticcmd.h"
+
 extern byte *destview, *destscreen;     // PC direct to screen pointers
 
 #define	SAVEGAMENAME "hticsav"
@@ -83,18 +86,6 @@ extern byte *destview, *destscreen;     // PC direct to screen pointers
 #define TICRATE		35      // number of tics / second
 #define TICSPERSEC	35
 
-typedef struct
-{
-    char forwardmove;           // *2048 for move
-    char sidemove;              // *2048 for move
-    short angleturn;            // <<16 for angle delta
-    short consistancy;          // checks for net game
-    byte chatchar;
-    byte buttons;
-    byte lookfly;               // look/fly up/down/centering
-    byte arti;                  // artitype_t to use
-} ticcmd_t;
-
 #define	BT_ATTACK		1
 #define	BT_USE			2
 #define	BT_CHANGE		4       // if true, the next 3 bits hold weapon num
@@ -693,34 +684,11 @@ void TryRunTics(void);
 //---------
 //SYSTEM IO
 //---------
-#if 1
-#define	SCREENWIDTH		320
-#define	SCREENHEIGHT	200
-#else
-#define	SCREENWIDTH		560
-#define	SCREENHEIGHT	375
-#endif
 
 byte *I_ZoneBase(int *size);
 // called by startup code to get the ammount of memory to malloc
 // for the zone management
 
-int I_GetTime(void);
-// called by D_DoomLoop
-// returns current time in tics
-
-void I_StartFrame(void);
-// called by D_DoomLoop
-// called before processing any tics in a frame (just after displaying a frame)
-// time consuming syncronous operations are performed here (joystick reading)
-// can call D_PostEvent
-
-void I_StartTic(void);
-// called by D_DoomLoop
-// called before processing each tic in a frame
-// quick syncronous operations are performed here
-// can call D_PostEvent
-
 // asyncronous interrupt functions should maintain private ques that are
 // read by the syncronous functions to be converted into events
 
@@ -728,39 +696,15 @@ void I_Init(void);
 // called by D_DoomMain
 // determines the hardware configuration and sets up the video mode
 
-void I_InitGraphics(void);
-
 void I_InitNetwork(void);
 void I_NetCmd(void);
 
-void I_Error(char *error, ...);
-// called by anything that can generate a terminal error
-// bad exit with diagnostic message
-
-void I_Quit(void);
-// called by M_Responder when quit is selected
-// clean exit, displays sell blurb
-
-void I_SetPalette(byte * palette);
-// takes full 8 bit values
-
 void I_Update(void);
 // Copy buffer to video
 
-void I_WipeUpdate(wipe_t wipe);
-// Copy buffer to video with wipe effect
-
-void I_WaitVBL(int count);
-// wait for vertical retrace or pause a bit
-
-void I_BeginRead(void);
-void I_EndRead(void);
-
 byte *I_AllocLow(int length);
 // allocates from low memory under dos, just mallocs under unix
 
-void I_Tactile(int on, int off, int total);
-
 #ifdef __WATCOMC__
 extern boolean useexterndriver;