summaryrefslogtreecommitdiff
path: root/public/js/game.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2013-03-04 16:14:46 -0500
committerJules Laplace <jules@okfoc.us>2013-03-04 16:14:46 -0500
commit915f6f2bf830260301d8117a2233e5d2c7788c34 (patch)
tree6f53e80d021a0310c85b95718849046f8896b0a3 /public/js/game.js
parent8cc16aaa52e0ea7670a9a7e8bdca9deb002012e3 (diff)
moving things around
Diffstat (limited to 'public/js/game.js')
-rw-r--r--public/js/game.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/public/js/game.js b/public/js/game.js
index 1025d82..8aed496 100644
--- a/public/js/game.js
+++ b/public/js/game.js
@@ -4,7 +4,7 @@ var State = {
WAITING: 0,
DRAWING: 1,
VOTING: 2,
- WIN: 3,
+ WINNING: 3,
RESET: -1,
}
@@ -20,8 +20,8 @@ var Game = {
socket.on('event-part', Events.receive.part);
socket.on('event-message', Events.receive.message);
socket.on('event-state', Events.receive.state);
- socket.on('event-vote', Events.receive.vote);
socket.on('event-image', Events.receive.image);
+ socket.on('event-vote', Events.receive.vote);
Auth.init();
Chat.init();
}
@@ -30,7 +30,7 @@ var Game = {
var Events = {
receive: {
-
+
// Player connects to the game
welcome: function(data){
for (var i in data.messages) {
@@ -114,7 +114,7 @@ UI[ State.VOTING ] = {
}
}
-UI[ State.WIN ] = {
+UI[ State.WINNING ] = {
load: function(){
},
unload: function(){