From 1670801dba930b9fa9d6a2b4a953091970dc180a Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 8 Oct 2008 19:34:09 +0000
Subject: Replace hexen "shareware" variable with gamemode/gamemission. Use
 d_iwad.c code to find the IWAD file. Remove AddWADFile and use the w_wad.c
 API directly.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1343
---
 src/hexen/h2def.h | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/hexen/h2def.h')

diff --git a/src/hexen/h2def.h b/src/hexen/h2def.h
index 61ca87b9..a00d90bd 100644
--- a/src/hexen/h2def.h
+++ b/src/hexen/h2def.h
@@ -44,6 +44,10 @@
 
 #include "d_event.h"
 
+// gamemode/mission
+
+#include "d_mode.h"
+
 // for fixed_t:
 
 #include "m_fixed.h"
@@ -104,15 +108,6 @@
 
 typedef unsigned int uint;
 
-typedef enum
-{
-    sk_baby,
-    sk_easy,
-    sk_medium,
-    sk_hard,
-    sk_nightmare
-} skill_t;
-
 #define	BT_ATTACK		1
 #define	BT_USE			2
 #define	BT_CHANGE		4       // if true, the next 3 bits hold weapon num
@@ -654,12 +649,13 @@ void NET_SendFrags(player_t * player);
 
 #define TELEFOGHEIGHT (32*FRACUNIT)
 
+extern GameMode_t gamemode;         // Always commercial
+extern GameMission_t gamemission;   // Always hexen
+
 extern gameaction_t gameaction;
 
 extern boolean paused;
 
-extern boolean shareware;       // true if other episodes not present
-
 extern boolean DevMaps;         // true = map development mode
 extern char *DevMapsDir;        // development maps directory
 
-- 
cgit v1.2.3