Added port-forwarding commands

Better server client initializing Better server-side map navigation
Ohmnivore · Jun 13, 2014 · 1db5002 · 1db5002
1 parent c05a7e4
commit 1db5002
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/Client/export/windows/cpp/bin/SkullRush.exe b/Client/export/windows/cpp/bin/SkullRush.exe
diff --git a/Client/source/PlayState.hx b/Client/source/PlayState.hx
@@ -68,13 +68,13 @@ class PlayState extends FlxState
 
 	public var cross:FlxCrosshairs;
 
-	public var buffer_string:String;
+	//public var buffer_string:String;
 
 	public function new(BufferString:String = null)
 	{
 		super();
 
-		buffer_string = BufferString;
+		//buffer_string = BufferString;
 	}
 
 	/**
@@ -160,10 +160,10 @@ class PlayState extends FlxState
 
 		m = new Mutex();
 
-		if (buffer_string != null)
-		{
-			loadMap("Test", buffer_string);
-		}
+		//if (buffer_string != null)
+		//{
+			//loadMap("Test", buffer_string);
+		//}
 	}
 
 	public function sendChatMsg():Void
@@ -202,13 +202,13 @@ class PlayState extends FlxState
 	public function onLoaded():Void
 	{
 		trace("Loaded external assets.");
-		if (buffer_string == null)
-		{
+		//if (buffer_string == null)
+		//{
 			Msg.PlayerInfo.data.set("name", Assets.config.get("name"));
 			Msg.PlayerInfo.data.set("team", Assets.config.get("team"));
 
 			Reg.client.send(Msg.PlayerInfo.ID, 1, ENet.ENET_PACKET_FLAG_RELIABLE);
-		}
+		//}
 	}
 
 	public function loadMap(MapName:String, MapString:String):Void

diff --git a/Client/source/SkullClient.hx b/Client/source/SkullClient.hx
@@ -151,8 +151,8 @@ class SkullClient extends Client
 		{
 			//if (Reg.state.collidemap != null)
 				//FlxG.switchState(new PlayState());
-			//Reg.state.loadMap(Msg.MapMsg.data.get("mapname"), Msg.MapMsg.data.get("mapstring"));
-			FlxG.switchState(new PlayState(Msg.MapMsg.data.get("mapstring")));
+			Reg.state.loadMap(Msg.MapMsg.data.get("mapname"), Msg.MapMsg.data.get("mapstring"));
+			//FlxG.switchState(new PlayState(Msg.MapMsg.data.get("mapstring")));
 		}
 
 		if (MsgID == Msg.PlayerInfoBack.ID)