summaryrefslogtreecommitdiff
path: root/vfg/src/Asterisk.h
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2012-12-08 00:38:32 +0000
committerComment <tim@gray.(none)>2012-12-08 00:38:32 +0000
commit0bb92ced351b7fbba6e2e7036eae92037d08facf (patch)
tree41bda9d879baa35dcecc48c79db4819f42a8d5ca /vfg/src/Asterisk.h
parent11322afc79c2d36d5edecd0e6b38186f9f2dd867 (diff)
working on game logic
Diffstat (limited to 'vfg/src/Asterisk.h')
-rwxr-xr-xvfg/src/Asterisk.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/vfg/src/Asterisk.h b/vfg/src/Asterisk.h
index 5033a5c..8093213 100755
--- a/vfg/src/Asterisk.h
+++ b/vfg/src/Asterisk.h
@@ -4,10 +4,12 @@
#include "ofMain.h"
#include "ofxNetwork.h"
-#define IDLE 0
-#define WAITING 1
-#define STARTING 2
-#define PLAYING 3
+#define ASTERISK_IDLE 0
+#define ASTERISK_WAITING 1
+#define ASTERISK_STARTING 2
+#define ASTERISK_PLAYING 3
+#define ASTERISK_GAMESTARTED 1000
+#define ASTERISK_GAMEOVER 1001
class Asterisk: public ofThread
@@ -31,7 +33,6 @@ class Asterisk: public ofThread
void endGame(string score);
int update();
int state;
- bool isPlaying;
int queued;
protected: