no network call in solo & no negative score

biou · Feb 12, 2014 · 0c969eb · 0c969eb
1 parent 3b2fc11
commit 0c969eb
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 34 deletions.
diff --git a/GGJ13/GGJ13/WHGameLayer.mm b/GGJ13/GGJ13/WHGameLayer.mm
@@ -23,7 +23,7 @@
 #define MAX_DURATION 8.0f
 #define BPM_MEDIAN 125
 
-#define RECORDING_MODE YES
+#define RECORDING_MODE NO
 
 
 // HelloWorldLayer implementation

diff --git a/GGJ13/GGJ13/WHGameScene.mm b/GGJ13/GGJ13/WHGameScene.mm
@@ -458,8 +458,9 @@ -(void) setScore:(int)s {
 -(void) incrementScore:(int)i {
  if (score+i < 0) {
  [self setScore:0];
+ } else {
+ [self setScore:score+i];
  }
- [self setScore:score+i];
 }
 
 -(void) updateHeaderScore {
@@ -581,19 +582,22 @@ - (void)sendData:(NSData *)data {
 
 - (void)sendRandomNumber {
 
- MessageRandomNumber message;
- message.message.messageType = kMessageTypeRandomNumber;
- message.randomNumber = ourRandom;
- NSData *data = [NSData dataWithBytes:&message length:sizeof(MessageRandomNumber)];
- [self sendData:data];
+ if (gameMode != MODE_SOLO) {
+ MessageRandomNumber message;
+ message.message.messageType = kMessageTypeRandomNumber;
+ message.randomNumber = ourRandom;
+ NSData *data = [NSData dataWithBytes:&message length:sizeof(MessageRandomNumber)];
+ [self sendData:data];
+ }
 }
 
 - (void)sendGameBegin {
-
- MessageGameBegin message;
- message.message.messageType = kMessageTypeGameBegin;
- NSData *data = [NSData dataWithBytes:&message length:sizeof(MessageGameBegin)];
- [self sendData:data];
+ if (gameMode != MODE_SOLO) {
+ MessageGameBegin message;
+ message.message.messageType = kMessageTypeGameBegin;
+ NSData *data = [NSData dataWithBytes:&message length:sizeof(MessageGameBegin)];
+ [self sendData:data];
+ }
 
 }
 
@@ -609,39 +613,45 @@ - (void)sendMove {
 */
 
 - (void)sendBPM:(uint32_t) val {
-
- MessageBPM message;
- message.message.messageType = kMessageTypeBPM;
- message.number = val;
- NSData *data = [NSData dataWithBytes:&message length:sizeof(MessageBPM)];
- [self sendData:data];
+ if (gameMode != MODE_SOLO) {
+ MessageBPM message;
+ message.message.messageType = kMessageTypeBPM;
+ message.number = val;
+ NSData *data = [NSData dataWithBytes:&message length:sizeof(MessageBPM)];
+ [self sendData:data];
+ }
 
 }
 
 - (void)sendJauge:(uint32_t) val {
- MessageJauge message;
- message.message.messageType = kMessageTypeJauge;
- message.number = val;
- NSData *data = [NSData dataWithBytes:&message length:sizeof(MessageJauge)];
- [self sendData:data];
+ if (gameMode != MODE_SOLO) {
+ MessageJauge message;
+ message.message.messageType = kMessageTypeJauge;
+ message.number = val;
+ NSData *data = [NSData dataWithBytes:&message length:sizeof(MessageJauge)];
+ [self sendData:data];
+ }
 }
 
 - (void)sendMange:(uint32_t) val {
- MessageMange message;
- message.message.messageType = kMessageTypeMange;
- message.number = val;
- NSData *data = [NSData dataWithBytes:&message length:sizeof(MessageMange)];
- [self sendData:data];
+ if (gameMode != MODE_SOLO) {
+ MessageMange message;
+ message.message.messageType = kMessageTypeMange;
+ message.number = val;
+ NSData *data = [NSData dataWithBytes:&message length:sizeof(MessageMange)];
+ [self sendData:data];
+ }
 }
 
 
 - (void)sendGameOver:(BOOL)player1Won {
-
- MessageGameOver message;
- message.message.messageType = kMessageTypeGameOver;
- message.player1Won = player1Won;
- NSData *data = [NSData dataWithBytes:&message length:sizeof(MessageGameOver)];
- [self sendData:data];
+ if (gameMode != MODE_SOLO) {
+ MessageGameOver message;
+ message.message.messageType = kMessageTypeGameOver;
+ message.player1Won = player1Won;
+ NSData *data = [NSData dataWithBytes:&message length:sizeof(MessageGameOver)];
+ [self sendData:data];
+ }
 
 }
 #pragma mark GCHelperDelegate