whitespace changes: return types in function definitions on previous line, deleted...

diff --git a/SFont.c b/SFont.c
index e5d7863..e77f01b 100644 (file)
--- a/SFont.c
+++ b/SFont.c
@@ -7,7 +7,8 @@ SFont_FontInfo InternalFont;
 int alpha=127;
 int font_height;
 
-Uint32 GetPixel(SDL_Surface *Surface, Sint32 X, Sint32 Y)
+Uint32
+GetPixel(SDL_Surface *Surface, Sint32 X, Sint32 Y)
 {
 
    Uint8  *bits;
@@ -46,7 +47,8 @@ Uint32 GetPixel(SDL_Surface *Surface, Sint32 X, Sint32 Y)
     return -1;
 }
 
-void InitFont2(SFont_FontInfo *Font)
+void
+InitFont2(SFont_FontInfo *Font)
 {
     int x = 0, i = 0;
 
@@ -70,13 +72,15 @@ void InitFont2(SFont_FontInfo *Font)
     SDL_SetColorKey(Font->Surface, SDL_SRCCOLORKEY, GetPixel(Font->Surface, 0, Font->Surface->h-1));
 }
 
-void InitFont(SDL_Surface *Font)
+void
+InitFont(SDL_Surface *Font)
 {
     InternalFont.Surface=Font;
     InitFont2(&InternalFont);
 }
 
-int SFont_wide(char *text) {
+int
+SFont_wide(char *text) {
     int i=0,xwide=0;
     int ofs;
     SFont_FontInfo *Font = &InternalFont;
@@ -93,11 +97,13 @@ int SFont_wide(char *text) {
     return xwide;
 }
 
-int SFont_height() {
+int
+SFont_height() {
     return InternalFont.Surface->h-1;
 }
 
-void PutString2(SDL_Surface *Surface, SFont_FontInfo *Font, int x, int y, char *text)
+void
+PutString2(SDL_Surface *Surface, SFont_FontInfo *Font, int x, int y, char *text)
 {
     int ofs;
     int i=0;
@@ -130,7 +136,8 @@ void PutString2(SDL_Surface *Surface, SFont_FontInfo *Font, int x, int y, char *
 // Return a new surface, with the text on it.
 // This surface is new, fresh, and must eventually be freed.
 // Create the new surface with the same colour system as a parent surface.
-SDL_Surface *new_Surface_PutString(SDL_Surface *parent, char *text) {
+SDL_Surface *
+new_Surface_PutString(SDL_Surface *parent, char *text) {
 
      Uint32 rmask = parent->format->Rmask;
      Uint32 gmask = parent->format->Gmask;
@@ -146,11 +153,13 @@ SDL_Surface *new_Surface_PutString(SDL_Surface *parent, char *text) {
     );
 }
 
-void PutString(SDL_Surface *Surface, int x, int y, char *text) {
+void
+PutString(SDL_Surface *Surface, int x, int y, char *text) {
     PutString2(Surface, &InternalFont, x, y, text);
 }
 
-int TextWidth2(SFont_FontInfo *Font, char *text)
+int
+TextWidth2(SFont_FontInfo *Font, char *text)
 {
     int x=0,i=0;
     unsigned char ofs = 0;
@@ -166,21 +175,25 @@ int TextWidth2(SFont_FontInfo *Font, char *text)
     return x+Font->CharPos[ofs+2]-Font->CharPos[ofs+1];
 }
 
-int TextWidth(char *text)
+int
+TextWidth(char *text)
 {
     return TextWidth2(&InternalFont, text);
 }
 
-void TextAlpha(int a) {
+void
+TextAlpha(int a) {
     alpha = a;
 }
 
-void XCenteredString2(SDL_Surface *Surface, SFont_FontInfo *Font, int y, char *text)
+void
+XCenteredString2(SDL_Surface *Surface, SFont_FontInfo *Font, int y, char *text)
 {
     PutString2(Surface, &InternalFont, Surface->w/2-TextWidth(text)/2, y, text);
 }
 
-void XCenteredString(SDL_Surface *Surface, int y, char *text)
+void
+XCenteredString(SDL_Surface *Surface, int y, char *text)
 {
     XCenteredString2(Surface, &InternalFont, y, text);
 }
@@ -188,7 +201,8 @@ void XCenteredString(SDL_Surface *Surface, int y, char *text)
 SDL_Surface *Back;
 char tmp[1024];
 
-void clearBuffer() {
+void
+clearBuffer() {
     SDL_Event event;
 
     // Delete the event buffer
@@ -198,7 +212,8 @@ void clearBuffer() {
     SDL_EnableUNICODE(1);
 }
 
-int SFont_Input2( SDL_Surface *Dest, SFont_FontInfo *Font, int x, int y, int PixelWidth, char *text)
+int
+SFont_Input2( SDL_Surface *Dest, SFont_FontInfo *Font, int x, int y, int PixelWidth, char *text)
 {
     SDL_Event event;
     int ch;
@@ -262,7 +277,8 @@ int SFont_Input2( SDL_Surface *Dest, SFont_FontInfo *Font, int x, int y, int Pix
        return 0;
 }
 
-int SFont_Input( SDL_Surface *Dest, int x, int y, int PixelWidth, char *text)
+int
+SFont_Input( SDL_Surface *Dest, int x, int y, int PixelWidth, char *text)
 {
     
     Back = SDL_AllocSurface(Dest->flags,

diff --git a/main.c b/main.c
index 51d8e9f..78c2ca0 100644 (file)
--- a/main.c
+++ b/main.c
@@ -24,7 +24,6 @@
 extern int font_height;
 void clearBuffer();
 
-// includes {{{
 #include "config.h"
 #include "file.h"
 #include "sound.h"
@@ -39,13 +38,9 @@ void clearBuffer();
 #include <unistd.h>
 
 #include "SFont.h"
-// }}}
-// constants {{{
-// }}}
-// macros {{{
+
 #define CONDERROR(a) if((a)) {initerror = strdup(SDL_GetError());return 1;}
 #define NULLERROR(a) CONDERROR((a) == NULL)
-// }}}
 
 // ************************************* STRUCTS
 struct rock_struct {
@@ -86,7 +81,7 @@ struct spacedot {
        float x,y,dx;
        Uint16 color;
 };
-// High score table {{{
+// High score table
 struct highscore {
        int score;
        char *name;
@@ -101,10 +96,9 @@ struct highscore {
        {2000,"Pad",0},
        {1500,"Pad",0}
 };
-// }}}
 
 // ************************************* VARS
-// SDL_Surface global variables {{{
+// SDL_Surface global variables
 SDL_Surface 
        *surf_screen,   // Screen
        *surf_b_variations, // "variations" banner
@@ -117,15 +111,15 @@ SDL_Surface
        *surf_rock[NROCKS],     // THE ROCKS
        *surf_deadrock[NROCKS], // THE DEAD ROCKS
        *surf_font_big; // The big font
-// }}}
-// Structure global variables {{{
+
+// Structure global variables
 struct enginedots edot[MAXENGINEDOTS], *dotptr = edot;
 struct rock_struct rock[MAXROCKS], *rockptr = rock;
 struct black_point_struct black_point[MAXBLACKPOINTS], *blackptr = black_point;
 struct bangdots bdot[MAXBANGDOTS], *bdotptr = bdot;
 struct spacedot sdot[MAXSPACEDOTS];
-// }}}
-// Other global variables {{{
+
+// Other global variables
 char topline[1024];
 char *initerror = "";
 char name[1024], debug1[1024];
@@ -180,7 +174,6 @@ Uint16 heatcolor[W*3];
 char *data_dir;
 extern char *optarg;
 extern int optind, opterr, optopt;
-// }}}
 
 float dist_sq(float x1, float y1, float x2, float y2)
 {
@@ -189,7 +182,8 @@ float dist_sq(float x1, float y1, float x2, float y2)
 
 // ************************************* FUNCS
 
-void read_high_score_table() {
+void
+read_high_score_table() {
        FILE *f;
        int i;
        
@@ -213,7 +207,8 @@ void read_high_score_table() {
        }
 }
 
-void write_high_score_table() {
+void
+write_high_score_table() {
        FILE *f;
        int i;
        
@@ -226,7 +221,9 @@ void write_high_score_table() {
                fclose(f);
        }
 }
-void snprintscore(char *s, size_t n, int score) {
+
+void
+snprintscore(char *s, size_t n, int score) {
        int min = score/60000;
        int sec = score/1000%60;
        int tenths = score%1000/100;
@@ -236,16 +233,22 @@ void snprintscore(char *s, size_t n, int score) {
                snprintf(s, n, " %2d.%d", sec, tenths);
        }
 }
-float rnd() {
+
+float
+rnd() {
        return (float)random()/(float)RAND_MAX;
 }
-void init_engine_dots() {
+
+void
+init_engine_dots() {
        int i;
        for(i = 0; i<MAXENGINEDOTS; i++) {
                edot[i].active = 0;
        }
 }
-void init_space_dots() {
+
+void
+init_space_dots() {
        int i,intensity;
        for(i = 0; i<MAXSPACEDOTS; i++) {
                float r;
@@ -263,7 +266,8 @@ void init_space_dots() {
        }
 }
 
-void makebangdots(int xbang, int ybang, int xvel, int yvel, SDL_Surface *s, int power) {
+void
+makebangdots(int xbang, int ybang, int xvel, int yvel, SDL_Surface *s, int power) {
 
        // TODO - stop generating dots after a certain amount of time has passed, to cope with slower CPUs.
        // TODO - generate and display dots in a circular buffer
@@ -319,7 +323,8 @@ void makebangdots(int xbang, int ybang, int xvel, int yvel, SDL_Surface *s, int
 
 }
 
-void draw_bang_dots(SDL_Surface *s) {
+void
+draw_bang_dots(SDL_Surface *s) {
        int i;
        int first_i, last_i;
        Uint16 *rawpixel;
@@ -362,7 +367,8 @@ void draw_bang_dots(SDL_Surface *s) {
 }
 
 
-void draw_space_dots(SDL_Surface *s) {
+void
+draw_space_dots(SDL_Surface *s) {
        int i;
        Uint16 *rawpixel;
        rawpixel = (Uint16 *) s->pixels;
@@ -385,7 +391,8 @@ void draw_space_dots(SDL_Surface *s) {
        }
 }
 
-void draw_engine_dots(SDL_Surface *s) {
+void
+draw_engine_dots(SDL_Surface *s) {
        int i;
        Uint16 *rawpixel;
        rawpixel = (Uint16 *) s->pixels;
@@ -408,7 +415,8 @@ void draw_engine_dots(SDL_Surface *s) {
        }
 }
 
-void create_engine_dots(int newdots) {
+void
+create_engine_dots(int newdots) {
        int i;
        double theta,r,dx,dy;
 
@@ -438,7 +446,8 @@ void create_engine_dots(int newdots) {
        }
 }
 
-void create_engine_dots2(int newdots, int m) {
+void
+create_engine_dots2(int newdots, int m) {
        int i;
        double theta, theta2, dx, dy, adx, ady;
 
@@ -493,7 +502,8 @@ void create_engine_dots2(int newdots, int m) {
        }
 }
 
-void drawdots(SDL_Surface *s) {
+void
+drawdots(SDL_Surface *s) {
        int m, scorepos, n;
 
        SDL_LockSurface(s);
@@ -533,7 +543,8 @@ void drawdots(SDL_Surface *s) {
        SDL_UnlockSurface(s);
 }
 
-int init(int fullscreen) {
+int
+init(int fullscreen) {
 
        int i,j;
        SDL_Surface *temp;
@@ -646,7 +657,9 @@ int init(int fullscreen) {
 
        return 0;
 }
-int draw() {
+
+int
+draw() {
        int i;
        SDL_Rect src,dest;
        struct black_point_struct *p;
@@ -665,38 +678,6 @@ int draw() {
        // Draw a fully black background
        SDL_FillRect(surf_screen,NULL,0);
 
-
-#ifdef DEBUG
-       // DEBUG {{{
-       // Show the current state
-       switch (state) {
-               case TITLE_PAGE:
-                       statedisplay = "title_page";
-               break;
-               case GAMEPLAY:
-                       statedisplay = "gameplay";
-               break;
-               case DEAD_PAUSE:
-                       statedisplay = "dead_pause";
-               break;
-               case GAME_OVER:
-                       statedisplay = "game_over";
-               break;
-               case HIGH_SCORE_ENTRY:
-                       statedisplay = "high_score_entry";
-               break;
-               case HIGH_SCORE_DISPLAY:
-                       statedisplay = "high_score_display";
-               break;
-               case DEMO:
-                       statedisplay = "demo";
-               break;
-       }
-       snprintf(buf,1024, "mode = %s", statedisplay);
-       PutString(surf_screen,0,YSIZE-50,buf);
-       // }}}
-#endif
-       
        // Draw the background dots
        drawdots(surf_screen);
 
@@ -908,7 +889,8 @@ int draw() {
        return bang;
 }
 
-int gameloop() {
+int
+gameloop() {
        int i = 0;
        Uint8 *keystate;
 

diff --git a/sound.c b/sound.c
index 7cf5486..aafff76 100644 (file)
--- a/sound.c
+++ b/sound.c
@@ -29,13 +29,14 @@ char *wav_file[] = {
        "sounds/bzboom.wav"
 };
 
-char *tune_file[] = {/*{{{*/
+char *tune_file[] = {
     "music/magic.mod",
     "music/getzznew.mod",
     "music/4est_fulla3s.mod"
-};/*}}}*/
+};
 
-int init_sound() {/*{{{*/
+int
+init_sound() {
     // Return 1 if the sound is ready to roll, and 0 if not.
 
     int i;
@@ -71,9 +72,10 @@ int init_sound() {/*{{{*/
     }
 
     return 1;
-}/*}}}*/
+}
 
-void play_sound(int i)  {/*{{{*/
+void
+play_sound(int i)  {
        if(!sound_flag) return;
 #ifdef DEBUG
     printf ("play sound %d on first free channel\n",i);
@@ -86,7 +88,8 @@ int playing=-1;
 
 #undef DEBUG
 
-void play_tune(int i) {/*{{{*/
+void
+play_tune(int i) {/*{{{*/
        if(!sound_flag || !music_flag) return;
     if (playing==i)
        return;
@@ -104,7 +107,7 @@ void play_tune(int i) {/*{{{*/
     Mix_VolumeMusic(music_volume[i]);
 
     playing = i;
-}/*}}}*/
+}
 
 /*
  *