JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
Refactored Makefile
[vor.git] / main.c
diff --git a/main.c b/main.c
index 61b2caa..359e59f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -31,6 +31,7 @@
 #include "shape.h"
 #include "sound.h"
 
+#include <argp.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 <unistd.h>
 
 #include "SFont.h"
 
@@ -55,6 +55,7 @@ SDL_Surface
        *surf_life,     // Indicator of number of ships remaining
        *surf_rock[NROCKS],     // THE ROCKS
        *surf_font_big; // The big font
+       
 
 SFont_Font *g_font;
 
@@ -67,21 +68,45 @@ struct spacedot sdot[MAXSPACEDOTS];
 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 = 8, shipdy = 0;  // Change in X position per tick.
+float shipdx = 7.5, shipdy = 0.0;      // Change in X position per tick.
 float screendx = 7.5, screendy = 0.0;
 float xscroll, yscroll;
 float gamerate;  // this controls the speed of everything that moves.
 
 float bangx, bangy, bangdx, bangdy;
 
-int nships,score,ticks_since_last, last_ticks;
+int nships,score,ticks_since_last,last_ticks;
 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;
@@ -103,7 +128,7 @@ float state_timeout = 600.0;
 #define NSEQUENCE 2
 char *sequence[] = {
        "Press SPACE to start",
-       "http://qualdan.com/vor/"
+       "http://herkamire.com/jason/vor"
 };
 
 int bangdotlife, nbangdots;
@@ -115,6 +140,38 @@ extern int optind, opterr, optopt;
 
 // ************************************* 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;
@@ -205,6 +262,7 @@ draw_bang_dots(SDL_Surface *s) {
        rawpixel = (Uint16 *) s->pixels;
 
        first_i = -1;
+       last_i = 0;
 
        for(i = bd1; (bd1 <= bd2)?(i<bd2):(i >= bd1 && i < bd2); last_i = ++i) {
 
@@ -290,7 +348,7 @@ create_engine_dots(int newdots) {
        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++) {
@@ -394,7 +452,7 @@ drawdots(SDL_Surface *s) {
 }
 
 int
-init(int fullscreen) {
+init(void) {
 
        int i;
        SDL_Surface *temp;
@@ -404,16 +462,16 @@ init(int fullscreen) {
        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) {
-                       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);
-                       sound_flag = init_sound();
+                       opt_sound = init_sound();
                }
        } else {
                // Initialize with video only
@@ -425,7 +483,7 @@ init(int fullscreen) {
 
        // 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
@@ -485,18 +543,13 @@ init(int fullscreen) {
 int
 draw() {
        int i;
-       SDL_Rect src,dest;
+       SDL_Rect dest;
        int bang, x;
        char *text;
        float fadegame,fadeover;
 
        bang = 0;
 
-       src.x = 0;
-       src.y = 0;
-       dest.x = 0;
-       dest.y = 0;
-
        // Draw a fully black background
        SDL_FillRect(surf_screen,NULL,0);
 
@@ -505,13 +558,9 @@ draw() {
 
        // Draw ship
        if(!gameover && state == GAMEPLAY ) {
-               src.w = surf_ship->w;
-               src.h = surf_ship->h;
-               dest.w = src.w;
-               dest.h = src.h;
-               dest.x = (int)shipx;
-               dest.y = (int)shipy;
-               SDL_BlitSurface(surf_ship,&src,surf_screen,&dest);
+               dest.x = shipx;
+               dest.y = shipy;
+               SDL_BlitSurface(surf_ship,NULL,surf_screen,&dest);
        }
 
        draw_rocks();
@@ -519,13 +568,9 @@ draw() {
        // Draw the life indicators.
        if(state == GAMEPLAY || state == DEAD_PAUSE || state == GAME_OVER)
        for(i = 0; i<nships-1; i++) {
-               src.w = surf_life->w;
-               src.h = surf_life->h;
-               dest.w = src.w;
-               dest.h = src.h;
-               dest.x = (i + 1)*(src.w + 10);
+               dest.x = (i + 1)*(surf_life->w + 10);
                dest.y = 20;
-               SDL_BlitSurface(surf_life, &src, surf_screen, &dest);
+               SDL_BlitSurface(surf_life, NULL, surf_screen, &dest);
        }
 
        // Draw the score
@@ -549,53 +594,33 @@ draw() {
                                fadeover = 1.0;
                        }
 
-                       src.w = surf_b_game->w;
-                       src.h = surf_b_game->h;
-                       dest.w = src.w;
-                       dest.h = src.h;
-                       dest.x = (XSIZE-src.w)/2;
-                       dest.y = (YSIZE-src.h)/2-40;
+                       dest.x = (XSIZE-surf_b_game->w)/2;
+                       dest.y = (YSIZE-surf_b_game->h)/2-40;
                        SDL_SetAlpha(surf_b_game, SDL_SRCALPHA, (int)(fadegame*(200 + 55*cos(fadetimer += gamerate/1.0))));
-                       SDL_BlitSurface(surf_b_game,&src,surf_screen,&dest);
-
-                       src.w = surf_b_over->w;
-                       src.h = surf_b_over->h;
-                       dest.w = src.w;
-                       dest.h = src.h;
-                       dest.x = (XSIZE-src.w)/2;
-                       dest.y = (YSIZE-src.h)/2 + 40;
+                       SDL_BlitSurface(surf_b_game,NULL,surf_screen,&dest);
+
+                       dest.x = (XSIZE-surf_b_over->w)/2;
+                       dest.y = (YSIZE-surf_b_over->h)/2 + 40;
                        SDL_SetAlpha(surf_b_over, SDL_SRCALPHA, (int)(fadeover*(200 + 55*sin(fadetimer))));
-                       SDL_BlitSurface(surf_b_over,&src,surf_screen,&dest);
+                       SDL_BlitSurface(surf_b_over,NULL,surf_screen,&dest);
                break;
 
                case TITLE_PAGE:
 
-                       src.w = surf_b_variations->w;
-                       src.h = surf_b_variations->h;
-                       dest.w = src.w;
-                       dest.h = src.h;
-                       dest.x = (XSIZE-src.w)/2 + cos(fadetimer/6.5)*10;
-                       dest.y = (YSIZE/2-src.h)/2 + sin(fadetimer/5.0)*10;
+                       dest.x = (XSIZE-surf_b_variations->w)/2 + cos(fadetimer/6.5)*10;
+                       dest.y = (YSIZE/2-surf_b_variations->h)/2 + sin(fadetimer/5.0)*10;
                        SDL_SetAlpha(surf_b_variations, SDL_SRCALPHA, (int)(200 + 55*sin(fadetimer += gamerate/2.0)));
-                       SDL_BlitSurface(surf_b_variations,&src,surf_screen,&dest);
-
-                       src.w = surf_b_on->w;
-                       src.h = surf_b_on->h;
-                       dest.w = src.w;
-                       dest.h = src.h;
-                       dest.x = (XSIZE-src.w)/2 + cos((fadetimer + 1.0)/6.5)*10;
-                       dest.y = (YSIZE/2-src.h)/2 + surf_b_variations->h + 20 + sin((fadetimer + 1.0)/5.0)*10;
+                       SDL_BlitSurface(surf_b_variations,NULL,surf_screen,&dest);
+
+                       dest.x = (XSIZE-surf_b_on->w)/2 + cos((fadetimer + 1.0)/6.5)*10;
+                       dest.y = (YSIZE/2-surf_b_on->h)/2 + surf_b_variations->h + 20 + sin((fadetimer + 1.0)/5.0)*10;
                        SDL_SetAlpha(surf_b_on, SDL_SRCALPHA, (int)(200 + 55*sin(fadetimer-1.0)));
-                       SDL_BlitSurface(surf_b_on,&src,surf_screen,&dest);
-
-                       src.w = surf_b_rockdodger->w;
-                       src.h = surf_b_rockdodger->h;
-                       dest.w = src.w;
-                       dest.h = src.h;
-                       dest.x = (XSIZE-src.w)/2 + cos((fadetimer + 2.0)/6.5)*10;
-                       dest.y = (YSIZE/2-src.h)/2 + surf_b_variations->h + surf_b_on->h + 40 + sin((fadetimer + 2.0)/5)*10;
+                       SDL_BlitSurface(surf_b_on,NULL,surf_screen,&dest);
+
+                       dest.x = (XSIZE-surf_b_rockdodger->w)/2 + cos((fadetimer + 2.0)/6.5)*10;
+                       dest.y = (YSIZE/2-surf_b_rockdodger->h)/2 + surf_b_variations->h + surf_b_on->h + 40 + sin((fadetimer + 2.0)/5)*10;
                        SDL_SetAlpha(surf_b_rockdodger, SDL_SRCALPHA, (int)(200 + 55*sin(fadetimer-2.0)));
-                       SDL_BlitSurface(surf_b_rockdodger,&src,surf_screen,&dest);
+                       SDL_BlitSurface(surf_b_rockdodger,NULL,surf_screen,&dest);
 
                        text = "Version " VERSION;
                        x = (XSIZE-SFont_TextWidth(g_font,text))/2 + sin(fadetimer/4.5)*10;
@@ -641,7 +666,7 @@ draw() {
                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;
                }
@@ -721,7 +746,7 @@ gameloop() {
                        new_rocks();
 
                        // FRICTION?
-                       if(friction) {
+                       if(opt_friction) {
                                shipdx *= pow((double)0.9,(double)gamerate);
                                shipdy *= pow((double)0.9,(double)gamerate);
                        }
@@ -741,6 +766,7 @@ gameloop() {
                        tmp /= -25;
                        tmp = ((screendx * (gamerate - 12)) + (tmp * gamerate)) / 12;
                        screendx = -tmp;
+                       if(screendx < 7.5) screendx=7.5;
 
                        xscroll = screendx * gamerate;
                        yscroll = screendy * gamerate;
@@ -757,15 +783,15 @@ gameloop() {
                        // BOUNCE X
                        if(shipx<0 || shipx>XSIZE-surf_ship->w) {
                                // BOUNCE from left and right wall
-                               shipx -= shipdx*gamerate;
-                               shipdx *= -99;
+                               shipx -= (shipdx-screendx)*gamerate;
+                               shipdx = 2*screendx-shipdx;
                        }
 
                        // BOUNCE Y
                        if(shipy<0 || shipy>YSIZE-surf_ship->h) {
                                // BOUNCE from top and bottom wall
-                               shipy -= shipdy;
-                               shipdy *= -0.99;
+                               shipy -= (shipdy-screendy)*gamerate;
+                               shipdy = 2*screendy-shipdy;
                        }
 
 
@@ -792,6 +818,7 @@ gameloop() {
                        SDL_PumpEvents();
                        keystate = SDL_GetKeyState(NULL);
 
+                       // new game
                        if(keystate[SDLK_SPACE] && (state == HIGH_SCORE_DISPLAY || state == TITLE_PAGE)) {
 
                                reset_rocks();
@@ -853,45 +880,11 @@ gameloop() {
 
 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;
        }