From 4a00423c89494255a0741c2895705e95ff676801 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 9 Feb 2012 22:44:45 +0000
Subject: [PATCH] Add some #includes to gameexec.h and sector.h so that they
 can be included directly

git-svn-id: https://svn.eduke32.com/eduke32@2328 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/gameexec.h | 5 +++++
 polymer/eduke32/source/global.h   | 2 +-
 polymer/eduke32/source/sector.h   | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/polymer/eduke32/source/gameexec.h b/polymer/eduke32/source/gameexec.h
index 8d585b099..2d541b20b 100644
--- a/polymer/eduke32/source/gameexec.h
+++ b/polymer/eduke32/source/gameexec.h
@@ -23,7 +23,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef __gameexec_h__
 #define __gameexec_h__
 
+#include "build.h"
+#include "sector.h"  // mapstate_t
+#include "gamedef.h"  // vmstate_t
+
 // the order of these can't be changed or else compatibility with EDuke 2.0 mods will break
+// KEEPINSYNC2 with EventNames[] and same enum in defs.ilua
 enum GameEvent_t {
     EVENT_INIT,
     EVENT_ENTERLEVEL,
diff --git a/polymer/eduke32/source/global.h b/polymer/eduke32/source/global.h
index 5d381df1d..9fc6781ab 100644
--- a/polymer/eduke32/source/global.h
+++ b/polymer/eduke32/source/global.h
@@ -121,7 +121,7 @@ G_EXTERN intptr_t *actorscrptr[MAXTILES],*g_parsingActorPtr;
 G_EXTERN intptr_t *g_scriptPtr,*insptr;
 G_EXTERN int32_t *labelcode,*labeltype;
 G_EXTERN intptr_t *script;
-G_EXTERN map_t MapInfo[(MAXVOLUMES+1)*MAXLEVELS];
+G_EXTERN map_t MapInfo[(MAXVOLUMES+1)*MAXLEVELS];  // +1 volume for "intro", "briefing" music
 G_EXTERN playerdata_t g_player[MAXPLAYERS];
 G_EXTERN playerspawn_t g_playerSpawnPoints[MAXPLAYERS];
 G_EXTERN projectile_t ProjectileData[MAXTILES],DefaultProjectileData[MAXTILES],SpriteProjectile[MAXSPRITES];
diff --git a/polymer/eduke32/source/sector.h b/polymer/eduke32/source/sector.h
index f6b77c4b2..f1a7de1dd 100644
--- a/polymer/eduke32/source/sector.h
+++ b/polymer/eduke32/source/sector.h
@@ -24,6 +24,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define __sector_h__
 
 #include "gamevars.h"
+#include "actors.h"  // actor_t
+#include "player.h"  // playerspawn_t
+
 
 #define MAXCYCLERS      1024
 #define MAXANIMATES     256
@@ -85,7 +88,7 @@ typedef struct {
     mapstate_t *savedstate;
 } map_t;
 
-extern map_t MapInfo[(MAXVOLUMES+1)*MAXLEVELS]; // +1 volume for "intro", "briefing" music
+//extern map_t MapInfo[(MAXVOLUMES+1)*MAXLEVELS]; // +1 volume for "intro", "briefing" music
 
 void G_ActivateBySector(int32_t sect,int32_t j);
 int32_t A_CallSound(int32_t sn,int32_t whatsprite);