From 9ba95e68e0ad09f9d571f00b38b7952588a85118 Mon Sep 17 00:00:00 2001
From: Meep-Eep <Meep-Eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sat, 23 Jan 2010 20:30:31 +0000
Subject: [PATCH] Move netplay/ to supermelee/.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3509 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/build/msvc6/UrQuanMasters.dsp             | 336 +++++++++---------
 sc2/src/uqm.c                                 |   4 +-
 sc2/src/uqm/Makeinfo                          |   3 -
 sc2/src/uqm/battle.c                          |   6 +-
 sc2/src/uqm/battlecontrols.c                  |   2 +-
 sc2/src/uqm/cnctdlg.c                         |   2 +-
 sc2/src/uqm/gameinp.c                         |   2 +-
 sc2/src/uqm/setup.c                           |   2 +-
 sc2/src/uqm/supermelee/Makeinfo               |   3 +
 sc2/src/uqm/supermelee/melee.c                |   8 +-
 sc2/src/uqm/supermelee/melee.h                |   2 +-
 sc2/src/uqm/{ => supermelee}/netplay/FILES    |   0
 sc2/src/uqm/{ => supermelee}/netplay/Makeinfo |   0
 .../uqm/{ => supermelee}/netplay/checkbuf.c   |   2 +-
 .../uqm/{ => supermelee}/netplay/checkbuf.h   |   2 +-
 .../uqm/{ => supermelee}/netplay/checksum.c   |   0
 .../uqm/{ => supermelee}/netplay/checksum.h   |   2 +-
 sc2/src/uqm/{ => supermelee}/netplay/crc.c    |   0
 sc2/src/uqm/{ => supermelee}/netplay/crc.h    |   0
 .../{ => supermelee}/netplay/nc_connect.ci    |   0
 .../{ => supermelee}/netplay/netconnection.c  |   0
 .../{ => supermelee}/netplay/netconnection.h  |   0
 .../uqm/{ => supermelee}/netplay/netinput.c   |   4 +-
 .../uqm/{ => supermelee}/netplay/netinput.h   |   4 +-
 .../uqm/{ => supermelee}/netplay/netmelee.c   |   8 +-
 .../uqm/{ => supermelee}/netplay/netmelee.h   |   6 +-
 .../uqm/{ => supermelee}/netplay/netmisc.c    |   2 +-
 .../uqm/{ => supermelee}/netplay/netmisc.h    |   2 +-
 .../uqm/{ => supermelee}/netplay/netoptions.c |   0
 .../uqm/{ => supermelee}/netplay/netoptions.h |   0
 .../uqm/{ => supermelee}/netplay/netplay.h    |   0
 sc2/src/uqm/{ => supermelee}/netplay/netrcv.c |   0
 sc2/src/uqm/{ => supermelee}/netplay/netrcv.h |   0
 .../uqm/{ => supermelee}/netplay/netsend.c    |   0
 .../uqm/{ => supermelee}/netplay/netsend.h    |   0
 .../uqm/{ => supermelee}/netplay/netstate.c   |   0
 .../uqm/{ => supermelee}/netplay/netstate.h   |   0
 sc2/src/uqm/{ => supermelee}/netplay/notify.c |   0
 sc2/src/uqm/{ => supermelee}/netplay/notify.h |   6 +-
 .../uqm/{ => supermelee}/netplay/notifyall.c  |   0
 .../uqm/{ => supermelee}/netplay/notifyall.h  |   6 +-
 sc2/src/uqm/{ => supermelee}/netplay/packet.c |   0
 sc2/src/uqm/{ => supermelee}/netplay/packet.h |   0
 .../{ => supermelee}/netplay/packethandlers.c |  12 +-
 .../{ => supermelee}/netplay/packethandlers.h |   0
 .../uqm/{ => supermelee}/netplay/packetq.c    |   0
 .../uqm/{ => supermelee}/netplay/packetq.h    |   0
 .../{ => supermelee}/netplay/packetsenders.c  |   0
 .../{ => supermelee}/netplay/packetsenders.h  |   6 +-
 .../{ => supermelee}/netplay/proto/Makeinfo   |   0
 .../netplay/proto/npconfirm.c                 |   0
 .../netplay/proto/npconfirm.h                 |   0
 .../{ => supermelee}/netplay/proto/ready.c    |   0
 .../{ => supermelee}/netplay/proto/ready.h    |   0
 .../{ => supermelee}/netplay/proto/reset.c    |   2 +-
 .../{ => supermelee}/netplay/proto/reset.h    |   0
 sc2/src/uqm/supermelee/pickmele.c             |   6 +-
 sc2/src/uqm/tactrans.c                        |  12 +-
 58 files changed, 226 insertions(+), 226 deletions(-)
 rename sc2/src/uqm/{ => supermelee}/netplay/FILES (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/Makeinfo (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/checkbuf.c (99%)
 rename sc2/src/uqm/{ => supermelee}/netplay/checkbuf.h (98%)
 rename sc2/src/uqm/{ => supermelee}/netplay/checksum.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/checksum.h (98%)
 rename sc2/src/uqm/{ => supermelee}/netplay/crc.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/crc.h (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/nc_connect.ci (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netconnection.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netconnection.h (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netinput.c (98%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netinput.h (96%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netmelee.c (99%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netmelee.h (96%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netmisc.c (99%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netmisc.h (98%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netoptions.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netoptions.h (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netplay.h (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netrcv.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netrcv.h (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netsend.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netsend.h (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netstate.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/netstate.h (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/notify.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/notify.h (94%)
 rename sc2/src/uqm/{ => supermelee}/netplay/notifyall.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/notifyall.h (93%)
 rename sc2/src/uqm/{ => supermelee}/netplay/packet.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/packet.h (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/packethandlers.c (99%)
 rename sc2/src/uqm/{ => supermelee}/netplay/packethandlers.h (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/packetq.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/packetq.h (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/packetsenders.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/packetsenders.h (95%)
 rename sc2/src/uqm/{ => supermelee}/netplay/proto/Makeinfo (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/proto/npconfirm.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/proto/npconfirm.h (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/proto/ready.c (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/proto/ready.h (100%)
 rename sc2/src/uqm/{ => supermelee}/netplay/proto/reset.c (99%)
 rename sc2/src/uqm/{ => supermelee}/netplay/proto/reset.h (100%)

diff --git a/sc2/build/msvc6/UrQuanMasters.dsp b/sc2/build/msvc6/UrQuanMasters.dsp
index b5d2d75b2..b609a0c85 100644
--- a/sc2/build/msvc6/UrQuanMasters.dsp
+++ b/sc2/build/msvc6/UrQuanMasters.dsp
@@ -2096,174 +2096,6 @@ SOURCE=..\..\src\uqm\comm\zoqfot\zoqfotc.c
 SOURCE=..\..\src\uqm\comm\commall.h
 # End Source File
 # End Group
-# Begin Group "netplay"
-
-# PROP Default_Filter ""
-# Begin Group "proto"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\proto\npconfirm.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\proto\npconfirm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\proto\ready.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\proto\ready.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\proto\reset.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\proto\reset.h
-# End Source File
-# End Group
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\checkbuf.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\checkbuf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\checksum.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\checksum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\crc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\crc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\nc_connect.ci
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netconnection.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netconnection.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netinput.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netinput.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netmelee.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netmelee.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netmisc.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netmisc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netoptions.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netoptions.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netplay.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netrcv.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netrcv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netsend.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netsend.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netstate.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\netstate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\notify.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\notify.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\packet.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\packet.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\packethandlers.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\packethandlers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\packetq.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\packetq.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\packetsenders.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\uqm\netplay\packetsenders.h
-# End Source File
-# End Group
 # Begin Group "planets"
 
 # PROP Default_Filter ""
@@ -2971,6 +2803,174 @@ SOURCE=..\..\src\uqm\ships\ship.h
 # Begin Group "supermelee"
 
 # PROP Default_Filter ""
+# Begin Group "netplay"
+
+# PROP Default_Filter ""
+# Begin Group "proto"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\proto\npconfirm.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\proto\npconfirm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\proto\ready.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\proto\ready.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\proto\reset.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\proto\reset.h
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\checkbuf.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\checkbuf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\checksum.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\checksum.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\crc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\crc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\nc_connect.ci
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netconnection.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netconnection.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netinput.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netinput.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netmelee.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netmelee.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netmisc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netmisc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netoptions.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netoptions.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netplay.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netrcv.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netrcv.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netsend.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netsend.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netstate.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\netstate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\notify.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\notify.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\packet.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\packet.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\packethandlers.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\packethandlers.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\packetq.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\packetq.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\packetsenders.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\uqm\supermelee\netplay\packetsenders.h
+# End Source File
+# End Group
 # Begin Source File
 
 SOURCE=..\..\src\uqm\supermelee\buildpick.c
diff --git a/sc2/src/uqm.c b/sc2/src/uqm.c
index 2065b6ce8..1e4cea27a 100644
--- a/sc2/src/uqm.c
+++ b/sc2/src/uqm.c
@@ -49,8 +49,8 @@
 #	include "libs/callback.h"
 #	include "libs/alarm.h"
 #	include "libs/net.h"
-#	include "uqm/netplay/netoptions.h"
-#	include "uqm/netplay/netplay.h"
+#	include "uqm/supermelee/netplay/netoptions.h"
+#	include "uqm/supermelee/netplay/netplay.h"
 #endif
 #include "uqm/setup.h"
 #include "uqm/starcon.h"
diff --git a/sc2/src/uqm/Makeinfo b/sc2/src/uqm/Makeinfo
index ec780f704..9e3baebd3 100644
--- a/sc2/src/uqm/Makeinfo
+++ b/sc2/src/uqm/Makeinfo
@@ -9,7 +9,4 @@ uqm_CFILES="battle.c battlecontrols.c border.c build.c cleanup.c clock.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 d7ce10685..fd1b0757e 100644
--- a/sc2/src/uqm/battle.c
+++ b/sc2/src/uqm/battle.c
@@ -28,11 +28,11 @@
 		// for flee_preprocess()
 #include "intel.h"
 #ifdef NETPLAY
-#	include "netplay/netmelee.h"
+#	include "supermelee/netplay/netmelee.h"
 #	ifdef NETPLAY_CHECKSUM
-#		include "netplay/checksum.h"
+#		include "supermelee/netplay/checksum.h"
 #	endif
-#	include "netplay/notifyall.h"
+#	include "supermelee/netplay/notifyall.h"
 #endif
 #include "supermelee/pickmele.h"
 #include "resinst.h"
diff --git a/sc2/src/uqm/battlecontrols.c b/sc2/src/uqm/battlecontrols.c
index e299051dc..0f241e6c9 100644
--- a/sc2/src/uqm/battlecontrols.c
+++ b/sc2/src/uqm/battlecontrols.c
@@ -25,7 +25,7 @@
 #include "libs/memlib.h"
 		// For HMalloc(), HFree()
 #ifdef NETPLAY
-#	include "netplay/netmelee.h"
+#	include "supermelee/netplay/netmelee.h"
 #endif  /* NETPLAY */
 
 InputContext *PlayerInput[NUM_PLAYERS];
diff --git a/sc2/src/uqm/cnctdlg.c b/sc2/src/uqm/cnctdlg.c
index 371be377f..7d623d18a 100644
--- a/sc2/src/uqm/cnctdlg.c
+++ b/sc2/src/uqm/cnctdlg.c
@@ -27,7 +27,7 @@
 #include "resinst.h"
 #include "nameref.h"
 #include "libs/graphics/widgets.h"
-#include "netplay/netoptions.h"
+#include "supermelee/netplay/netoptions.h"
 
 #define MCD_WIDTH 260
 #define MCD_HEIGHT 110
diff --git a/sc2/src/uqm/gameinp.c b/sc2/src/uqm/gameinp.c
index 6d7eaa4bf..d17128234 100644
--- a/sc2/src/uqm/gameinp.c
+++ b/sc2/src/uqm/gameinp.c
@@ -22,7 +22,7 @@
 #include "intel.h"
 		// For computer_intelligence
 #ifdef NETPLAY
-#	include "netplay/netmelee.h"
+#	include "supermelee/netplay/netmelee.h"
 #endif
 #include "settings.h"
 #include "sounds.h"
diff --git a/sc2/src/uqm/setup.c b/sc2/src/uqm/setup.c
index deb5d9b56..b07cd7601 100644
--- a/sc2/src/uqm/setup.c
+++ b/sc2/src/uqm/setup.c
@@ -23,7 +23,7 @@
 #include "options.h"
 #include "nameref.h"
 #ifdef NETPLAY
-#	include "netplay/netmelee.h"
+#	include "supermelee/netplay/netmelee.h"
 #endif
 #include "init.h"
 #include "intel.h"
diff --git a/sc2/src/uqm/supermelee/Makeinfo b/sc2/src/uqm/supermelee/Makeinfo
index 98e9f38c1..980b93b60 100644
--- a/sc2/src/uqm/supermelee/Makeinfo
+++ b/sc2/src/uqm/supermelee/Makeinfo
@@ -1 +1,4 @@
 uqm_CFILES="buildpick.c loadmele.c melee.c meleesetup.c pickmele.c"
+if [ -n "$uqm_NETPLAY" ]; then
+	uqm_SUBDIRS="$uqm_SUBDIRS netplay"
+fi
diff --git a/sc2/src/uqm/supermelee/melee.c b/sc2/src/uqm/supermelee/melee.c
index 6ae002568..5f517c6f5 100644
--- a/sc2/src/uqm/supermelee/melee.c
+++ b/sc2/src/uqm/supermelee/melee.c
@@ -36,10 +36,10 @@
 #include "../master.h"
 #include "../nameref.h"
 #ifdef NETPLAY
-#	include "../netplay/netconnection.h"
-#	include "../netplay/netmelee.h"
-#	include "../netplay/notify.h"
-#	include "../netplay/notifyall.h"
+#	include "netplay/netconnection.h"
+#	include "netplay/netmelee.h"
+#	include "netplay/notify.h"
+#	include "netplay/notifyall.h"
 #	include "libs/graphics/widgets.h"
 		// for DrawShadowedBox()
 #	include "../cnctdlg.h"
diff --git a/sc2/src/uqm/supermelee/melee.h b/sc2/src/uqm/supermelee/melee.h
index df08c230e..e9b6b46b6 100644
--- a/sc2/src/uqm/supermelee/melee.h
+++ b/sc2/src/uqm/supermelee/melee.h
@@ -25,7 +25,7 @@
 #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/netplay/FILES b/sc2/src/uqm/supermelee/netplay/FILES
similarity index 100%
rename from sc2/src/uqm/netplay/FILES
rename to sc2/src/uqm/supermelee/netplay/FILES
diff --git a/sc2/src/uqm/netplay/Makeinfo b/sc2/src/uqm/supermelee/netplay/Makeinfo
similarity index 100%
rename from sc2/src/uqm/netplay/Makeinfo
rename to sc2/src/uqm/supermelee/netplay/Makeinfo
diff --git a/sc2/src/uqm/netplay/checkbuf.c b/sc2/src/uqm/supermelee/netplay/checkbuf.c
similarity index 99%
rename from sc2/src/uqm/netplay/checkbuf.c
rename to sc2/src/uqm/supermelee/netplay/checkbuf.c
index a0b8513c8..e9c5a323a 100644
--- a/sc2/src/uqm/netplay/checkbuf.c
+++ b/sc2/src/uqm/supermelee/netplay/checkbuf.c
@@ -23,7 +23,7 @@
 #include "checkbuf.h"
 #include "libs/log.h"
 
-#include "../battle.h"
+#include "../../battle.h"
 		// for battleFrameCount
 
 
diff --git a/sc2/src/uqm/netplay/checkbuf.h b/sc2/src/uqm/supermelee/netplay/checkbuf.h
similarity index 98%
rename from sc2/src/uqm/netplay/checkbuf.h
rename to sc2/src/uqm/supermelee/netplay/checkbuf.h
index cc3313c90..cb7637b17 100644
--- a/sc2/src/uqm/netplay/checkbuf.h
+++ b/sc2/src/uqm/supermelee/netplay/checkbuf.h
@@ -22,7 +22,7 @@
 typedef struct ChecksumEntry ChecksumEntry;
 typedef struct ChecksumBuffer ChecksumBuffer;
 
-#include "../battle.h"
+#include "../../battle.h"
 		// for BattleFrameCounter
 #include "checksum.h"
 
diff --git a/sc2/src/uqm/netplay/checksum.c b/sc2/src/uqm/supermelee/netplay/checksum.c
similarity index 100%
rename from sc2/src/uqm/netplay/checksum.c
rename to sc2/src/uqm/supermelee/netplay/checksum.c
diff --git a/sc2/src/uqm/netplay/checksum.h b/sc2/src/uqm/supermelee/netplay/checksum.h
similarity index 98%
rename from sc2/src/uqm/netplay/checksum.h
rename to sc2/src/uqm/supermelee/netplay/checksum.h
index a19444910..95f84bf6b 100644
--- a/sc2/src/uqm/netplay/checksum.h
+++ b/sc2/src/uqm/supermelee/netplay/checksum.h
@@ -28,7 +28,7 @@ typedef uint32 Checksum;
 #include "netplay.h"
 #include "crc.h"
 
-#include "../element.h"
+#include "../../element.h"
 #include "libs/gfxlib.h"
 
 #include "netconnection.h"
diff --git a/sc2/src/uqm/netplay/crc.c b/sc2/src/uqm/supermelee/netplay/crc.c
similarity index 100%
rename from sc2/src/uqm/netplay/crc.c
rename to sc2/src/uqm/supermelee/netplay/crc.c
diff --git a/sc2/src/uqm/netplay/crc.h b/sc2/src/uqm/supermelee/netplay/crc.h
similarity index 100%
rename from sc2/src/uqm/netplay/crc.h
rename to sc2/src/uqm/supermelee/netplay/crc.h
diff --git a/sc2/src/uqm/netplay/nc_connect.ci b/sc2/src/uqm/supermelee/netplay/nc_connect.ci
similarity index 100%
rename from sc2/src/uqm/netplay/nc_connect.ci
rename to sc2/src/uqm/supermelee/netplay/nc_connect.ci
diff --git a/sc2/src/uqm/netplay/netconnection.c b/sc2/src/uqm/supermelee/netplay/netconnection.c
similarity index 100%
rename from sc2/src/uqm/netplay/netconnection.c
rename to sc2/src/uqm/supermelee/netplay/netconnection.c
diff --git a/sc2/src/uqm/netplay/netconnection.h b/sc2/src/uqm/supermelee/netplay/netconnection.h
similarity index 100%
rename from sc2/src/uqm/netplay/netconnection.h
rename to sc2/src/uqm/supermelee/netplay/netconnection.h
diff --git a/sc2/src/uqm/netplay/netinput.c b/sc2/src/uqm/supermelee/netplay/netinput.c
similarity index 98%
rename from sc2/src/uqm/netplay/netinput.c
rename to sc2/src/uqm/supermelee/netplay/netinput.c
index 2bbc07db5..bbec83e03 100644
--- a/sc2/src/uqm/netplay/netinput.c
+++ b/sc2/src/uqm/supermelee/netplay/netinput.c
@@ -22,9 +22,9 @@
 #include "netplay.h"
 #include "netinput.h"
 
-#include "../intel.h"
+#include "../../intel.h"
 		// for NETWORK_CONTROL
-#include "../setup.h"
+#include "../../setup.h"
 		// For PlayerControl
 #include "libs/log.h"
 
diff --git a/sc2/src/uqm/netplay/netinput.h b/sc2/src/uqm/supermelee/netplay/netinput.h
similarity index 96%
rename from sc2/src/uqm/netplay/netinput.h
rename to sc2/src/uqm/supermelee/netplay/netinput.h
index 69389f4da..ff1f42f7f 100644
--- a/sc2/src/uqm/netplay/netinput.h
+++ b/sc2/src/uqm/supermelee/netplay/netinput.h
@@ -19,9 +19,9 @@
 #ifndef _NETINPUT_H
 #define _NETINPUT_H
 
-#include "../controls.h"
+#include "../../controls.h"
 		// for BATTLE_INPUT_STATE
-#include "../init.h"
+#include "../../init.h"
 		// for NUM_PLAYERS
 
 typedef struct BattleInputBuffer {
diff --git a/sc2/src/uqm/netplay/netmelee.c b/sc2/src/uqm/supermelee/netplay/netmelee.c
similarity index 99%
rename from sc2/src/uqm/netplay/netmelee.c
rename to sc2/src/uqm/supermelee/netplay/netmelee.c
index 78421c378..08dc95532 100644
--- a/sc2/src/uqm/netplay/netmelee.c
+++ b/sc2/src/uqm/supermelee/netplay/netmelee.c
@@ -30,13 +30,13 @@
 #include "proto/ready.h"
 #include "proto/reset.h"
 
-#include "../battlecontrols.h"
+#include "../../battlecontrols.h"
 		// for NetworkInputContext
-#include "../controls.h"
+#include "../../controls.h"
 		// for BATTLE_INPUT_STATE
-#include "../init.h"
+#include "../../init.h"
 		// for NUM_PLAYERS
-#include "../globdata.h"
+#include "../../globdata.h"
 		// for GLOBAL
 
 #include <errno.h>
diff --git a/sc2/src/uqm/netplay/netmelee.h b/sc2/src/uqm/supermelee/netplay/netmelee.h
similarity index 96%
rename from sc2/src/uqm/netplay/netmelee.h
rename to sc2/src/uqm/supermelee/netplay/netmelee.h
index 178a00dee..6bed21961 100644
--- a/sc2/src/uqm/netplay/netmelee.h
+++ b/sc2/src/uqm/supermelee/netplay/netmelee.h
@@ -24,11 +24,11 @@
 #include "netconnection.h"
 #include "packetsenders.h"
 
-#include "../battlecontrols.h"
+#include "../../battlecontrols.h"
 		// for NetworkInputContext
-#include "../controls.h"
+#include "../../controls.h"
 		// for BATTLE_INPUT_STATE
-#include "../races.h"
+#include "../../races.h"
 		// for STARSHIP
 
 
diff --git a/sc2/src/uqm/netplay/netmisc.c b/sc2/src/uqm/supermelee/netplay/netmisc.c
similarity index 99%
rename from sc2/src/uqm/netplay/netmisc.c
rename to sc2/src/uqm/supermelee/netplay/netmisc.c
index 751280aa5..b1f2a3ad4 100644
--- a/sc2/src/uqm/netplay/netmisc.c
+++ b/sc2/src/uqm/supermelee/netplay/netmisc.c
@@ -24,7 +24,7 @@
 #include "packetsenders.h"
 #include "proto/ready.h"
 
-#include "../supermelee/melee.h"
+#include "../melee.h"
 		// For feedback functions.
 
 #include <stdlib.h>
diff --git a/sc2/src/uqm/netplay/netmisc.h b/sc2/src/uqm/supermelee/netplay/netmisc.h
similarity index 98%
rename from sc2/src/uqm/netplay/netmisc.h
rename to sc2/src/uqm/supermelee/netplay/netmisc.h
index 2ff809296..3b74847f9 100644
--- a/sc2/src/uqm/netplay/netmisc.h
+++ b/sc2/src/uqm/supermelee/netplay/netmisc.h
@@ -25,7 +25,7 @@ typedef struct BattleStateData BattleStateData;
 #include "netstate.h"
 #include "types.h"
 
-#include "../battle.h"
+#include "../../battle.h"
 		// for BattleFrameCounter, BATTLE_FRAME_RATE
 
 struct BattleStateData {
diff --git a/sc2/src/uqm/netplay/netoptions.c b/sc2/src/uqm/supermelee/netplay/netoptions.c
similarity index 100%
rename from sc2/src/uqm/netplay/netoptions.c
rename to sc2/src/uqm/supermelee/netplay/netoptions.c
diff --git a/sc2/src/uqm/netplay/netoptions.h b/sc2/src/uqm/supermelee/netplay/netoptions.h
similarity index 100%
rename from sc2/src/uqm/netplay/netoptions.h
rename to sc2/src/uqm/supermelee/netplay/netoptions.h
diff --git a/sc2/src/uqm/netplay/netplay.h b/sc2/src/uqm/supermelee/netplay/netplay.h
similarity index 100%
rename from sc2/src/uqm/netplay/netplay.h
rename to sc2/src/uqm/supermelee/netplay/netplay.h
diff --git a/sc2/src/uqm/netplay/netrcv.c b/sc2/src/uqm/supermelee/netplay/netrcv.c
similarity index 100%
rename from sc2/src/uqm/netplay/netrcv.c
rename to sc2/src/uqm/supermelee/netplay/netrcv.c
diff --git a/sc2/src/uqm/netplay/netrcv.h b/sc2/src/uqm/supermelee/netplay/netrcv.h
similarity index 100%
rename from sc2/src/uqm/netplay/netrcv.h
rename to sc2/src/uqm/supermelee/netplay/netrcv.h
diff --git a/sc2/src/uqm/netplay/netsend.c b/sc2/src/uqm/supermelee/netplay/netsend.c
similarity index 100%
rename from sc2/src/uqm/netplay/netsend.c
rename to sc2/src/uqm/supermelee/netplay/netsend.c
diff --git a/sc2/src/uqm/netplay/netsend.h b/sc2/src/uqm/supermelee/netplay/netsend.h
similarity index 100%
rename from sc2/src/uqm/netplay/netsend.h
rename to sc2/src/uqm/supermelee/netplay/netsend.h
diff --git a/sc2/src/uqm/netplay/netstate.c b/sc2/src/uqm/supermelee/netplay/netstate.c
similarity index 100%
rename from sc2/src/uqm/netplay/netstate.c
rename to sc2/src/uqm/supermelee/netplay/netstate.c
diff --git a/sc2/src/uqm/netplay/netstate.h b/sc2/src/uqm/supermelee/netplay/netstate.h
similarity index 100%
rename from sc2/src/uqm/netplay/netstate.h
rename to sc2/src/uqm/supermelee/netplay/netstate.h
diff --git a/sc2/src/uqm/netplay/notify.c b/sc2/src/uqm/supermelee/netplay/notify.c
similarity index 100%
rename from sc2/src/uqm/netplay/notify.c
rename to sc2/src/uqm/supermelee/netplay/notify.c
diff --git a/sc2/src/uqm/netplay/notify.h b/sc2/src/uqm/supermelee/netplay/notify.h
similarity index 94%
rename from sc2/src/uqm/netplay/notify.h
rename to sc2/src/uqm/supermelee/netplay/notify.h
index 55c3f2600..a492c51e8 100644
--- a/sc2/src/uqm/netplay/notify.h
+++ b/sc2/src/uqm/supermelee/netplay/notify.h
@@ -22,14 +22,14 @@
 #include "netplay.h"
 		// for NETPLAY_CHECKSUM
 #include "netconnection.h"
-#include "../controls.h"
+#include "../../controls.h"
 		// for BATTLE_INPUT_STATE
 #ifdef NETPLAY_CHECKSUM
 #	include "checksum.h"
 #endif
-#include "../supermelee/meleeship.h"
+#include "../meleeship.h"
 		// for MeleeShip
-#include "../supermelee/meleesetup.h"
+#include "../meleesetup.h"
 		// for FleetShipIndex
 
 void Netplay_Notify_shipSelected(NetConnection *conn, FleetShipIndex index);
diff --git a/sc2/src/uqm/netplay/notifyall.c b/sc2/src/uqm/supermelee/netplay/notifyall.c
similarity index 100%
rename from sc2/src/uqm/netplay/notifyall.c
rename to sc2/src/uqm/supermelee/netplay/notifyall.c
diff --git a/sc2/src/uqm/netplay/notifyall.h b/sc2/src/uqm/supermelee/netplay/notifyall.h
similarity index 93%
rename from sc2/src/uqm/netplay/notifyall.h
rename to sc2/src/uqm/supermelee/netplay/notifyall.h
index 397067bd6..55f413f07 100644
--- a/sc2/src/uqm/netplay/notifyall.h
+++ b/sc2/src/uqm/supermelee/netplay/notifyall.h
@@ -17,9 +17,9 @@
 #ifndef NOTIFYALL_H
 #define NOTIFYALL_H
 
-#include "../battle.h"
-#include "../battlecontrols.h"
-#include "../supermelee/melee.h"
+#include "../../battle.h"
+#include "../../battlecontrols.h"
+#include "../melee.h"
 #ifdef NETPLAY_CHECKSUM
 #	include "checksum.h"
 #endif  /* NETPLAY_CHECKSUM */
diff --git a/sc2/src/uqm/netplay/packet.c b/sc2/src/uqm/supermelee/netplay/packet.c
similarity index 100%
rename from sc2/src/uqm/netplay/packet.c
rename to sc2/src/uqm/supermelee/netplay/packet.c
diff --git a/sc2/src/uqm/netplay/packet.h b/sc2/src/uqm/supermelee/netplay/packet.h
similarity index 100%
rename from sc2/src/uqm/netplay/packet.h
rename to sc2/src/uqm/supermelee/netplay/packet.h
diff --git a/sc2/src/uqm/netplay/packethandlers.c b/sc2/src/uqm/supermelee/netplay/packethandlers.c
similarity index 99%
rename from sc2/src/uqm/netplay/packethandlers.c
rename to sc2/src/uqm/supermelee/netplay/packethandlers.c
index 0067baec0..c34f56e6b 100644
--- a/sc2/src/uqm/netplay/packethandlers.c
+++ b/sc2/src/uqm/supermelee/netplay/packethandlers.c
@@ -31,17 +31,17 @@
 #include "proto/reset.h"
 #include "libs/log.h"
 
-#include "../controls.h"
+#include "../../controls.h"
 		// for BATTLE_INPUT_STATE
-#include "../init.h"
+#include "../../init.h"
 		// for NUM_PLAYERS
-#include "../globdata.h"
+#include "../../globdata.h"
 		// for GLOBAL
-#include "../supermelee/melee.h"
+#include "../melee.h"
 		// for various update functions.
-#include "../supermelee/meleeship.h"
+#include "../meleeship.h"
 		// for MeleeShip
-#include "../supermelee/pickmele.h"
+#include "../pickmele.h"
 		// for various update functions.
 #include "libs/mathlib.h"
 		// for TFB_SeedRandom
diff --git a/sc2/src/uqm/netplay/packethandlers.h b/sc2/src/uqm/supermelee/netplay/packethandlers.h
similarity index 100%
rename from sc2/src/uqm/netplay/packethandlers.h
rename to sc2/src/uqm/supermelee/netplay/packethandlers.h
diff --git a/sc2/src/uqm/netplay/packetq.c b/sc2/src/uqm/supermelee/netplay/packetq.c
similarity index 100%
rename from sc2/src/uqm/netplay/packetq.c
rename to sc2/src/uqm/supermelee/netplay/packetq.c
diff --git a/sc2/src/uqm/netplay/packetq.h b/sc2/src/uqm/supermelee/netplay/packetq.h
similarity index 100%
rename from sc2/src/uqm/netplay/packetq.h
rename to sc2/src/uqm/supermelee/netplay/packetq.h
diff --git a/sc2/src/uqm/netplay/packetsenders.c b/sc2/src/uqm/supermelee/netplay/packetsenders.c
similarity index 100%
rename from sc2/src/uqm/netplay/packetsenders.c
rename to sc2/src/uqm/supermelee/netplay/packetsenders.c
diff --git a/sc2/src/uqm/netplay/packetsenders.h b/sc2/src/uqm/supermelee/netplay/packetsenders.h
similarity index 95%
rename from sc2/src/uqm/netplay/packetsenders.h
rename to sc2/src/uqm/supermelee/netplay/packetsenders.h
index 06f083d4f..4f641207b 100644
--- a/sc2/src/uqm/netplay/packetsenders.h
+++ b/sc2/src/uqm/supermelee/netplay/packetsenders.h
@@ -24,11 +24,11 @@
 #include "netconnection.h"
 #include "packet.h"
 
-#include "../controls.h"
+#include "../../controls.h"
 		// for BATTLE_INPUT_STATE
-#include "../supermelee/meleeship.h"
+#include "../meleeship.h"
 		// for MeleeShip
-#include "../supermelee/meleesetup.h"
+#include "../meleesetup.h"
 		// for FleetShipIndex
 
 void sendInit(NetConnection *conn);
diff --git a/sc2/src/uqm/netplay/proto/Makeinfo b/sc2/src/uqm/supermelee/netplay/proto/Makeinfo
similarity index 100%
rename from sc2/src/uqm/netplay/proto/Makeinfo
rename to sc2/src/uqm/supermelee/netplay/proto/Makeinfo
diff --git a/sc2/src/uqm/netplay/proto/npconfirm.c b/sc2/src/uqm/supermelee/netplay/proto/npconfirm.c
similarity index 100%
rename from sc2/src/uqm/netplay/proto/npconfirm.c
rename to sc2/src/uqm/supermelee/netplay/proto/npconfirm.c
diff --git a/sc2/src/uqm/netplay/proto/npconfirm.h b/sc2/src/uqm/supermelee/netplay/proto/npconfirm.h
similarity index 100%
rename from sc2/src/uqm/netplay/proto/npconfirm.h
rename to sc2/src/uqm/supermelee/netplay/proto/npconfirm.h
diff --git a/sc2/src/uqm/netplay/proto/ready.c b/sc2/src/uqm/supermelee/netplay/proto/ready.c
similarity index 100%
rename from sc2/src/uqm/netplay/proto/ready.c
rename to sc2/src/uqm/supermelee/netplay/proto/ready.c
diff --git a/sc2/src/uqm/netplay/proto/ready.h b/sc2/src/uqm/supermelee/netplay/proto/ready.h
similarity index 100%
rename from sc2/src/uqm/netplay/proto/ready.h
rename to sc2/src/uqm/supermelee/netplay/proto/ready.h
diff --git a/sc2/src/uqm/netplay/proto/reset.c b/sc2/src/uqm/supermelee/netplay/proto/reset.c
similarity index 99%
rename from sc2/src/uqm/netplay/proto/reset.c
rename to sc2/src/uqm/supermelee/netplay/proto/reset.c
index d59d3ac42..c74c43c18 100644
--- a/sc2/src/uqm/netplay/proto/reset.c
+++ b/sc2/src/uqm/supermelee/netplay/proto/reset.c
@@ -24,7 +24,7 @@
 
 #include "types.h"
 #include "../packetsenders.h"
-#include "../../supermelee/melee.h"
+#include "../../melee.h"
 		// For resetFeedback.
 
 #include <assert.h>
diff --git a/sc2/src/uqm/netplay/proto/reset.h b/sc2/src/uqm/supermelee/netplay/proto/reset.h
similarity index 100%
rename from sc2/src/uqm/netplay/proto/reset.h
rename to sc2/src/uqm/supermelee/netplay/proto/reset.h
diff --git a/sc2/src/uqm/supermelee/pickmele.c b/sc2/src/uqm/supermelee/pickmele.c
index 418311fe0..472d2856e 100644
--- a/sc2/src/uqm/supermelee/pickmele.c
+++ b/sc2/src/uqm/supermelee/pickmele.c
@@ -30,9 +30,9 @@
 #include "../nameref.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"
diff --git a/sc2/src/uqm/tactrans.c b/sc2/src/uqm/tactrans.c
index 5799fec9c..1d318b53e 100644
--- a/sc2/src/uqm/tactrans.c
+++ b/sc2/src/uqm/tactrans.c
@@ -28,12 +28,12 @@
 #include "battle.h"
 #include "init.h"
 #ifdef NETPLAY
-#	include "netplay/netmelee.h"
-#	include "netplay/netmisc.h"
-#	include "netplay/notify.h"
-#	include "netplay/proto/ready.h"
-#	include "netplay/packet.h"
-#	include "netplay/packetq.h"
+#	include "supermelee/netplay/netmelee.h"
+#	include "supermelee/netplay/netmisc.h"
+#	include "supermelee/netplay/notify.h"
+#	include "supermelee/netplay/proto/ready.h"
+#	include "supermelee/netplay/packet.h"
+#	include "supermelee/netplay/packetq.h"
 #endif
 #include "races.h"
 #include "settings.h"