1 files changed, 37 insertions, 41 deletions

diff --git a/server/server.lua b/server/server.lua
index 24b49ae..2da7988 100644
--- a/server/server.lua
+++ b/server/server.lua
@@ -6,6 +6,7 @@ local coords = require"common.coords"
 local Pos = coords.Pos
 local worldgen = require"worldgen"
 local MapS = require"map".MapS
+local Player=require'player'.Player
 local posix_time = require"posix.time"
 local posix_signal = require"posix.signal"
 
@@ -16,7 +17,6 @@ print(host:get_socket_address())
 
 -- sequential list of all players
 local playerlist = {}
-local nextid = 1
 
 -- this is maybe suboptimal
 -- but it is simplest for now
@@ -33,28 +33,12 @@ local function player_by_peer(peer)
 	return nil
 end
 
-local function random_color()
-	return {math.random(),math.random(),math.random()}
-end
-local function make_player(peer)
-	local p = {pos=Pos:make(0,0),color=random_color(),peer=peer,id=nextid}
-	nextid = nextid + 1
-	return p
-end
 
-local function player_info_part(player)
-	return {
-		id=player.id,
-		x=player.pos.x,
-		y=player.pos.y,
-		color=player.color,
-	}
-end
 local function player_join_packet(player)
-	return json.encode{t="join",pl=player_info_part(player)}
+	return json.encode{t="join",pl=player:info_part()}
 end
 local function player_you_packet(player)
-	return json.encode{t="you",pl=player_info_part(player)}
+	return json.encode{t="you",pl=player:info_part()}
 end
 local function player_leave_packet(player)
 	return json.encode{t="leave",id=player.id}
@@ -68,32 +52,44 @@ end
 
 local map = MapS:make()
 
+
+
+local function on_player_connect(ev)
+	local player = Player:make(ev.peer)
+	table.insert(playerlist, player)
+
+	player.peer:send(player_you_packet(player))
+
+	for i,otherplayer in ipairs(playerlist) do
+		if otherplayer ~= player then
+			player.peer:send(player_join_packet(otherplayer))
+			otherplayer.peer:send(player_join_packet(player))
+		end
+	end
+
+	print("connect",player.id,player.peer)
+end
+
+local function on_player_disconnect(ev)
+	local player,idx = player_by_peer(ev.peer)
+	if not player then error("sneeze"..ev.peer) end
+	table.remove(playerlist,idx)
+
+	for i,otherplayer in ipairs(playerlist) do
+		otherplayer.peer:send(player_leave_packet(player))
+	end
+
+	print("disconnect", player.id, player.peer)
+end
+	
+	
+
 local function handle_ev(ev)
 	-- handle network event
 	if ev.type == "connect" then
-		local player = make_player(ev.peer)
-		table.insert(playerlist,player)
-		print("connect",player.peer,player.id)
-		player.peer:send(player_you_packet(player))
-		local central_chunk = map:obtain(coords.ChunkPos:make(0,0))
-		player.peer:send(central_chunk:data_packet())
-
-		for i,otherplayer in ipairs(playerlist) do
-			if otherplayer ~= player then
-				-- tell new player about each other player
-				player.peer:send(player_join_packet(otherplayer))
-				-- tell each other player about new player
-				otherplayer.peer:send(player_join_packet(player))
-			end
-		end
+		on_player_connect(ev)
 	elseif ev.type == "disconnect" then
-		local player, idx = player_by_peer(ev.peer)
-		if not player then error("sneeze "..ev.peer) end
-		print("disconnect",player.peer,player.id)
-		table.remove(playerlist,idx)
-		for i,otherplayer in ipairs(playerlist) do
-			otherplayer.peer:send(player_leave_packet(player))
-		end
+		on_player_disconnect(ev)
 	elseif ev.type == "receive" then
 		local player = player_by_peer(ev.peer)
 		if not player then error("sneezey "..ev.peer) end