X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=server.coffee;h=82e4872647421038536d6a4280454079f07d0c23;hb=46e1ca575f0a419dffac2dc652a7cae08410bff3;hp=4ae7fe779b718916a55b3491b367e8ca0a97f148;hpb=e39c3d01d9c40b425168f1f8dcb2d9ddef975808;p=peach-cgt.git

diff --git a/server.coffee b/server.coffee
index 4ae7fe7..82e4872 100644
--- a/server.coffee
+++ b/server.coffee
@@ -161,8 +161,8 @@ new_game = (id) ->
 	game.p1_queue = []
 	game.p2_queue = []
 
-	game.on 'move', (agent, card, x, y, z) ->
-		forward_events.call this, 'move', agent, card, x, y, z
+	game.on 'move', (agent, card, x, y, z, pile) ->
+		forward_events.call this, 'move', agent, card, x, y, z, pile
 	game.on 'mark', (agent, card, state) ->
 		forward_events.call this, 'mark', agent, card, state
 	game.on 'flip', (agent, card, state) ->
@@ -182,7 +182,7 @@ new_game = (id) ->
 
 test_init = ->
 	test_game = new_game 'test'
-	timeout 4000, ->
+	timeout 2, ->
 		test_game.set_cards 'server', [
 			{ text: "Wildabeast 2/2", x: 220, y: 200, owner: 'p2'}
 			{ text: "Boar 2/2", x: 360, y: 200, owner: 'p2', pile: 'p2_discard'}