C coding style changes

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

diff --git a/src/sprite.c b/src/sprite.c
index 39c40fcc14125541d0399045e3297f7644cf70f0..52e7ac6063cb1d7304d7f5835565e55cab57b784 100644 (file)
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -26,9 +26,10 @@ Contact Details: colm@coralquest.com
 #include "sprite.h"
 
 /********************************************************************/
-void setBackground(SDL_Surface** screen, struct sprite** movie){
-
-SDL_Rect rect;
+static void
+setBackground(SDL_Surface **screen, struct sprite **movie)
+{
+    SDL_Rect rect;
 
        rect.x = (*movie)->x;
        rect.y = (*movie)->y;
@@ -40,9 +41,10 @@ SDL_Rect rect;
 }
 
 /********************************************************************/
-void showSprite(SDL_Surface** screen, struct sprite** movie){
-
-SDL_Rect rect;
+static void
+showSprite(SDL_Surface **screen, struct sprite **movie)
+{
+    SDL_Rect rect;
 
        rect.x = (*movie)->x;
        rect.y = (*movie)->y;
@@ -55,9 +57,10 @@ SDL_Rect rect;
 }
 
 /********************************************************************/
-void resetBackground(SDL_Surface** screen, struct sprite** movie){
-
-SDL_Rect rect;
+static void
+resetBackground(SDL_Surface** screen, struct sprite** movie)
+{
+    SDL_Rect rect;
 
        rect.x = (*movie)->x;
        rect.y = (*movie)->y;
@@ -76,6 +79,7 @@ isSpriteMoving(struct sprite *p)
     /* returns true if this sprite needs to move */
        return (p->y != p->toY) ||  (p->x != p->toX);
 }
+
 int
 anySpritesMoving(struct sprite **letters)
 {
@@ -88,11 +92,12 @@ anySpritesMoving(struct sprite **letters)
 }
 
 /********************************************************************/
-void moveSprite(SDL_Surface** screen, struct sprite** movie, int letterSpeed){
-
-int i;
-int x, y;
-int Xsteps;
+static void
+moveSprite(SDL_Surface** screen, struct sprite** movie, int letterSpeed)
+{
+    int i;
+    int x, y;
+    int Xsteps;
 
        // move a sprite from it's curent location to the new location
        if( (  (*movie)->y != (*movie)->toY )  ||  (   (*movie)->x != (*movie)->toX )   ){
@@ -131,9 +136,10 @@ int Xsteps;
 }
 
 /********************************************************************/
-void moveSprites(SDL_Surface** screen, struct sprite** letters, int letterSpeed){
-
-struct sprite* current;
+void
+moveSprites(SDL_Surface** screen, struct sprite** letters, int letterSpeed)
+{
+    struct sprite* current;
 
        current= *letters;
        while(current!=NULL){
@@ -154,18 +160,24 @@ struct sprite* current;
 }
 
 /********************************************************************/
-void destroyLetters(struct sprite** letters){
-struct sprite* current = *letters;
-struct sprite* previous = NULL;
-
-       while(current!=NULL){
+void
+destroyLetters(struct sprite **letters)
+{
+    struct sprite *current = *letters;
+       while (current != NULL) {
+               struct sprite *tmp = current;
                SDL_FreeSurface(current->sprite);
                SDL_FreeSurface(current->replace);
-               previous = current;
                current = current->next;
-               free(previous);
+               free(tmp);
        }
-
-       (*letters)=NULL;
-
+       *letters = NULL;
 }
+
+/*
+ * Local variables:
+ * mode: c
+ * indent-tabs-mode: nil
+ * c-basic-offset: 4
+ * End:
+ */

diff --git a/src/sprite.h b/src/sprite.h
index 14aefbe54779fa2c54c3ddea95bbc8fa062b9698..16f889df54b6a75d078af4e9d1826766449a2dc8 100644 (file)
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -29,7 +29,7 @@ Contact Details: colm@coralquest.com
 #define BOX_START_X 80
 #define ANSWER_BOX_Y 243
 
-struct sprite{
+struct sprite {
        SDL_Surface* sprite;
        SDL_Surface* replace;
        char letter;
@@ -40,13 +40,7 @@ struct sprite{
        int box;
 };
 
-void setBackground(SDL_Surface** screen, struct sprite** movie);
-void showSprite(SDL_Surface** screen, struct sprite** movie);
-void resetBackground(SDL_Surface** screen, struct sprite** movie);
-void moveSprite(SDL_Surface** screen, struct sprite** movie, int letterSpeed);
 void moveSprites(SDL_Surface** screen, struct sprite** letters, int LetterSpeed);
-int nextBlankPosition(int box, int* index);
-//void clickDetect(int button, int x, int y, SDL_Surface *screen, struct sprite** letters);
-void destroyLetters(struct sprite** letters);
-//void buildLetters(struct sprite** letters, SDL_Surface* screen);
+int nextBlankPosition(int box, int *index);
+void destroyLetters(struct sprite **letters);
 int anySpritesMoving(struct sprite **letters);