X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=79b8689e923f089abba483fc060f6153e87a274f;hp=9926f76efb8fbcdb91245d035698a5c5d410065d;hb=4461dfec6f8f09b43ec9719523d14978d82bd124;hpb=0e26db03c5aca3622a007b607368b250e40b7f2c diff --git a/main.c b/main.c index 9926f76..79b8689 100644 --- 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 #include #include #include @@ -38,7 +40,6 @@ #include #include #include -#include #include "SFont.h" @@ -53,7 +54,6 @@ SDL_Surface *surf_b_over, // Title element "over" *surf_ship, // Spaceship element *surf_life, // Indicator of number of ships remaining - *surf_speed, // Speed indicator *surf_rock[NROCKS], // THE ROCKS *surf_font_big; // The big font @@ -69,24 +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 = 8, shipdy = 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; -float game_dist, avg_speed, cur_speed; -uint16_t avg_speed_w, cur_speed_w; // [0, 74] - -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; @@ -108,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; @@ -210,6 +207,7 @@ draw_bang_dots(SDL_Surface *s) { rawpixel = (Uint16 *) s->pixels; first_i = -1; + last_i = 0; for(i = bd1; (bd1 <= bd2)?(i= bd1 && i < bd2); last_i = ++i) { @@ -295,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 20) cur_speed = 20; - game_dist += cur_speed*ticks_since_last; - game_ticks += ticks_since_last; - if(game_ticks < 2*1000) avg_speed = cur_speed; - else avg_speed = game_dist/game_ticks; - // printf("avg=%.2f, cur=%.2f.\n", avg_speed, cur_speed); - avg_speed_w = 10 + 64*avg_speed/20; - cur_speed_w = 10 + 64*cur_speed/20; - } - - if(state == GAMEPLAY || state == DEAD_PAUSE) { - // Draw the speed indicators. - src.x = 0; src.y = 0; - src.h = surf_speed->h; - dest.x = 240; - src.w = avg_speed_w; dest.y = 10; - SDL_BlitSurface(surf_speed, &src, surf_screen, &dest); - src.w = cur_speed_w; dest.y = 20; - SDL_BlitSurface(surf_speed, &src, surf_screen, &dest); - } - // Draw the score snprintscore_line(topline, 50, score); SFont_Write(surf_screen, g_font, XSIZE-250, 0, topline); @@ -638,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; } @@ -672,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; } @@ -721,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); } @@ -741,6 +711,7 @@ gameloop() { tmp /= -25; tmp = ((screendx * (gamerate - 12)) + (tmp * gamerate)) / 12; screendx = -tmp; + if(screendx < SCREENDXMIN) screendx=SCREENDXMIN; xscroll = screendx * gamerate; yscroll = screendy * gamerate; @@ -757,15 +728,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 = screendx - (shipdx-screendx)*opt_bounciness; } // 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 = screendy - (shipdy-screendy)*opt_bounciness; } @@ -775,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; @@ -792,12 +764,11 @@ gameloop() { SDL_PumpEvents(); keystate = SDL_GetKeyState(NULL); + // new game if(keystate[SDLK_SPACE] && (state == HIGH_SCORE_DISPLAY || state == TITLE_PAGE)) { reset_rocks(); - game_ticks = 0; - nships = 4; score = 0; @@ -855,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; }