From 2d87ccd2b912d47bb0bee9aef484322ff23416b7 Mon Sep 17 00:00:00 2001
From: paul <paul@32837ae5-38f0-4cfd-8401-3ff76d8497c4>
Date: Sun, 19 Aug 2007 16:09:49 +0000
Subject: [PATCH] Remove excess map data.

git-svn-id: svn+ssh://jay/var/svn/wolf/trunk@133 32837ae5-38f0-4cfd-8401-3ff76d8497c4
---
 build_mapheaders.c | 4 ++--
 id_ca.h            | 4 ++++
 version.h          | 2 --
 wl_act2.c          | 2 ++
 wl_debug.c         | 2 +-
 wl_play.c          | 2 ++
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/build_mapheaders.c b/build_mapheaders.c
index f0c035f..bfde2a9 100644
--- a/build_mapheaders.c
+++ b/build_mapheaders.c
@@ -21,9 +21,9 @@ int main()
 
     printf("#include \"wl_def.h\"\n");
     printf("const word RLEWtag = 0x%x;\n", rlew);
-    printf("const maptype mapheaderseg[60] = {\n");
+    printf("const maptype mapheaderseg[NUMMAPS] = {\n");
     f = fopen("gamemaps." GAMEEXT, "rb");
-    for (i = 0; i < 60; i++)
+    for (i = 0; i < NUMMAPS; i++)
       {
 	if (!offsets[i]) {
 	    printf ("{{0, 0}, {0,0}},\n");
diff --git a/id_ca.h b/id_ca.h
index 459a8ac..faa7823 100644
--- a/id_ca.h
+++ b/id_ca.h
@@ -3,7 +3,11 @@
 
 /* ======================================================================== */
 
+#ifdef UPLOAD
+#define NUMMAPS		10
+#else
 #define NUMMAPS		60
+#endif
 #define MAPPLANES	2
 
 typedef	struct
diff --git a/version.h b/version.h
index 8eb005c..69b7ae8 100644
--- a/version.h
+++ b/version.h
@@ -60,9 +60,7 @@
 #if WMODE == 0
 /* #define SPEAR */
 /* #define SPEARDEMO */
-#ifndef EMBEDDED
 #define UPLOAD
-#endif
 #define GAMENAME	"Wolfenstein 3D Shareware"
 #define GAMEEXT		"wl1"
 #define GAMETYPE	"WL1\0"
diff --git a/wl_act2.c b/wl_act2.c
index eae470c..657511d 100644
--- a/wl_act2.c
+++ b/wl_act2.c
@@ -491,6 +491,7 @@ void A_DeathScream (objtype *ob)
 
 	case guardobj:
 		{
+#ifdef ENABLE_AUDIO
 #ifndef UPLOAD
 		 myint sounds[8]={ DEATHSCREAM1SND, DEATHSCREAM2SND,
 				 DEATHSCREAM3SND, DEATHSCREAM4SND,
@@ -505,6 +506,7 @@ void A_DeathScream (objtype *ob)
 		 };
 		 PlaySoundLocActor(sounds[US_RndT()%3], ob);
 #endif				
+#endif
 		}
 		break;
 	case officerobj:
diff --git a/wl_debug.c b/wl_debug.c
index 7c8e11b..c3f360a 100644
--- a/wl_debug.c
+++ b/wl_debug.c
@@ -1,5 +1,6 @@
 #include "wl_def.h"
 
+#ifndef EMBEDDED
 /*
 ==================
 =
@@ -90,7 +91,6 @@ void ShapeTest()
 {
 }
 
-#ifndef EMBEDDED
 /*
 ================
 =
diff --git a/wl_play.c b/wl_play.c
index 5d6a30d..ae1cc61 100644
--- a/wl_play.c
+++ b/wl_play.c
@@ -524,7 +524,9 @@ void PollControls()
 
 void CenterWindow(word w,word h)
 {
+#ifndef EMBEDDED
 	US_DrawWindow(((MAXX / 8) - w) / 2,((MAXY / 8) - h) / 2,w,h);
+#endif
 }
 
 //===========================================================================