new option --bounciness (default changed from 100% to 50%).

[vor.git] / main.c

diff --git a/main.c b/main.c
index daa2471..79b8689 100644 (file)
--- a/main.c
+++ b/main.c
@@ -23,6 +23,7 @@
 #include "debug.h"
 #endif
 
+#include "args.h"
 #include "config.h"
 #include "file.h"
 #include "globals.h"
@@ -31,6 +32,7 @@
 #include "shape.h"
 #include "sound.h"
 
+#include <argp.h>
 #include <math.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_image.h>
@@ -38,7 +40,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "SFont.h"
 
@@ -68,21 +69,21 @@ struct spacedot sdot[MAXSPACEDOTS];
 char topline[1024];
 char *initerror = "";
 
+
+
 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.
-float screendx = 7.5, screendy = 0.0;
+float shipdx = SCREENDXMIN, shipdy = 0.0;      // Change in X position per tick.
+float screendx = SCREENDXMIN, screendy = 0.0;
 float xscroll, yscroll;
 float gamerate;  // this controls the speed of everything that moves.
 
 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 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;
@@ -104,7 +105,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;
@@ -292,7 +293,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++) {
@@ -396,7 +397,7 @@ drawdots(SDL_Surface *s) {
 }
 
 int
-init(int fullscreen) {
+init(void) {
 
        int i;
        SDL_Surface *temp;
@@ -406,16 +407,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
@@ -427,7 +428,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
@@ -607,10 +608,10 @@ draw() {
        ticks_since_last = SDL_GetTicks()-last_ticks;
        last_ticks = SDL_GetTicks();
        if(ticks_since_last>200 || ticks_since_last<0) {
+               // We won't run at all below 5 frames per second.
                gamerate = 0;
-       }
-       else {
-               gamerate = GAMESPEED*ticks_since_last/50.0;
+       } else {
+               gamerate = opt_gamespeed*ticks_since_last/50.0;
                if(state == GAMEPLAY) {
                        score += ticks_since_last;
                }
@@ -641,14 +642,14 @@ gameloop() {
                                                play_tune(1);
                                                break;
                                        case GAME_OVER:
-                                               state = HIGH_SCORE_ENTRY;
-                                               state_timeout = 5.0e6;
                                                if(new_high_score(score)) {
                                                        SDL_Event e;
+                                                       state = HIGH_SCORE_ENTRY;
+                                                       state_timeout = 5.0e6;
                                                        SDL_EnableUNICODE(1);
                                                        while(SDL_PollEvent(&e))
                                                                ;
-                                               } else {
+                                               } else if(!keystate[SDLK_SPACE]) {
                                                        state = HIGH_SCORE_DISPLAY;
                                                        state_timeout = 400;
                                                }
@@ -690,7 +691,7 @@ gameloop() {
                        new_rocks();
 
                        // FRICTION?
-                       if(friction) {
+                       if(opt_friction) {
                                shipdx *= pow((double)0.9,(double)gamerate);
                                shipdy *= pow((double)0.9,(double)gamerate);
                        }
@@ -710,7 +711,7 @@ gameloop() {
                        tmp /= -25;
                        tmp = ((screendx * (gamerate - 12)) + (tmp * gamerate)) / 12;
                        screendx = -tmp;
-                       if(screendx < 7.5) screendx=7.5;
+                       if(screendx < SCREENDXMIN) screendx=SCREENDXMIN;
 
                        xscroll = screendx * gamerate;
                        yscroll = screendy * gamerate;
@@ -728,14 +729,14 @@ gameloop() {
                        if(shipx<0 || shipx>XSIZE-surf_ship->w) {
                                // BOUNCE from left and right wall
                                shipx -= (shipdx-screendx)*gamerate;
-                               shipdx = 2*screendx-shipdx;
+                               shipdx = screendx - (shipdx-screendx)*opt_bounciness;
                        }
 
                        // BOUNCE Y
                        if(shipy<0 || shipy>YSIZE-surf_ship->h) {
                                // BOUNCE from top and bottom wall
                                shipy -= (shipdy-screendy)*gamerate;
-                               shipdy = 2*screendy-shipdy;
+                               shipdy = screendy - (shipdy-screendy)*opt_bounciness;
                        }
 
 
@@ -745,6 +746,7 @@ gameloop() {
                                bangx = shipx; bangy = shipy; bangdx = shipdx; bangdy = shipdy;
                                make_bang_dots(shipx,shipy,shipdx,shipdy,surf_ship,30);
                                shipdx *= 0.5; shipdy *= 0.5;
+                               if(shipdx < SCREENDXMIN) shipdx = SCREENDXMIN;
                                if(--nships <= 0) {
                                        state = GAME_OVER;
                                        gameover = 1;
@@ -767,8 +769,6 @@ gameloop() {
 
                                reset_rocks();
 
-                               game_ticks = 0;
-
                                nships = 4;
                                score = 0;
 
@@ -826,45 +826,10 @@ 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;
        }