Continued the job of sorting out the game's header files. Part 4/5

skyjake · Mar 6, 2008 · 0529861 · 0529861
1 parent 06964ba
commit 0529861
Show file tree

Hide file tree

Showing 13 changed files with 408 additions and 497 deletions.
diff --git a/doomsday/plugins/doom64tc/include/doomstat.h b/doomsday/plugins/doom64tc/include/doomstat.h
diff --git a/doomsday/plugins/doom64tc/include/doomtype.h b/doomsday/plugins/doom64tc/include/doomtype.h
@@ -4,6 +4,7 @@
  * Online License Link: http://www.gnu.org/licenses/gpl.html
  *
  *\author Copyright © 2003-2007 Jaakko Keränen <jaakko.keranen@iki.fi>
+ *\author Copyright © 2007-2008 Daniel Swanson <danij@dengine.net>
  *\author Copyright © 1993-1996 by id Software, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,20 +19,20 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
 
-/*
- * Simple basic typedefs, isolated here to make it easier
+/**
+ * doomtype_.h: Simple basic typedefs, isolated here to make it easier
  * separating modules.
  */
 
-#ifndef __DOOMTYPE__
-#define __DOOMTYPE__
+#ifndef __DOOMTYPE_H__
+#define __DOOMTYPE_H__
 
-#ifndef __JDOOM__
-#  error "Using jDoom headers without __JDOOM__"
+#ifndef __DOOM64TC__
+#  error "Using Doom64TC headers without __DOOM64TC__"
 #endif
 
 // Predefined with some OS.

diff --git a/doomsday/plugins/doom64tc/include/dstrings.h b/doomsday/plugins/doom64tc/include/dstrings.h
@@ -4,6 +4,7 @@
  * Online License Link: http://www.gnu.org/licenses/gpl.html
  *
  *\author Copyright © 2003-2006 Jaakko Keränen <skyjake@dengine.net>
+ *\author Copyright © 2006-2008 Daniel Swanson <danij@dengine.net>
  *\author Copyright © 1993-1996 by id Software, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,23 +23,29 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef __DSTRINGS__
-#define __DSTRINGS__
+/**
+ * dstrings.h:
+ */
+
+#ifndef __DSTRINGS_H__
+#define __DSTRINGS_H__
+
+#ifndef __DOOM64TC__
+#  error "Using Doom64TC headers without __DOOM64TC__"
+#endif
 
 // All important printed strings.
 #include "d_englsh.h"
 
-//
-// File locations,
-//  relative to current position.
-// Path names are OS-sensitive.
-//
-#define DEVMAPS "devmaps"
-#define DEVDATA "devdata"
+/**
+ * File locations, relative to the base directory.
+ */
+#define DEVMAPS             "devmaps"
+#define DEVDATA             "devdata"
 
-// QuitDOOM messages
-#define NUM_QUITMESSAGES   22
+// QuitDOOM messages:
+#define NUM_QUITMESSAGES    22
 
-extern char   *endmsg[NUM_QUITMESSAGES + 1];
+extern char *endmsg[NUM_QUITMESSAGES + 1];
 
 #endif
diff --git a/doomsday/plugins/doom64tc/include/g_game.h b/doomsday/plugins/doom64tc/include/g_game.h
@@ -4,7 +4,7 @@
  * Online License Link: http://www.gnu.org/licenses/gpl.html
  *
  *\author Copyright © 2003-2007 Jaakko Keränen <jaakko.keranen@iki.fi>
- *\author Copyright © 2005-2007 Daniel Swanson <danij@dengine.net>
+ *\author Copyright © 2005-2008 Daniel Swanson <danij@dengine.net>
  *\author Copyright © 1993-1996 by id Software, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,24 +24,43 @@
  */
 
 /**
- * g_game.h:
+ * g_game.h: Top-level (common) game routines Doom64TC - specific.
  */
 
-#ifndef __G_GAME__
-#define __G_GAME__
+#ifndef __G_GAME_H__
+#define __G_GAME_H__
 
-#ifndef __JDOOM__
-#  error "Using jDoom headers without __JDOOM__"
+#ifndef __DOOM64TC__
+#  error "Using Doom64TC headers without __DOOM64TC__"
 #endif
 
 #include "doomdef.h"
-#include "d_event.h"
 #include "d_player.h"
+#include "wi_stuff.h"
+
+extern player_t players[MAXPLAYERS];
+extern boolean secretExit;
+extern int nextMap;
+extern skillmode_t gameSkill;
+extern int gameEpisode;
+extern int gameMap;
+extern int nextMap; // If non zero this will be the next map.
+extern int prevMap;
+extern int totalKills, totalItems, totalSecret;
+extern boolean respawnMonsters;
+extern wbstartstruct_t wmInfo;
+extern boolean userGame;
+extern int levelStartTic;
+extern int bodyQueueSlot;
+extern boolean deathmatch;
+extern boolean viewActive;
+extern boolean paused;
+extern boolean precache;
+extern int gsvMapMusic;
 
-//
-// GAME
-//
 void            G_Register(void);
+void            G_CommonPreInit(void);
+void            G_CommonPostInit(void);
 
 void            G_DeathMatchSpawnPlayer(int playernum);
 
@@ -66,18 +85,14 @@ void            G_DoLoadGame(void);
 // Called by Hu_MenuResponder.
 void            G_SaveGame(int slot, char *description);
 
-// Only called by startup code.
-void            G_RecordDemo(char *name);
-
-void            G_BeginRecording(void);
-
-void            G_PlayDemo(char *name);
-void            G_TimeDemo(char *name);
 void            G_StopDemo(void);
 void            G_DemoEnds(void);
 void            G_DemoAborted(void);
 
+// Confusing no?
 void            G_DoReborn(int playernum);
+void            G_PlayerReborn(int player);
+
 void            G_LeaveLevel(int map, int position, boolean secret);
 
 void            G_WorldDone(void);