setting a lobby state

src/WhateverThatWorksToo.as

@@ -1,13 +1,16 @@
 package
 {
-	import org.flixel.*;
 	import game.GameState;
+
+	import net.*;
+
+	import org.flixel.*;
 	[SWF(width="512", height="512", backgroundColor="#FF00FF")]
 
 	public class WhateverThatWorksToo extends FlxGame {
 
 		public function WhateverThatWorksToo() {
-			super(256,256, GameState, 2);
+			super(256,256, LobbyState.wrap(GameState), 2);
 		}
 	}
 }

src/game/GameState.as

@@ -2,9 +2,9 @@ package game {
 
     import flash.display.*;
     import flash.utils.*;
-	
+    
     import org.flixel.*;
-    import net.*;
+
 
 	public class GameState extends FlxState {
 
@@ -21,8 +21,6 @@ package game {
         [Embed (source = "../../data/sprites/hit_block.png")] private var hittableTile:Class;
         [Embed (source = "../../data/maps/mariobros.tmx", mimeType = "application/octet-stream")] private var marioMap:Class;
 
-		public static var status:FlxText;
-		public var lobby:Lobby;
 
 		public function GameState() {
 
@@ -94,17 +92,6 @@ package game {
 			playerGroup.add( new Player(4*16,9*16,1) );
 			playerGroup.add( new Player(11*16,9*16,3) );   
 
-			var params:Object = LoaderInfo(this.root.loaderInfo).parameters;
-			var players:Number;
-			if (params.hasOwnProperty('players')) {
-				players = int(params['players']);
-			} else {
-				players = 2;
-			}
-
-			status = new FlxText(5, 5, 400, "Connecting...");
-			add(status);
-			lobby = new Lobby(BaseClient, BaseHost, players);
 
             super.create();
         }

src/net/BaseClient.as

@@ -25,11 +25,11 @@ package net
 
 		public function onConnect():void {
 			FlxG.log("Joining: "+connection.farID);
-			GameState.status.text = "Waiting for players...";
+			LobbyState.status.text = "Waiting for players...";
 		}
 
 		public function say(data:String):void {
-			GameState.status.text = data;
+			LobbyState.status.text = data;
 			FlxG.log(data);
 		}
 

src/net/BaseHost.as

@@ -21,9 +21,8 @@ package net
 		public function onConnect(clients:Array, peer:NetStream):void {
 			FlxG.log("Player connected: "+peer.farID);
 			if (clients.length == lobby.size) {
-				FlxG.log("Ready");
 				send("say", "Let's play!");
-				send("start");
+				FlxG.state = new LobbyState.gameState();
 			}
 		}
 

src/net/LobbyState.as

@@ -0,0 +1,40 @@
+package net
+{
+	import flash.display.*;
+	import flash.utils.*;
+
+	import org.flixel.*;
+
+	public class LobbyState extends FlxState {
+
+		public static var status:FlxText;
+		public static var gameState:Class;
+
+		public var lobby:Lobby;
+
+		public function LobbyState() {
+		}
+
+		override public function create():void {
+			status = new FlxText(5, 5, 400, "Connecting...");
+			add(status);
+
+			var params:Object = LoaderInfo(this.root.loaderInfo).parameters;
+			var players:Number;
+			if (params.hasOwnProperty('players')) {
+				players = int(params['players']);
+			} else {
+				players = 2;
+			}
+
+			lobby = new Lobby(BaseClient, BaseHost, players);
+
+			super.create();
+		}
+
+		public static function wrap(State:Class):Class {
+			gameState = State;
+			return LobbyState;
+		} 
+	}
+}