From d3070d9fa784af5bdb5f6eca4d65b90e67fbf223 Mon Sep 17 00:00:00 2001
From: Meep-Eep <Meep-Eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Mon, 28 Dec 2009 16:24:23 +0000
Subject: [PATCH] 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/ChangeLog                           |  1 +
 sc2/build/msvc6/UrQuanMasters.dsp       | 52 +++++++++++++------------
 sc2/src/uqm/Makeinfo                    | 12 +++---
 sc2/src/uqm/battle.c                    |  2 +-
 sc2/src/uqm/battlecontrols.h            |  2 +-
 sc2/src/uqm/master.c                    |  2 +-
 sc2/src/uqm/netplay/netmisc.c           |  2 +-
 sc2/src/uqm/netplay/packethandlers.c    |  4 +-
 sc2/src/uqm/netplay/proto/reset.c       |  2 +-
 sc2/src/uqm/pickship.c                  |  2 +-
 sc2/src/uqm/restart.c                   |  2 +-
 sc2/src/uqm/ship.c                      |  2 +-
 sc2/src/uqm/shipyard.c                  |  2 +-
 sc2/src/uqm/supermelee/Makeinfo         |  1 +
 sc2/src/uqm/{ => supermelee}/loadmele.c | 18 ++++-----
 sc2/src/uqm/{ => supermelee}/loadmele.h |  0
 sc2/src/uqm/{ => supermelee}/melee.c    | 48 +++++++++++------------
 sc2/src/uqm/{ => supermelee}/melee.h    |  4 +-
 sc2/src/uqm/{ => supermelee}/pickmele.c | 22 +++++------
 sc2/src/uqm/{ => supermelee}/pickmele.h |  8 ++--
 20 files changed, 97 insertions(+), 91 deletions(-)
 create mode 100644 sc2/src/uqm/supermelee/Makeinfo
 rename sc2/src/uqm/{ => supermelee}/loadmele.c (99%)
 rename sc2/src/uqm/{ => supermelee}/loadmele.h (100%)
 rename sc2/src/uqm/{ => supermelee}/melee.c (99%)
 rename sc2/src/uqm/{ => supermelee}/melee.h (98%)
 rename sc2/src/uqm/{ => supermelee}/pickmele.c (98%)
 rename sc2/src/uqm/{ => supermelee}/pickmele.h (96%)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 2a59225a7..9a1fedcfd 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,5 @@
 Changes towards version 0.7:
+- Put SuperMelee source files in separate subdirectory - SvdB
 - Added additive and alpha drawing modes to graphics lib - Alex
 - Fixed black pixel gaps between the planet and shield when entering the
   orbit of a shielded planet (bug #32) - Alex
diff --git a/sc2/build/msvc6/UrQuanMasters.dsp b/sc2/build/msvc6/UrQuanMasters.dsp
index 21180cee0..4475fbcb0 100644
--- a/sc2/build/msvc6/UrQuanMasters.dsp
+++ b/sc2/build/msvc6/UrQuanMasters.dsp
@@ -3892,6 +3892,34 @@ SOURCE=..\..\src\uqm\ships\zoqfot\zoqfot.c
 SOURCE=..\..\src\uqm\ships\ship.h
 # End Source File
 # End Group
+# Begin Group "supermelee"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\uqm\loadmele.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\loadmele.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\melee.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\melee.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\pickmele.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\pickmele.h
+# End Source File
+# End Group
 # Begin Source File
 
 SOURCE=..\..\src\uqm\battle.c
@@ -4178,14 +4206,6 @@ SOURCE=..\..\src\uqm\load.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\uqm\loadmele.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\loadmele.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\uqm\loadship.c
 # End Source File
 # Begin Source File
@@ -4198,14 +4218,6 @@ SOURCE=..\..\src\uqm\master.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\uqm\melee.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\melee.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\uqm\menu.c
 # End Source File
 # Begin Source File
@@ -4234,14 +4246,6 @@ SOURCE=..\..\src\uqm\outfit.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\uqm\pickmele.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\pickmele.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\uqm\pickship.c
 # End Source File
 # Begin Source File
diff --git a/sc2/src/uqm/Makeinfo b/sc2/src/uqm/Makeinfo
index f321f502f..ec780f704 100644
--- a/sc2/src/uqm/Makeinfo
+++ b/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
diff --git a/sc2/src/uqm/battle.c b/sc2/src/uqm/battle.c
index 2ef664964..a4286a709 100644
--- a/sc2/src/uqm/battle.c
+++ b/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"
diff --git a/sc2/src/uqm/battlecontrols.h b/sc2/src/uqm/battlecontrols.h
index dd8cf3275..f368eee46 100644
--- a/sc2/src/uqm/battlecontrols.h
+++ b/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"
 
diff --git a/sc2/src/uqm/master.c b/sc2/src/uqm/master.c
index 23864fe1d..5c35aaba2 100644
--- a/sc2/src/uqm/master.c
+++ b/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;
diff --git a/sc2/src/uqm/netplay/netmisc.c b/sc2/src/uqm/netplay/netmisc.c
index 73faf16c0..ff871f8cb 100644
--- a/sc2/src/uqm/netplay/netmisc.c
+++ b/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>
diff --git a/sc2/src/uqm/netplay/packethandlers.c b/sc2/src/uqm/netplay/packethandlers.c
index 652e5a860..4018d125c 100644
--- a/sc2/src/uqm/netplay/packethandlers.c
+++ b/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
diff --git a/sc2/src/uqm/netplay/proto/reset.c b/sc2/src/uqm/netplay/proto/reset.c
index c74c43c18..d59d3ac42 100644
--- a/sc2/src/uqm/netplay/proto/reset.c
+++ b/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>
diff --git a/sc2/src/uqm/pickship.c b/sc2/src/uqm/pickship.c
index 2055346a3..47cd34097 100644
--- a/sc2/src/uqm/pickship.c
+++ b/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"
diff --git a/sc2/src/uqm/restart.c b/sc2/src/uqm/restart.c
index 1a2d530b6..c10c191ef 100644
--- a/sc2/src/uqm/restart.c
+++ b/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"
diff --git a/sc2/src/uqm/ship.c b/sc2/src/uqm/ship.c
index c0456e344..9e8bccd56 100644
--- a/sc2/src/uqm/ship.c
+++ b/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"
diff --git a/sc2/src/uqm/shipyard.c b/sc2/src/uqm/shipyard.c
index 294a8d632..df4e521bc 100644
--- a/sc2/src/uqm/shipyard.c
+++ b/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"
diff --git a/sc2/src/uqm/supermelee/Makeinfo b/sc2/src/uqm/supermelee/Makeinfo
new file mode 100644
index 000000000..7dd4191f1
--- /dev/null
+++ b/sc2/src/uqm/supermelee/Makeinfo
@@ -0,0 +1 @@
+uqm_CFILES="loadmele.c melee.c pickmele.c"
diff --git a/sc2/src/uqm/loadmele.c b/sc2/src/uqm/supermelee/loadmele.c
similarity index 99%
rename from sc2/src/uqm/loadmele.c
rename to sc2/src/uqm/supermelee/loadmele.c
index c2057220f..2621091d4 100644
--- a/sc2/src/uqm/loadmele.c
+++ b/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"
 
diff --git a/sc2/src/uqm/loadmele.h b/sc2/src/uqm/supermelee/loadmele.h
similarity index 100%
rename from sc2/src/uqm/loadmele.h
rename to sc2/src/uqm/supermelee/loadmele.h
diff --git a/sc2/src/uqm/melee.c b/sc2/src/uqm/supermelee/melee.c
similarity index 99%
rename from sc2/src/uqm/melee.c
rename to sc2/src/uqm/supermelee/melee.c
index 05184e34d..59f541932 100644
--- a/sc2/src/uqm/melee.c
+++ b/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"
diff --git a/sc2/src/uqm/melee.h b/sc2/src/uqm/supermelee/melee.h
similarity index 98%
rename from sc2/src/uqm/melee.h
rename to sc2/src/uqm/supermelee/melee.h
index f8ba39dd5..52b3d1ca1 100644
--- a/sc2/src/uqm/melee.h
+++ b/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;
diff --git a/sc2/src/uqm/pickmele.c b/sc2/src/uqm/supermelee/pickmele.c
similarity index 98%
rename from sc2/src/uqm/pickmele.c
rename to sc2/src/uqm/supermelee/pickmele.c
index b29053cf6..8abbde56f 100644
--- a/sc2/src/uqm/pickmele.c
+++ b/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"
 
diff --git a/sc2/src/uqm/pickmele.h b/sc2/src/uqm/supermelee/pickmele.h
similarity index 96%
rename from sc2/src/uqm/pickmele.h
rename to sc2/src/uqm/supermelee/pickmele.h
index 22dbe608d..fc43f9805 100644
--- a/sc2/src/uqm/pickmele.h
+++ b/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);