From 93629927758c9381cd7a68deb53d91073ac166c8 Mon Sep 17 00:00:00 2001 From: exterlulz Date: Sat, 21 Aug 2010 11:34:06 +0200 Subject: [PATCH] clean some stuff --- src/Game.h | 22 +++++++++++----------- src/Gem.h | 38 ++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/Game.h b/src/Game.h index ffd1b6f..a5d9a45 100644 --- a/src/Game.h +++ b/src/Game.h @@ -25,17 +25,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @interface Game : NSObject { - // MW... - // - NSMutableArray *scoreBubbles; - // - Gem *board[8][8]; - int sx1,sy1,sx2,sy2, hintx, hinty; - int score, bonusMultiplier, gemsFaded; - // CASCADE BONUS - int cascade; - // - BOOL muted; + // MW... + NSMutableArray *scoreBubbles; + + Gem *board[8][8]; + int sx1,sy1,sx2,sy2, hintx, hinty; + int score, bonusMultiplier, gemsFaded; + + // CASCADE BONUS + int cascade; + + BOOL muted; } - (id) init; diff --git a/src/Gem.h b/src/Gem.h index d553976..fde949b 100644 --- a/src/Gem.h +++ b/src/Gem.h @@ -38,33 +38,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define GRAVITY 1.46 #define GEM_ERUPT_DELAY 45 -// // Open GL Z value for gems -// #define GEM_SPRITE_Z -0.25 -// @class OpenGLSprite; @interface Gem : NSObject { - int gemType; - NSImage *image; - - // Open GL - OpenGLSprite *sprite; - // - - NSSound *tink; - NSSound *sploink; - - // MW - int waitForFall; - - int _state; - int _animationCounter; - double vx, vy; - NSPoint positionOnScreen, positionOnBoard; + int gemType; + NSImage *image; + + // Open GL + OpenGLSprite *sprite; + + NSSound *tink; + NSSound *sploink; + + // MW + int waitForFall; + + int _state; + int _animationCounter; + double vx, vy; + NSPoint positionOnScreen, positionOnBoard; } @property int _state; @@ -90,10 +86,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - (NSImage *) image; - (void) setImage:(NSImage *) value; + - (void) drawImage; - (OpenGLSprite *) sprite; - (void) setSprite:(OpenGLSprite *) value; + - (void) drawSprite; - (NSPoint) positionOnScreen; -- 2.11.4.GIT