From 1abd249fdcc44dcff9e9e61d51ec596c7cff770d Mon Sep 17 00:00:00 2001 From: exterlulz Date: Fri, 20 Aug 2010 19:49:45 +0200 Subject: [PATCH] clean whitespace --- src/Game.m | 1 - src/GameController.m | 15 ++++----------- src/GameView.m | 1 - src/Gem.m | 30 +++++++++++++++--------------- src/OpenGLSprite.h | 2 -- src/OpenGLSprite.m | 1 - src/TimerView.h | 1 - src/TimerView.m | 4 +--- 8 files changed, 20 insertions(+), 35 deletions(-) diff --git a/src/Game.m b/src/Game.m index 32bd64e..51505a6 100644 --- a/src/Game.m +++ b/src/Game.m @@ -321,7 +321,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. return result; } - - (void) showAllBoardMoves { // test every possible move diff --git a/src/GameController.m b/src/GameController.m index 6e5a8d6..1cc52a2 100644 --- a/src/GameController.m +++ b/src/GameController.m @@ -200,7 +200,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. [op beginSheetForDirectory:[prefsCustomBackgroundFolderTextField stringValue] file:NULL types:NULL modalForWindow:prefsPanel modalDelegate:self didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:) contextInfo:NULL]; } - - (BOOL) validateMenuItem: (NSMenuItem*) aMenuItem { if (aMenuItem == easyGameMenuItem) @@ -724,7 +723,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. } } - - (void)tryMoveSwapping:(int)x1:(int)y1 and:(int)x2:(int)y2 { // do stuff here!!! @@ -833,24 +831,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. [self startAnimation:@selector(waitForFirstClick)]; } - -- (int) gameState -{ +- (int) gameState { return gameState; } -- (BOOL) gameIsPaused -{ +- (BOOL) gameIsPaused { return paused; } -- (BOOL) useCustomBackgrounds -{ +- (BOOL) useCustomBackgrounds { return useCustomBackgrounds; } -- (NSPoint) crossHair1Position -{ +- (NSPoint) crossHair1Position { return NSMakePoint(chx1*48,chy1*48); } diff --git a/src/GameView.m b/src/GameView.m index 2174563..38e62ba 100644 --- a/src/GameView.m +++ b/src/GameView.m @@ -449,7 +449,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. [self setNeedsDisplay:YES]; } - // drawRect: should be overridden in subclassers of NSView to do necessary // drawing in order to recreate the the look of the view. It will be called // to draw the whole view or parts of it (pay attention the rect argument); diff --git a/src/Gem.m b/src/Gem.m index 8b26227..baad1de 100644 --- a/src/Gem.m +++ b/src/Gem.m @@ -156,15 +156,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. _animationCounter = FADE_STEPS; } -- (void) fall +- (void)fall { - _state = GEMSTATE_FALLING; - // MW... - waitForFall= rand()%6; - // - vx = 0; - vy = 0; - _animationCounter = 1; + _state = GEMSTATE_FALLING; + // MW... + waitForFall= rand()%6; + + vx = 0; + vy = 0; + _animationCounter = 1; } // MW... @@ -188,12 +188,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. _animationCounter = GEM_ERUPT_DELAY; } -- (int) gemType -{ +- (int)gemType { return gemType; } -- (void) setGemType:(int) d -{ + +- (void)setGemType:(int)d { gemType = d; } @@ -244,6 +243,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. positionOnScreen.x = valx; positionOnScreen.y = valy; } + - (void) setVelocity:(int) valx :(int) valy :(int) steps { vx = valx; @@ -253,11 +253,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. _state = GEMSTATE_MOVING; } -- (NSPoint) positionOnBoard -{ +- (NSPoint) positionOnBoard { return positionOnBoard; } -- (void) setPositionOnBoard:(int) valx :(int) valy + +- (void)setPositionOnBoard:(int) valx :(int) valy { positionOnBoard.x = valx; positionOnBoard.y = valy; diff --git a/src/OpenGLSprite.h b/src/OpenGLSprite.h index 865e720..8a5b61e 100644 --- a/src/OpenGLSprite.h +++ b/src/OpenGLSprite.h @@ -24,8 +24,6 @@ NSSize size; } - - - (id) init; - (id) initWithImage:(NSImage *)textureImage cropRectangle:(NSRect)cropRect size:(NSSize) spriteSize; - (void) dealloc; diff --git a/src/OpenGLSprite.m b/src/OpenGLSprite.m index 42e2ecd..324f050 100644 --- a/src/OpenGLSprite.m +++ b/src/OpenGLSprite.m @@ -8,7 +8,6 @@ #import "OpenGLSprite.h" - @implementation OpenGLSprite - (id) init diff --git a/src/TimerView.h b/src/TimerView.h index f08b47f..7e671fb 100644 --- a/src/TimerView.h +++ b/src/TimerView.h @@ -58,5 +58,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - (void) setTimer:(float)value; - (float) meter; - @end diff --git a/src/TimerView.m b/src/TimerView.m index 0799b32..3aa70c7 100644 --- a/src/TimerView.m +++ b/src/TimerView.m @@ -156,10 +156,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. [self setNeedsDisplay:YES]; } -- (float) meter -{ +- (float) meter { return meter; } - @end -- 2.11.4.GIT