Put SuperMelee source files in separate subdirectory.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3484 8092fc87-c524-0410-9efc-e669fe64eaf9

sc2/src/uqm/Makeinfo

@@ -1,14 +1,14 @@
-uqm_SUBDIRS="comm planets ships"
+uqm_SUBDIRS="comm planets ships supermelee"
 uqm_CFILES="battle.c battlecontrols.c border.c build.c cleanup.c clock.c
 		cnctdlg.c collide.c comm.c commanim.c commglue.c confirm.c credits.c
 		cyborg.c demo.c displist.c dummy.c encount.c flash.c fmv.c galaxy.c
 		gameev.c gameinp.c gameopt.c gendef.c getchar.c globdata.c gravity.c
 		cons_res.c grpinfo.c hyper.c init.c intel.c intro.c ipdisp.c load.c
-		loadmele.c loadship.c master.c melee.c menu.c misc.c oscill.c
-		outfit.c pickmele.c pickship.c plandata.c process.c restart.c save.c
-		settings.c setup.c setupmenu.c ship.c shipstat.c shipyard.c sis.c
-		sounds.c starbase.c starcon.c starmap.c state.c status.c tactrans.c
-		trans.c uqmdebug.c util.c velocity.c weapon.c"
+		loadship.c master.c menu.c misc.c oscill.c outfit.c pickship.c
+		plandata.c process.c restart.c save.c settings.c setup.c setupmenu.c
+		ship.c shipstat.c shipyard.c sis.c sounds.c starbase.c starcon.c
+		starmap.c state.c status.c tactrans.c trans.c uqmdebug.c util.c
+		velocity.c weapon.c"
 if [ -n "$uqm_NETPLAY" ]; then
 	uqm_SUBDIRS="$uqm_SUBDIRS netplay"
 fi

sc2/src/uqm/battle.c

@@ -33,7 +33,7 @@
 #		include "netplay/checksum.h"
 #	endif
 #endif
-#include "pickmele.h"
+#include "supermelee/pickmele.h"
 #include "resinst.h"
 #include "nameref.h"
 #include "setup.h"

sc2/src/uqm/battlecontrols.h

@@ -26,7 +26,7 @@ typedef struct NetworkInputContext NetworkInputContext;
 #endif  /* NETPLAY */
 
 #include "controls.h"
-#include "pickmele.h"
+#include "supermelee/pickmele.h"
 #include "races.h"
 #include "libs/compiler.h"
 

sc2/src/uqm/master.c

@@ -21,7 +21,7 @@
 #include "build.h"
 #include "resinst.h"
 #include "displist.h"
-#include "melee.h"
+#include "supermelee/melee.h"
 
 
 QUEUE master_q;

sc2/src/uqm/netplay/netmisc.c

@@ -23,7 +23,7 @@
 #include "packetsenders.h"
 #include "proto/ready.h"
 
-#include "../melee.h"
+#include "../supermelee/melee.h"
 		// For feedback functions.
 
 #include <stdlib.h>

sc2/src/uqm/netplay/packethandlers.c

@@ -37,9 +37,9 @@
 		// for NUM_PLAYERS
 #include "../globdata.h"
 		// for GLOBAL
-#include "../melee.h"
+#include "../supermelee/melee.h"
 		// for various update functions.
-#include "../pickmele.h"
+#include "../supermelee/pickmele.h"
 		// for various update functions.
 #include "libs/mathlib.h"
 		// for TFB_SeedRandom

sc2/src/uqm/netplay/proto/reset.c

@@ -24,7 +24,7 @@
 
 #include "types.h"
 #include "../packetsenders.h"
-#include "../../melee.h"
+#include "../../supermelee/melee.h"
 		// For resetFeedback.
 
 #include <assert.h>

sc2/src/uqm/pickship.c

@@ -22,7 +22,7 @@
 #include "colors.h"
 #include "controls.h"
 #include "menustat.h"
-#include "pickmele.h"
+#include "supermelee/pickmele.h"
 #include "battle.h"
 #include "races.h"
 #include "resinst.h"

sc2/src/uqm/restart.c

@@ -28,7 +28,7 @@
 #include "gamestr.h"
 #include "globdata.h"
 #include "intel.h"
-#include "melee.h"
+#include "supermelee/melee.h"
 #include "resinst.h"
 #include "nameref.h"
 #include "settings.h"

sc2/src/uqm/ship.c

@@ -29,7 +29,7 @@
 #include "intel.h"
 #include "init.h"
 #include "battle.h"
-#include "pickmele.h"
+#include "supermelee/pickmele.h"
 #include "races.h"
 #include "setup.h"
 #include "sounds.h"

sc2/src/uqm/shipyard.c

@@ -23,7 +23,7 @@
 #include "fmv.h"
 #include "gameopt.h"
 #include "gamestr.h"
-#include "melee.h"
+#include "supermelee/melee.h"
 #include "master.h"
 #include "options.h"
 #include "races.h"

sc2/src/uqm/supermelee/Makeinfo

@@ -0,0 +1 @@
+uqm_CFILES="loadmele.c melee.c pickmele.c"

sc2/src/uqm/supermelee/loadmele.c

@@ -20,15 +20,15 @@
 
 #include "melee.h"
 
-#include "controls.h"
-#include "gameopt.h"
-#include "gamestr.h"
-#include "globdata.h"
-#include "master.h"
-#include "save.h"
-#include "setup.h"
-#include "sounds.h"
-#include "options.h"
+#include "../controls.h"
+#include "../gameopt.h"
+#include "../gamestr.h"
+#include "../globdata.h"
+#include "../master.h"
+#include "../save.h"
+#include "../setup.h"
+#include "../sounds.h"
+#include "../../options.h"
 #include "libs/log.h"
 #include "libs/memlib.h"
 

sc2/src/uqm/supermelee/melee.c

@@ -18,35 +18,35 @@
 
 #include "melee.h"
 
-#include "build.h"
-#include "status.h"
-#include "colors.h"
-#include "comm.h"
+#include "../build.h"
+#include "../status.h"
+#include "../colors.h"
+#include "../comm.h"
 		// for getLineWithinWidth
-#include "cons_res.h"
-#include "controls.h"
+#include "../cons_res.h"
+#include "../controls.h"
 #include "libs/file.h"
-#include "fmv.h"
-#include "gamestr.h"
-#include "globdata.h"
-#include "intel.h"
-#include "master.h"
-#include "nameref.h"
+#include "../fmv.h"
+#include "../gamestr.h"
+#include "../globdata.h"
+#include "../intel.h"
+#include "../master.h"
+#include "../nameref.h"
 #ifdef NETPLAY
-#	include "netplay/netconnection.h"
-#	include "netplay/netmelee.h"
-#	include "netplay/notify.h"
+#	include "../netplay/netconnection.h"
+#	include "../netplay/netmelee.h"
+#	include "../netplay/notify.h"
 #	include "libs/graphics/widgets.h"
-#	include "cnctdlg.h"
+#	include "../cnctdlg.h"
 #endif
-#include "options.h"
-#include "races.h"
-#include "resinst.h"
-#include "settings.h"
-#include "setup.h"
-#include "sounds.h"
-#include "util.h"
-#include "planets/planets.h"
+#include "../../options.h"
+#include "../races.h"
+#include "../resinst.h"
+#include "../settings.h"
+#include "../setup.h"
+#include "../sounds.h"
+#include "../util.h"
+#include "../planets/planets.h"
 		// for NUMBER_OF_PLANET_TYPES
 #include "libs/graphics/drawable.h"
 #include "libs/gfxlib.h"

sc2/src/uqm/supermelee/melee.h

@@ -19,13 +19,13 @@
 #ifndef _MELEE_H
 #define _MELEE_H
 
-#include "init.h"
+#include "../init.h"
 #include "libs/gfxlib.h"
 #include "libs/mathlib.h"
 #include "libs/sndlib.h"
 #include "libs/timelib.h"
 #include "libs/reslib.h"
-#include "netplay/packet.h"
+#include "../netplay/packet.h"
 		// for NetplayAbortReason and NetplayResetReason.
 
 typedef struct melee_state MELEE_STATE;

sc2/src/uqm/supermelee/pickmele.c

@@ -19,20 +19,20 @@
 #define PICKMELE_INTERNAL
 #include "pickmele.h"
 
-#include "battlecontrols.h"
-#include "controls.h"
-#include "flash.h"
-#include "intel.h"
-#include "battle.h"
+#include "../battlecontrols.h"
+#include "../controls.h"
+#include "../flash.h"
+#include "../intel.h"
+#include "../battle.h"
 #include "melee.h"
 #ifdef NETPLAY
-#	include "netplay/netmelee.h"
-#	include "netplay/netmisc.h"
-#	include "netplay/notify.h"
+#	include "../netplay/netmelee.h"
+#	include "../netplay/netmisc.h"
+#	include "../netplay/notify.h"
 #endif
-#include "races.h"
-#include "setup.h"
-#include "sounds.h"
+#include "../races.h"
+#include "../setup.h"
+#include "../sounds.h"
 #include "libs/log.h"
 #include "libs/mathlib.h"
 

sc2/src/uqm/supermelee/pickmele.h

@@ -19,8 +19,8 @@
 
 typedef struct getmelee_struct GETMELEE_STATE;
 
-#include "races.h"
-#include "battlecontrols.h"
+#include "../races.h"
+#include "../battlecontrols.h"
 #include "libs/compiler.h"
 
 BOOLEAN MeleeShipDeath (STARSHIP *ship, COUNT which_player);
@@ -39,9 +39,9 @@ BOOLEAN selectShipNetwork (NetworkInputContext *context, GETMELEE_STATE *gms);
 
 #ifdef PICKMELE_INTERNAL
 
-#include "flash.h"
+#include "../flash.h"
 #include "libs/timelib.h"
-#include "init.h"
+#include "../init.h"
 
 struct getmelee_struct {
 	BOOLEAN (*InputFunc) (struct getmelee_struct *pInputState);