Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
peach-cgt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed (recently broken) mark/flip on client
[peach-cgt.git]
/
server.coffee
diff --git
a/server.coffee
b/server.coffee
index
4ae7fe7
..
82e4872
100644
(file)
--- a/
server.coffee
+++ b/
server.coffee
@@
-161,8
+161,8
@@
new_game = (id) ->
game.p1_queue = []
game.p2_queue = []
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) ->
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'
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'}
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'}