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

@@ -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

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/supermelee/netplay/netoptions.h"
-#	include "uqm/netplay/netplay.h"
+#	include "uqm/supermelee/netplay/netplay.h"
 #endif
 #include "uqm/setup.h"
 #include "uqm/starcon.h"

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
 

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"

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];

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

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"

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"

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

sc2/src/uqm/supermelee/melee.c

@@ -36,10 +36,10 @@
 #include "../master.h"
 #include "../nameref.h"
 #ifdef NETPLAY
-#	include "../netplay/netconnection.h"
+#	include "netplay/netconnection.h"
-#	include "../netplay/netmelee.h"
+#	include "netplay/netmelee.h"
-#	include "../netplay/notify.h"
+#	include "netplay/notify.h"
-#	include "../netplay/notifyall.h"
+#	include "netplay/notifyall.h"
 #	include "libs/graphics/widgets.h"
 		// for DrawShadowedBox()
 #	include "../cnctdlg.h"

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;

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
 
 

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"
 

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"

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"
 

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 {

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>

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
 
 

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>

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 {

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);

sc2/src/uqm/supermelee/netplay/notifyall.h

@@ -17,9 +17,9 @@
 #ifndef NOTIFYALL_H
 #define NOTIFYALL_H
 
-#include "../battle.h"
+#include "../../battle.h"
-#include "../battlecontrols.h"
+#include "../../battlecontrols.h"
-#include "../supermelee/melee.h"
+#include "../melee.h"
 #ifdef NETPLAY_CHECKSUM
 #	include "checksum.h"
 #endif  /* NETPLAY_CHECKSUM */

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

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);

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>

sc2/src/uqm/supermelee/pickmele.c

@@ -30,9 +30,9 @@
 #include "../nameref.h"
 #include "melee.h"
 #ifdef NETPLAY
-#	include "../netplay/netmelee.h"
+#	include "netplay/netmelee.h"
-#	include "../netplay/netmisc.h"
+#	include "netplay/netmisc.h"
-#	include "../netplay/notify.h"
+#	include "netplay/notify.h"
 #endif
 #include "../races.h"
 #include "../setup.h"

sc2/src/uqm/tactrans.c

@@ -28,12 +28,12 @@
 #include "battle.h"
 #include "init.h"
 #ifdef NETPLAY
-#	include "netplay/netmelee.h"
+#	include "supermelee/netplay/netmelee.h"
-#	include "netplay/netmisc.h"
+#	include "supermelee/netplay/netmisc.h"
-#	include "netplay/notify.h"
+#	include "supermelee/netplay/notify.h"
-#	include "netplay/proto/ready.h"
+#	include "supermelee/netplay/proto/ready.h"
-#	include "netplay/packet.h"
+#	include "supermelee/netplay/packet.h"
-#	include "netplay/packetq.h"
+#	include "supermelee/netplay/packetq.h"
 #endif
 #include "races.h"
 #include "settings.h"