X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=359e59f29a151aceb0312243d6f25cdbf9cb4e61;hp=309da058bbce6ccbe19f66b20639651239f34755;hb=f8b249157652f109467064877561955910f98fc1;hpb=3814fd00ef6b0a4f5a9d83b5b42d494bc64da668 diff --git a/main.c b/main.c index 309da05..359e59f 100644 --- a/main.c +++ b/main.c @@ -31,6 +31,7 @@ #include "shape.h" #include "sound.h" +#include #include #include #include @@ -38,7 +39,6 @@ #include #include #include -#include #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,19 +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 = ""; +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,shipy = 240.0; // X position, 0..XSIZE -float shipdx,shipdy; // Change in X position per tick. +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 xscroll, yscroll; float gamerate; // this controls the speed of everything that moves. -float yscroll; -float scrollvel; -int nships,score,initticks,ticks_since_last, last_ticks; +float bangx, bangy, bangdx, bangdy; + +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; @@ -101,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; @@ -113,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; @@ -128,25 +187,18 @@ init_engine_dots() { void init_space_dots() { - int i,intensity; + int i,b; for(i = 0; iformat,intensity,intensity,intensity); - + sdot[i].z = MAXDUSTDEPTH*sqrt(rnd()); + b = (MAXDUSTDEPTH - sdot[i].z) * 255.0 / MAXDUSTDEPTH; + sdot[i].color = SDL_MapRGB(surf_screen->format, b, b, b); } } void -makebangdots(int xbang, int ybang, int dx, int dy, SDL_Surface *s, int power) { +make_bang_dots(int xbang, int ybang, int dx, int dy, 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 @@ -210,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= bd1 && i < bd2); last_i = ++i) { @@ -226,8 +279,8 @@ draw_bang_dots(SDL_Surface *s) { //last_i = i + 1; rawpixel[(int)(s->pitch/2*(int)(bdot[i].y)) + (int)(bdot[i].x)] = bdot[i].c ? bdot[i].c : heatcolor[(int)(bdot[i].life*3)]; bdot[i].life -= bdot[i].decay; - bdot[i].x += bdot[i].dx*gamerate; - bdot[i].y += bdot[i].dy*gamerate + yscroll; + bdot[i].x += bdot[i].dx*gamerate - xscroll; + bdot[i].y += bdot[i].dy*gamerate - yscroll; if(bdot[i].life<0) bdot[i].active = 0; @@ -257,16 +310,12 @@ draw_space_dots(SDL_Surface *s) { sdot[i].y = 0; } rawpixel[(int)(s->pitch/2*(int)sdot[i].y) + (int)(sdot[i].x)] = sdot[i].color; - sdot[i].x += sdot[i].dx*gamerate; - sdot[i].y += yscroll; - if(sdot[i].y > YSIZE) { - sdot[i].y -= YSIZE; - } else if(sdot[i].y < 0) { - sdot[i].y += YSIZE; - } - if(sdot[i].x<0) { - sdot[i].x = XSIZE; - } + sdot[i].x -= xscroll / (1.3 + sdot[i].z); + sdot[i].y -= yscroll / (1.3 + sdot[i].z); + if(sdot[i].y >= XSIZE) sdot[i].x -= XSIZE; + else if(sdot[i].x < 0) sdot[i].x = XSIZE-1; + if(sdot[i].y > YSIZE) sdot[i].y -= YSIZE; + else if(sdot[i].y < 0) sdot[i].y += YSIZE-1; } } @@ -278,8 +327,8 @@ draw_engine_dots(SDL_Surface *s) { for(i = 0; iYSIZE) { edot[i].active = 0; } else if(edot[i].x<0 || edot[i].x>XSIZE) { @@ -299,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; iw; - 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(); @@ -528,13 +568,9 @@ draw() { // Draw the life indicators. if(state == GAMEPLAY || state == DEAD_PAUSE || state == GAME_OVER) for(i = 0; iw; - 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 @@ -558,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; @@ -650,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; } @@ -666,6 +682,7 @@ draw() { int gameloop() { Uint8 *keystate; + float tmp; for(;;) { @@ -678,7 +695,6 @@ gameloop() { // Create a new ship and start all over again state = GAMEPLAY; play_tune(1); - shipx -= 50; break; case GAME_OVER: state = HIGH_SCORE_ENTRY; @@ -721,16 +737,16 @@ gameloop() { blast_radius = BLAST_RADIUS * (DEAD_PAUSE_LENGTH - state_timeout) / 20.0; fixonly = 0; } - blast_rocks(shipx, shipy, blast_radius, fixonly); + blast_rocks(bangx, bangy, blast_radius, fixonly); - if(shipx < 60) shipx = 60; + if(bangx < 60) bangx = 60; } } new_rocks(); // FRICTION? - if(friction) { + if(opt_friction) { shipdx *= pow((double)0.9,(double)gamerate); shipdy *= pow((double)0.9,(double)gamerate); } @@ -740,41 +756,55 @@ gameloop() { shipy += shipdy*gamerate; // SCROLLING - yscroll = shipy - (YSIZE / 2); - yscroll += shipdy * 25; - yscroll /= -25; - yscroll = ((scrollvel * (12 - gamerate)) + (yscroll * gamerate)) / 12; - scrollvel = yscroll; - yscroll = yscroll*gamerate; - shipy += yscroll; - + tmp = shipy - (YSIZE / 2); + tmp += shipdy * 25; + tmp /= -25; + tmp = ((screendy * (gamerate - 12)) + (tmp * gamerate)) / 12; + screendy = -tmp; + tmp = shipx - (XSIZE / 3); + tmp += shipdx * 25; + tmp /= -25; + tmp = ((screendx * (gamerate - 12)) + (tmp * gamerate)) / 12; + screendx = -tmp; + if(screendx < 7.5) screendx=7.5; + + xscroll = screendx * gamerate; + yscroll = screendy * gamerate; + shipx -= xscroll; + shipy -= yscroll; + + // move bang center + bangx += bangdx*gamerate - xscroll; + bangy += bangdy*gamerate - yscroll; + move_rocks(); // BOUNCE X if(shipx<0 || shipx>XSIZE-surf_ship->w) { // BOUNCE from left and right wall - shipx -= shipdx*gamerate; - shipdx *= -0.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; } if(draw() && state == GAMEPLAY) { - // Play the explosion sound - play_sound(0); - makebangdots(shipx,shipy,shipdx,shipdy,surf_ship,30); - shipdx = 0; - shipdy = 0; + // Died + play_sound(0); // Play the explosion sound + 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(--nships <= 0) { - gameover = 1; state = GAME_OVER; + gameover = 1; + shipdx = 8; shipdy = 0; state_timeout = 200.0; fadetimer = 0.0; faderate = gamerate; @@ -788,10 +818,7 @@ gameloop() { SDL_PumpEvents(); keystate = SDL_GetKeyState(NULL); - if(state != HIGH_SCORE_ENTRY && (keystate[SDLK_q] || keystate[SDLK_ESCAPE])) { - return 0; - } - + // new game if(keystate[SDLK_SPACE] && (state == HIGH_SCORE_DISPLAY || state == TITLE_PAGE)) { reset_rocks(); @@ -803,10 +830,8 @@ gameloop() { play_tune(1); gameover = 0; - shipx = 0; - shipy = YSIZE/2; - shipdx = -1; - shipdy = 0; + shipx = XSIZE/2.2; shipy = YSIZE/2; + shipdx = screendx; shipdy = screendy; } maneuver = 0; @@ -845,56 +870,26 @@ gameloop() { state_timeout = -1; } } + + if(state != HIGH_SCORE_ENTRY && (keystate[SDLK_q] || keystate[SDLK_ESCAPE])) { + return 0; + } + } } 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; } reset_rocks(); - initticks = SDL_GetTicks(); gameloop(); return 0;