Fixed game over transition

Fixes #189

4 files changed, 43 insertions, 43 deletions

@@ -39,7 +39,7 @@
                 3F6C7EC613D6335A00C038FE /* 1up.wav in Resources */ = {isa = PBXBuildFile; fileRef = 3F6C7EC513D6335A00C038FE /* 1up.wav */; };
                 3F6C7EE113D636BE00C038FE /* rock.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F6C7EE013D636BE00C038FE /* rock.png */; };
                 3F6C7EE413D636CF00C038FE /* Rock.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F6C7EE313D636CF00C038FE /* Rock.m */; };
-                3F6C7EE913D6377D00C038FE /* GameOverLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F6C7EE813D6377D00C038FE /* GameOverLayer.m */; };
+                3F6C7EE913D6377D00C038FE /* GameOverScene.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F6C7EE813D6377D00C038FE /* GameOverScene.m */; };
                 3F6C7F2413D63E6500C038FE /* SeaBeach.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F6C7F2313D63E6500C038FE /* SeaBeach.png */; };
                 3F6C7F4B13D647A600C038FE /* GameOver.png in Resources */ = {isa = PBXBuildFile; fileRef = 3F6C7F4A13D647A600C038FE /* GameOver.png */; };
                 3F6C7F5B13D648CE00C038FE /* helvetica2.fnt in Resources */ = {isa = PBXBuildFile; fileRef = 3F6C7F5913D648CE00C038FE /* helvetica2.fnt */; };
@@ -342,8 +342,8 @@
                 3F6C7EE013D636BE00C038FE /* rock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = rock.png; sourceTree = "<group>"; };
                 3F6C7EE213D636CF00C038FE /* Rock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Rock.h; sourceTree = "<group>"; };
                 3F6C7EE313D636CF00C038FE /* Rock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Rock.m; sourceTree = "<group>"; };
-                3F6C7EE713D6377D00C038FE /* GameOverLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GameOverLayer.h; sourceTree = "<group>"; };
-                3F6C7EE813D6377D00C038FE /* GameOverLayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameOverLayer.m; sourceTree = "<group>"; };
+                3F6C7EE713D6377D00C038FE /* GameOverScene.h */ = {isa = PBXFileReference; fileEncoding = 4; path = GameOverScene.h; sourceTree = "<group>"; };
+                3F6C7EE813D6377D00C038FE /* GameOverScene.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GameOverScene.m; sourceTree = "<group>"; };
                 3F6C7F2313D63E6500C038FE /* SeaBeach.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = SeaBeach.png; sourceTree = "<group>"; };
                 3F6C7F4A13D647A600C038FE /* GameOver.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = GameOver.png; sourceTree = "<group>"; };
                 3F6C7F5913D648CE00C038FE /* helvetica2.fnt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = helvetica2.fnt; sourceTree = "<group>"; };
@@ -702,8 +702,8 @@
                                 E0F81037120A173C005866B8 /* RootViewController.m */,
                                 1F3B9A2C0EF2145700286867 /* Cart_CollectAppDelegate.h */,
                                 507022A2107672FA00393637 /* Cart_CollectAppDelegate.m */,
-                                3F6C7EE713D6377D00C038FE /* GameOverLayer.h */,
-                                3F6C7EE813D6377D00C038FE /* GameOverLayer.m */,
+                                3F6C7EE713D6377D00C038FE /* GameOverScene.h */,
+                                3F6C7EE813D6377D00C038FE /* GameOverScene.m */,
                                 3F83955213D739B10059AEE8 /* MainMenuLayer.m */,
                                 3F83955113D739B10059AEE8 /* MainMenuLayer.h */,
                                 3F03221413D78F8C00E6A708 /* HighscoreListController.h */,
@@ -1398,7 +1398,7 @@
                                 3F6C7C7013D5E54E00C038FE /* Bottle.m in Sources */,
                                 3F6C7C7313D5E57100C038FE /* OneUp.m in Sources */,
                                 3F6C7EE413D636CF00C038FE /* Rock.m in Sources */,
-                                3F6C7EE913D6377D00C038FE /* GameOverLayer.m in Sources */,
+                                3F6C7EE913D6377D00C038FE /* GameOverScene.m in Sources */,
                                 3F83955313D739B10059AEE8 /* MainMenuLayer.m in Sources */,
                                 3F03221613D78F8C00E6A708 /* HighscoreListController.m in Sources */,
                                 3F03221913D7904E00E6A708 /* Highscore.m in Sources */,
@@ -12,7 +12,7 @@
 #import "Bottle.h"
 #import "OneUp.h"
 #import "Rock.h"
-#import "GameOverLayer.h"
+#import "GameOverScene.h"
 #import "SimpleAudioEngine.h"
 
 @implementation ClassicGameMode
@@ -27,7 +27,7 @@
         {
         [self unscheduleAllSelectors];
 
-        [[CCDirector sharedDirector] replaceScene:[CCTransitionSlideInT transitionWithDuration:1.5f scene:[GameOverLayer sceneWithScore:score]]];
+        [[CCDirector sharedDirector] replaceScene:[CCTransitionSlideInT transitionWithDuration:1.5f scene:[GameOverScene sceneWithScore:score]]];
         } else if (score > lastScore)
         {
                 if ((lastScore < 6500) && (score >= 6500))
@@ -9,7 +9,9 @@
 #import <Foundation/Foundation.h>
 #import "cocos2d.h"
 
-@interface GameOverLayer : CCLayer <UITextFieldDelegate, UIAlertViewDelegate> {
+@interface GameOverScene : CCScene <UITextFieldDelegate, UIAlertViewDelegate> {
+    CCLayer* theLayer;
+    UIView* movingLayer;
     UILabel* scoreField;
         UITextField* textField;
     UISwitch* submitSwitch;
@@ -18,7 +20,7 @@
         int score;
 }
 
-+ (CCScene*)sceneWithScore:(int)score;
++ (GameOverScene*)sceneWithScore:(int)score;
 - (id)initWithScore:(int)score;
 - (void)newgame;
 - (void)submitScore;
@@ -6,85 +6,80 @@
 //  Copyright 2011 __MyCompanyName__. All rights reserved.
 //
 
-#import "GameOverLayer.h"
+#import "GameOverScene.h"
 #import "Cart_CollectAppDelegate.h"
 #import <sqlite3.h>
 #import "cocoslive.h"
 #import "MainMenuLayer.h"
 
-@implementation GameOverLayer
+@implementation GameOverScene
 
-+ (CCScene*)sceneWithScore:(int)score
++ (GameOverScene*)sceneWithScore:(int)score
 {
-        CCScene* scene = [CCScene node];
-        
-        CCLayerColor* backgroundLayer = [CCLayerColor layerWithColor:ccc4(255, 255, 255, 255)];
-        [scene addChild:backgroundLayer];
-        
-        GameOverLayer* layer = [[[GameOverLayer alloc] initWithScore:score] autorelease];
-        [scene addChild:layer];
-        
-        return scene;
+    return [[[GameOverScene alloc] initWithScore:score] autorelease];
 }
 
 - (id)initWithScore:(int)score2
 {
-        self = [super init];
+    self = [super init];
         
         if (nil != self)
         {
+        CCLayerColor* backgroundLayer = [CCLayerColor layerWithColor:ccc4(255, 255, 255, 255)];
+        [self addChild:backgroundLayer];
+        
+        theLayer = [CCLayer node];
+        [self addChild:theLayer];
+        
                 CCSprite* backgroundImage = [CCSprite spriteWithFile:@"Morning1.png"];
                 backgroundImage.position = ccp(240, 160);
-                [self addChild:backgroundImage z:0];
+                [theLayer addChild:backgroundImage z:0];
 
                 score = score2;
         
-        scoreField = [[UILabel alloc] initWithFrame:CGRectMake(205, 320-200-320, 0, 0)];
+        movingLayer = [[UIView alloc] initWithFrame:CGRectMake(0, -320, 480, 320)];
+        movingLayer.backgroundColor = [UIColor clearColor];
+        [[[CCDirector sharedDirector] openGLView] addSubview:movingLayer];
+        
+        scoreField = [[UILabel alloc] initWithFrame:CGRectMake(205, 320-200, 0, 0)];
         [scoreField setFont:[UIFont systemFontOfSize:20.0f]];
         [scoreField setBackgroundColor:[UIColor clearColor]];
         [scoreField setText:[NSString stringWithFormat:@"%d", score2]];
         CGSize labelSize = [scoreField.text sizeWithFont:scoreField.font constrainedToSize:CGSizeMake(160, 31) lineBreakMode:UILineBreakModeClip];
         [scoreField setFrame:CGRectMake(scoreField.frame.origin.x, scoreField.frame.origin.y, labelSize.width, labelSize.height)];
-        [[[CCDirector sharedDirector] openGLView] addSubview:scoreField];
+        [movingLayer addSubview:scoreField];
                 
-                textField = [[UITextField alloc] initWithFrame:CGRectMake(205, 320-247-320, 216, 31)];
+                textField = [[UITextField alloc] initWithFrame:CGRectMake(205, 320-247, 216, 31)];
         [textField setFont:[UIFont systemFontOfSize:20.0f]];
         [textField setBackgroundColor:[UIColor clearColor]];
                 [textField setDelegate:self];
                 NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults];
                 [textField setText:[defaults objectForKey:@"username"]];
-        [[[CCDirector sharedDirector] openGLView] addSubview:textField];
+        [movingLayer addSubview:textField];
         
-        submitSwitch = [[UISwitch alloc] initWithFrame:CGRectMake(211, 320-161-320, 0, 0)];
+        submitSwitch = [[UISwitch alloc] initWithFrame:CGRectMake(211, 320-161, 0, 0)];
         [submitSwitch setOn:[defaults boolForKey:@"submitScore"]];
-        [[[CCDirector sharedDirector] openGLView] addSubview:submitSwitch];
+        [movingLayer addSubview:submitSwitch];
         
         activityIndicator = [[UIActivityIndicatorView alloc] initWithFrame:CGRectMake(480-20-10, 320-20-10, 20, 20)];
-        [[[CCDirector sharedDirector] openGLView] addSubview:activityIndicator];
+        [movingLayer addSubview:activityIndicator];
                 
         backButton = [UIButton buttonWithType:UIButtonTypeRoundedRect];
-        [backButton setFrame:CGRectMake(240-154/2, 320-60-15-320, 154, 31)];
+        [backButton setFrame:CGRectMake(240-154/2, 320-60-15, 154, 31)];
         [backButton setTitle:@"Back to Main Menu" forState:UIControlStateNormal];
         [backButton addTarget:self action:@selector(newgame) forControlEvents:UIControlEventTouchUpInside];
         [backButton.titleLabel setFont:[UIFont systemFontOfSize:16.0]];
         [backButton.titleLabel setTextColor:[UIColor blackColor]];
-        
-        [[[CCDirector sharedDirector] openGLView] addSubview:backButton];
+        [movingLayer addSubview:backButton];
         }
         
         return self;
 }
 
-- (void)onEnter
+- (void)setPosition:(CGPoint)position
 {
-    [UIView beginAnimations:nil context:NULL];
-    [UIView setAnimationDuration:1.5f];
-    [UIView setAnimationCurve:UIViewAnimationCurveLinear];
-    scoreField.transform = CGAffineTransformMakeTranslation(0, 320);
-    textField.transform = CGAffineTransformMakeTranslation(0, 320);
-    submitSwitch.transform = CGAffineTransformMakeTranslation(0, 320);
-    backButton.transform = CGAffineTransformMakeTranslation(0, 320);
-    [UIView commitAnimations];
+    [super setPosition:position];
+    movingLayer.center = CGPointMake(240, 160-position.y);
 }
 
 - (void)newgame
@@ -192,6 +187,9 @@
     [activityIndicator release];
     
     [backButton removeFromSuperview];
+    
+    [movingLayer removeFromSuperview];
+    [movingLayer release];
         
         [[CCDirector sharedDirector] replaceScene:[MainMenuLayer scene]];
 }