From 500defab25a683f4da289d2dc3d79a98be3f3134 Mon Sep 17 00:00:00 2001
From: theoddone33 <theoddone33@c79c8604-0f32-0410-912e-ea7021435596>
Date: Thu, 10 Jan 2002 05:47:35 +0000
Subject: [PATCH] Round 5: Warn those using 1.0 wadfiles to quit it.

git-svn-id: svn://svn.icculus.org/hhexen/trunk@10 c79c8604-0f32-0410-912e-ea7021435596
---
 base/g_game.c   |  2 --
 base/h2_main.c  |  5 +++++
 base/w_wad.c    | 12 ++++++++++++
 include/h2def.h |  1 +
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/base/g_game.c b/base/g_game.c
index 8bd2d2b..438930a 100644
--- a/base/g_game.c
+++ b/base/g_game.c
@@ -536,9 +536,7 @@ void G_BuildTiccmd (ticcmd_t *cmd)
         float adj = ((mousey*0x4)<<16) / (float) ANGLE_180*180*110.0/85.0;
         float newlookdir = 0; /* jim initialiser added to prevent warning */
 
-#ifndef RENDER3D
 	adj *= 2;	//Speed up the X11 mlook a little.
-#endif
 
 	if(mouselook == 1)
         	newlookdir = players[consoleplayer].lookdir + adj;
diff --git a/base/h2_main.c b/base/h2_main.c
index 8de2210..63f1d94 100644
--- a/base/h2_main.c
+++ b/base/h2_main.c
@@ -194,6 +194,11 @@ void H2_Main(void)
 	W_InitMultipleFiles(wadfiles);
 
 
+#ifndef DEMO_WAD
+	W_CheckForOldFiles();
+#endif
+	
+
 	ST_Message("Z_Init: Init zone memory allocation daemon.\n");
 	Z_Init();
 
diff --git a/base/w_wad.c b/base/w_wad.c
index baaaaab..74d3621 100644
--- a/base/w_wad.c
+++ b/base/w_wad.c
@@ -12,6 +12,7 @@
 
 // HEADER FILES ------------------------------------------------------------
 
+#include <stdio.h>
 #include <malloc.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -647,6 +648,17 @@ void *W_CacheLumpName(char *name, int tag)
 	return W_CacheLumpNum(W_GetNumForName(name), tag);
 }
 
+void W_CheckForOldFiles (void)
+{
+	if(W_CheckNumForName("clus1msg") == -1)
+	{
+		ST_Message ("\nIt appears that you are using a Version 1.0 \'hexen.wad\' file. Running HHexen\n");
+		ST_Message ("without a Version 1.1 wadfile can cause many problems.\n");
+		ST_Message ("\nPress <ENTER> to continue.\n");
+		getchar();
+	}
+}
+
 //==========================================================================
 //
 // W_Profile
diff --git a/include/h2def.h b/include/h2def.h
index 85d7c19..f583c25 100644
--- a/include/h2def.h
+++ b/include/h2def.h
@@ -985,6 +985,7 @@ int W_LumpLength(int lump);
 void W_ReadLump(int lump, void *dest);
 void *W_CacheLumpNum(int lump, int tag);
 void *W_CacheLumpName(char *name, int tag);
+void W_CheckForOldFiles(void);
 
 //----------
 //BASE LEVEL
-- 
2.39.2