From b3b575b6b6c881dad272f8c234767beb3afdfb1f Mon Sep 17 00:00:00 2001 From: exterlulz Date: Sun, 22 Aug 2010 09:37:51 +0200 Subject: [PATCH] rename GameController.animating property --- src/GameController.m | 4 ++-- src/GameView.h | 2 +- src/GameView.m | 12 +++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/GameController.m b/src/GameController.m index 30a6542..c1f2c40 100644 --- a/src/GameController.m +++ b/src/GameController.m @@ -601,7 +601,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // whatNext = andThenSelector; // - gameView._animating = YES; + gameView.animating = YES; // [animationTimerLock unlock]; } @@ -612,7 +612,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. [animationTimerLock lock]; // - gameView._animating = NO; + gameView.animating = NO; // [animationTimerLock unlock]; diff --git a/src/GameView.h b/src/GameView.h index 335e912..8fc2644 100644 --- a/src/GameView.h +++ b/src/GameView.h @@ -61,7 +61,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. BOOL _animating, showHighScores, paused, muted, animationStatus, showHint; } -@property BOOL _animating; +@property BOOL animating; - (void) graphicSetUp; - (void) loadImageArray; diff --git a/src/GameView.m b/src/GameView.m index 67e5f0e..408bcae 100644 --- a/src/GameView.m +++ b/src/GameView.m @@ -19,7 +19,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ----====----====----====----====----====----====----====----====----====---- */ -#include //#import //#import @@ -27,18 +26,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #import "GameController.h" #import "Game.h" #import "Gem.h" -// + // MW... -// #import "ScoreBubble.h" -// -// OpenGLSprites -// + #import "OpenGLSprite.h" +#include + @implementation GameView -@synthesize _animating; +@synthesize animating = _animating; - (id)initWithFrame:(NSRect)frame { -- 2.11.4.GIT