From 7241db5446fc08ec7f96a7cdf1022ca9ec219a57 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Tue, 15 Oct 2013 01:36:49 +0000
Subject: Remove gamemission variables for Heretic and Hexen and hard-code to
 the appropriate values.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2708
---
 src/hexen/d_net.c   | 2 +-
 src/hexen/h2_main.c | 2 +-
 src/hexen/h2def.h   | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/hexen')

diff --git a/src/hexen/d_net.c b/src/hexen/d_net.c
index 2483cd5e..f3b7766e 100644
--- a/src/hexen/d_net.c
+++ b/src/hexen/d_net.c
@@ -174,7 +174,7 @@ static void InitConnectData(net_connect_data_t *connect_data)
     // Game type fields:
 
     connect_data->gamemode = gamemode;
-    connect_data->gamemission = gamemission;
+    connect_data->gamemission = hexen;
 
     connect_data->lowres_turn = false;
     connect_data->drone = false;
diff --git a/src/hexen/h2_main.c b/src/hexen/h2_main.c
index f1a22cd7..0ac6c0d4 100644
--- a/src/hexen/h2_main.c
+++ b/src/hexen/h2_main.c
@@ -101,7 +101,6 @@ extern boolean askforquit;
 // PUBLIC DATA DEFINITIONS -------------------------------------------------
 
 GameMode_t gamemode;
-GameMission_t gamemission;
 char *iwadfile;
 boolean nomonsters;             // checkparm of -nomonsters
 boolean respawnparm;            // checkparm of -respawn
@@ -235,6 +234,7 @@ void InitMapMusicInfo(void);
 
 void D_DoomMain(void)
 {
+    GameMission_t gamemission;
     int p;
 
     I_AtExit(D_HexenQuitMessage, false);
diff --git a/src/hexen/h2def.h b/src/hexen/h2def.h
index 95f3e554..db9ae1b8 100644
--- a/src/hexen/h2def.h
+++ b/src/hexen/h2def.h
@@ -593,7 +593,6 @@ 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;
 
-- 
cgit v1.2.3