Refactored Makefile

 * clean now only cleans up program, not graphics.
 * maintainer-clean cleans up everything.
Switched from getopt to argp for command-line parsing.
Also new command-line option --game-speed (-g N%).
Cleaned up some unnecessary stuff in config.h

diff --git a/Makefile b/Makefile
index 5c76c75..be17b46 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,12 @@ DATA_PREFIX = /usr/share/vor
 PROGRAM_PREFIX = /usr/games/bin
 
 
 PROGRAM_PREFIX = /usr/games/bin
 
 

-all: vor $(graphics)
+
+.PHONY: all clean graphics maintainer-clean install uninstall
+
+all: graphics vor
+
+graphics: $(graphics)

 
 %.o: %.c
        $(CC) $(cflags) -c -o $@ $<
 
 %.o: %.c
        $(CC) $(cflags) -c -o $@ $<

@@ -54,7 +59,10 @@ vor: $(objects)
 include gfx.mk
 
 clean:
 include gfx.mk
 
 clean:

-       rm -f *.o vor $(graphics)
+       rm -f *.o vor
+
+maintainer-clean: clean
+       rm -f $(graphics)

 
 install:       all
        if [ ! -d $(DATA_PREFIX) ]; then mkdir $(DATA_PREFIX); fi
 
 install:       all
        if [ ! -d $(DATA_PREFIX) ]; then mkdir $(DATA_PREFIX); fi

diff --git a/README b/README
index d7e9db4..7c6d86e 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Variations on Rockdodger
+Variations on Rockdodger 0.3

 
 VoR is a quick action game where you drive a space ship and try to avoid
 crashing into rocks. Current information about vor can be found on the
 
 VoR is a quick action game where you drive a space ship and try to avoid
 crashing into rocks. Current information about vor can be found on the

@@ -6,6 +6,8 @@ homepage: http://herkamire.com/jason/vor
 
 See INSTALL for instructions on building, running and installing.
 
 
 See INSTALL for instructions on building, running and installing.
 

+VoR is released under the GNU GPL -- see file COPYING for details.
+

 Jason Woofenden and Josh Grams like Rock Dodgers
 (http://spacerocks.sourceforge.net/) very much: both playing it and hacking on
 it. VoR is the result. It is currently based on the rockdodger 0.4.2 codebase,
 Jason Woofenden and Josh Grams like Rock Dodgers
 (http://spacerocks.sourceforge.net/) very much: both playing it and hacking on
 it. VoR is the result. It is currently based on the rockdodger 0.4.2 codebase,

@@ -20,10 +22,9 @@ Note: This is a fairly hard game, intended to be a quickie game for when you
 want to kill a few spare minutes. For reference, my best time [Josh Grams] is
 about 2 minutes in version 0.3. I'm not generally very good at video games, but
 I have been playing this one for quite a while now. However, you can make it
 want to kill a few spare minutes. For reference, my best time [Josh Grams] is
 about 2 minutes in version 0.3. I'm not generally very good at video games, but
 I have been playing this one for quite a while now. However, you can make it

-substantially easier by slowing the game down. New in version 0.2, we have a
-constant GAMESPEED in config.h. New players may like to try it at 3/4 or even
-2/3 speed.  It should probably be a command-line option, but I'm too lazy to
-fix that right now.
+substantially easier by slowing the game down. New in version 0.4, we have a
+command-line option --game-speed=N%.  New players may like to try it at 0.75 or
+even 0.66.

 
 Changes from Rock Dodgers
 
 
 Changes from Rock Dodgers
 

@@ -46,6 +47,8 @@ User-Visible Changes:
   * Fully random rock generation; rocks no longer wrap vertically.
   * Rocks' relative speeds are now uniform in all directions (i.e. much more
     up/down speed variation).  Noticeably hard...err...more "interesting".
   * Fully random rock generation; rocks no longer wrap vertically.
   * Rocks' relative speeds are now uniform in all directions (i.e. much more
     up/down speed variation).  Noticeably hard...err...more "interesting".

+0.4:
+  * Command-line option --game-speed.

 
 Internal Technical Changes:
 
 
 Internal Technical Changes:
 

diff --git a/config.h b/config.h
index c10d2e6..c815082 100644 (file)
--- a/config.h
+++ b/config.h
@@ -3,14 +3,9 @@
 
 #define debug(x) if(DEBUG) { x; }
 
 
 #define debug(x) if(DEBUG) { x; }
 

-#define VERSION "0.3"
+#define VERSION "0.4pre"

 #define DATA_PREFIX "/usr/share/vor"
 
 #define DATA_PREFIX "/usr/share/vor"
 

-// Speed of the game.  New players may like to try 3/4 or 2/3 speed.
-#define GAMESPEED 1.00
-// #define GAMESPEED (3.0/4.0)
-// #define GAMESPEED (2.0/3.0)
-

 // screen size
 #define XSIZE 640
 #define YSIZE 480
 // screen size
 #define XSIZE 640
 #define YSIZE 480

@@ -23,9 +18,7 @@
 #define F_ROCKS 45
 
 #define MAXROCKS 120 // MAX Rocks
 #define F_ROCKS 45
 
 #define MAXROCKS 120 // MAX Rocks

-#define MAXROCKHEIGHT 100

 #define ROCKRATE 2
 #define ROCKRATE 2

-#define MAXBLACKPOINTS 500

 #define MAXENGINEDOTS 5000
 #define MAXBANGDOTS 50000
 #define MAXSPACEDOTS 2000
 #define MAXENGINEDOTS 5000
 #define MAXBANGDOTS 50000
 #define MAXSPACEDOTS 2000

diff --git a/debug.c b/debug.c
index 3153bf3..c59dcbb 100644 (file)
--- a/debug.c
+++ b/debug.c
@@ -1,6 +1,8 @@
 #include "debug.h"
 #include "debug.h"

+#include "shape.h"

 
 #include <stdio.h>
 
 #include <stdio.h>

+#include <stdint.h>

 
 void
 printf_surface(SDL_Surface *s, char *name)
 
 void
 printf_surface(SDL_Surface *s, char *name)

diff --git a/globals.h b/globals.h
index 35c77f5..a682d47 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -53,6 +53,14 @@ extern struct enginedots edot[MAXENGINEDOTS], *dotptr;
 extern struct bangdots bdot[MAXBANGDOTS], *bdotptr;
 extern struct spacedot sdot[MAXSPACEDOTS];
 
 extern struct bangdots bdot[MAXBANGDOTS], *bdotptr;
 extern struct spacedot sdot[MAXSPACEDOTS];
 

+// command-line arguments
+extern int opt_fullscreen;
+extern int opt_sound;
+extern int opt_music;
+extern float opt_gamespeed;
+extern int opt_tail_engine;
+extern int opt_friction;
+

 // Other global variables
 extern char topline[1024];
 extern char *initerror;
 // Other global variables
 extern char topline[1024];
 extern char *initerror;

@@ -69,9 +77,6 @@ extern float scrollvel;
 extern int nships,score,initticks,ticks_since_last, last_ticks;
 extern int gameover;
 extern int maneuver;
 extern int nships,score,initticks,ticks_since_last, last_ticks;
 extern int gameover;
 extern int maneuver;

-extern int sound_flag, music_flag;
-extern int tail_plume; // display big engine at the back?
-extern int friction;   // should there be friction?

 extern float fadetimer, faderate;
 
 extern int pausedown, paused;
 extern float fadetimer, faderate;
 
 extern int pausedown, paused;

diff --git a/main.c b/main.c
index daa2471..359e59f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -31,6 +31,7 @@
 #include "shape.h"
 #include "sound.h"
 
 #include "shape.h"
 #include "sound.h"
 

+#include <argp.h>

 #include <math.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_image.h>
 #include <math.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_image.h>

@@ -38,7 +39,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <unistd.h>

 
 #include "SFont.h"
 
 
 #include "SFont.h"
 

@@ -68,6 +68,32 @@ struct spacedot sdot[MAXSPACEDOTS];
 char topline[1024];
 char *initerror = "";
 
 char topline[1024];
 char *initerror = "";
 

+// Command-line argument parsing
+int opt_fullscreen;
+int opt_sound;
+int opt_music;
+float opt_gamespeed;
+int opt_tail_engine;
+int opt_friction;
+
+const char *argp_program_version = "Variations on Rockdodger " VERSION;
+const char *argp_program_bug_address = "<josh@qualdan.com>";
+static char doc[] = "VoR: Dodge the rocks until you die.";
+static struct argp_option opts[] = {
+       {0, 0, 0, 0, "Basic Options:", 0},
+       {"full-screen", 'f', 0, 0, "", 0},
+       {"music", 'm', 0, 0, "Enable music", 0},
+       {"silent", 's', 0, 0, "Turn off explosion sounds", 0},
+       {0, 0, 0, 0, "Gameplay Options:", 1},
+       {"game-speed", 'g', "N%", 0, "Game speed [50-100%]", 1},
+       {"engine", 'e', 0, 0, "Display large tail plume", 1},
+       {"old-physics", 'p', 0, 0, "Original physics (i.e. friction).", 1},
+       {0}
+};
+error_t parse_opt(int, char*, struct argp_state *);
+static struct argp argp = { opts, &parse_opt, 0, doc };
+
+

 struct shape shipshape;
 float shipx = XSIZE/2, shipy = YSIZE/2;        // X position, 0..XSIZE
 float shipdx = 7.5, shipdy = 0.0;      // Change in X position per tick.
 struct shape shipshape;
 float shipx = XSIZE/2, shipy = YSIZE/2;        // X position, 0..XSIZE
 float shipdx = 7.5, shipdy = 0.0;      // Change in X position per tick.

@@ -77,12 +103,10 @@ float gamerate;  // this controls the speed of everything that moves.
 
 float bangx, bangy, bangdx, bangdy;
 
 
 float bangx, bangy, bangdx, bangdy;
 

-int nships,score,game_ticks,ticks_since_last,last_ticks;
+int nships,score,ticks_since_last,last_ticks;

 int gameover;
 int maneuver = 0;
 int gameover;
 int maneuver = 0;

-int sound_flag, music_flag;
-int tail_plume; // display big engine at the back?
-int friction;  // should there be friction?
+

 float fadetimer = 0, faderate;
 
 int pausedown = 0, paused = 0;
 float fadetimer = 0, faderate;
 
 int pausedown = 0, paused = 0;

@@ -104,7 +128,7 @@ float state_timeout = 600.0;
 #define NSEQUENCE 2
 char *sequence[] = {
        "Press SPACE to start",
 #define NSEQUENCE 2
 char *sequence[] = {
        "Press SPACE to start",

-       "http://qualdan.com/vor/"
+       "http://herkamire.com/jason/vor"

 };
 
 int bangdotlife, nbangdots;
 };
 
 int bangdotlife, nbangdots;

@@ -116,6 +140,38 @@ extern int optind, opterr, optopt;
 
 // ************************************* FUNCS
 
 
 // ************************************* FUNCS
 

+void
+init_opts(void)
+{
+       opt_fullscreen = 0;
+       opt_sound = 1;
+       opt_music = 0;
+       opt_gamespeed = 1.00; // Run game at full speed.
+       // These switch back to the old gameplay and are off by default.
+       opt_tail_engine = 0;
+       opt_friction = 0;
+}
+
+error_t
+parse_opt(int key, char *arg, struct argp_state *state)
+{
+       int i;
+
+       switch(key) {
+               case 'f': opt_fullscreen = 1; break;
+               case 'm': opt_music = 1; break;
+               case 's': opt_sound = 0; opt_music = 0; break;
+               case 'g': sscanf(arg, "%d%%", &i);
+                                 if(i < 50) i = 50; else if(i > 100) i = 100;
+                                 opt_gamespeed = (float)i / 100;
+                                 break;
+               case 'e': opt_tail_engine = 1; break;
+               case 'p': opt_friction = 1; break;
+               default: break;
+       }
+       return 0;
+}
+

 float
 rnd() {
        return (float)random()/(float)RAND_MAX;
 float
 rnd() {
        return (float)random()/(float)RAND_MAX;

@@ -292,7 +348,7 @@ create_engine_dots(int newdots) {
        int i;
        double theta,r,dx,dy;
 
        int i;
        double theta,r,dx,dy;
 

-       if(!tail_plume) return;
+       if(!opt_tail_engine) return;

 
        if(state == GAMEPLAY) {
                for(i = 0; i<newdots*gamerate; i++) {
 
        if(state == GAMEPLAY) {
                for(i = 0; i<newdots*gamerate; i++) {

@@ -396,7 +452,7 @@ drawdots(SDL_Surface *s) {
 }
 
 int
 }
 
 int

-init(int fullscreen) {
+init(void) {

 
        int i;
        SDL_Surface *temp;
 
        int i;
        SDL_Surface *temp;

@@ -406,16 +462,16 @@ init(int fullscreen) {
        if(!find_files()) exit(1);
        read_high_score_table();
 
        if(!find_files()) exit(1);
        read_high_score_table();
 

-       if(sound_flag) {
+       if(opt_sound) {

                // Initialize SDL with audio and video
                if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) != 0) {
                // Initialize SDL with audio and video
                if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) != 0) {

-                       sound_flag = 0;
+                       opt_sound = 0;

                        printf ("Can't open sound, starting without it\n");
                        atexit(SDL_Quit);
                } else {
                        atexit(SDL_Quit);
                        atexit(SDL_CloseAudio);
                        printf ("Can't open sound, starting without it\n");
                        atexit(SDL_Quit);
                } else {
                        atexit(SDL_Quit);
                        atexit(SDL_CloseAudio);

-                       sound_flag = init_sound();
+                       opt_sound = init_sound();

                }
        } else {
                // Initialize with video only
                }
        } else {
                // Initialize with video only

@@ -427,7 +483,7 @@ init(int fullscreen) {
 
        // Attempt to get the required video size
        flag = SDL_DOUBLEBUF | SDL_HWSURFACE;
 
        // Attempt to get the required video size
        flag = SDL_DOUBLEBUF | SDL_HWSURFACE;

-       if(fullscreen) flag |= SDL_FULLSCREEN;
+       if(opt_fullscreen) flag |= SDL_FULLSCREEN;

        surf_screen = SDL_SetVideoMode(XSIZE,YSIZE,16,flag);
 
        // Set the title bar text
        surf_screen = SDL_SetVideoMode(XSIZE,YSIZE,16,flag);
 
        // Set the title bar text

@@ -610,7 +666,7 @@ draw() {
                gamerate = 0;
        }
        else {
                gamerate = 0;
        }
        else {

-               gamerate = GAMESPEED*ticks_since_last/50.0;
+               gamerate = opt_gamespeed*ticks_since_last/50.0;

                if(state == GAMEPLAY) {
                        score += ticks_since_last;
                }
                if(state == GAMEPLAY) {
                        score += ticks_since_last;
                }

@@ -690,7 +746,7 @@ gameloop() {
                        new_rocks();
 
                        // FRICTION?
                        new_rocks();
 
                        // FRICTION?

-                       if(friction) {
+                       if(opt_friction) {

                                shipdx *= pow((double)0.9,(double)gamerate);
                                shipdy *= pow((double)0.9,(double)gamerate);
                        }
                                shipdx *= pow((double)0.9,(double)gamerate);
                                shipdy *= pow((double)0.9,(double)gamerate);
                        }

@@ -767,8 +823,6 @@ gameloop() {
 
                                reset_rocks();
 
 
                                reset_rocks();
 

-                               game_ticks = 0;
-

                                nships = 4;
                                score = 0;
 
                                nships = 4;
                                score = 0;
 

@@ -826,45 +880,11 @@ gameloop() {
 
 int
 main(int argc, char **argv) {
 
 int
 main(int argc, char **argv) {

-       int x, fullscreen;
-
-       fullscreen = 0;
-       tail_plume = 0;
-       friction = 0;
-       sound_flag = 1;
-       music_flag = 0;
-
-       while ((x = getopt(argc,argv,"efhmps")) >= 0) {
-               switch(x) {
-                       case 'e': // engine
-                               tail_plume = 1;
-                       break;
-                       case 'f': // fullscreen
-                               fullscreen = 1;
-                       break;
-                       case 'h': // help
-                               printf("Variations on RockDodger\n"
-                                      " -e big tail [E]ngine\n"
-                                      " -f [F]ull screen\n"
-                                      " -h this [H]elp message\n"
-                                      " -m enable [M]usic\n"
-                                      " -p original [P]hysics (friction)\n"
-                                      " -s [S]ilent (no sound)\n");
-                               exit(0);
-                       break;
-                       case 'm': // music
-                               music_flag = 1;
-                       case 'p': // physics
-                               friction = 1;
-                       break;
-                       case 's': // silent
-                               sound_flag = 0;
-                               music_flag = 0;
-                       break;
-               }
-       }
+       init_opts();
+
+       argp_parse(&argp, argc, argv, 0, 0, 0);

 
 

-       if(init(fullscreen)) {
+       if(init()) {

                printf ("ta: '%s'\n",initerror);
                return 1;
        }
                printf ("ta: '%s'\n",initerror);
                return 1;
        }

diff --git a/sound.c b/sound.c
index d522955..7a2ad22 100644 (file)
--- a/sound.c
+++ b/sound.c
@@ -1,7 +1,7 @@
 #include "sound.h"
 #include "config.h"
 
 #include "sound.h"
 #include "config.h"
 

-extern int sound_flag, music_flag;
+extern int opt_sound, opt_music;

 
 #define TUNE_TITLE_PAGE                0
 #define TUNE_GAMEPLAY          1
 
 #define TUNE_TITLE_PAGE                0
 #define TUNE_GAMEPLAY          1

@@ -72,7 +72,7 @@ init_sound() {
 
 void
 play_sound(int i)  {
 
 void
 play_sound(int i)  {

-       if(!sound_flag) return;
+       if(!opt_sound) return;

        debug(printf ("play sound %d on first free channel\n",i));
        Mix_PlayChannel(-1, wav[i], 0);
 }/*}}}*/
        debug(printf ("play sound %d on first free channel\n",i));
        Mix_PlayChannel(-1, wav[i], 0);
 }/*}}}*/

@@ -82,7 +82,7 @@ int playing=-1;
 
 void
 play_tune(int i) {/*{{{*/
 
 void
 play_tune(int i) {/*{{{*/

-       if(!music_flag) return;
+       if(!opt_music) return;

        if (playing==i)
        return;
        if (playing) {
        if (playing==i)
        return;
        if (playing) {