X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=d696ade4edb8aa3d422abecb801896582f8e2f36;hp=9e5c36f4261b72cfdf0b141b5910d53d29a8ba74;hb=HEAD;hpb=76c0b11e970a4f5b73b97cd83a119bff0ea6c1f4 diff --git a/main.c b/main.c index 9e5c36f..0af1fdd 100644 --- a/main.c +++ b/main.c @@ -26,12 +26,14 @@ #include #include #include +#include #include "font.h" #include "args.h" #include "common.h" -#include "config.h" +#include +#include "vorconfig.h" #include "dust.h" #include "file.h" #include "float.h" @@ -41,6 +43,7 @@ #include "score.h" #include "sprite.h" #include "sound.h" +#include "autopilot.h" // ************************************* VARS // SDL_Surface global variables @@ -58,6 +61,9 @@ SDL_Surface font *g_font; +#define ENGINEDOT 0 +#define BANGDOT 1 + struct dot { int active; float x, y; @@ -65,14 +71,18 @@ struct dot { float mass; // in DOT_MASS_UNITs float decay; // rate at which to reduce mass. int heat; // heat multiplier (color). + uint8_t type; // BANGDOT or ENGINEDOT }; +void draw(void); + struct dot edot[MAXENGINEDOTS], *dotptr = edot; struct dot bdot[MAXBANGDOTS]; // Other global variables char topline[1024]; char *initerror = ""; +int screenshot_number = 0; struct ship ship = { SHIP, 0, NULL, XSIZE/2, YSIZE/2, BARRIER_SPEED, 0.0 }; @@ -91,7 +101,7 @@ int score; float fadetimer = 0; -int pausedown = 0, paused = 0; +int paused = 0; // bangdot start (bd1) and end (bd2) position: int bd1 = 0, bd2 = 0; @@ -112,12 +122,12 @@ char *msgs[2][3] = { { "Press SPACE for normal game", "Press '1' for easy game", - "http://jasonwoof.org/vor" + "https://sametwice.com/vor" }, { "Press SPACE for easy game", "Press '2' for normal game", - "http://jasonwoof.org/vor" + "https://sametwice.com/vor" } }; @@ -132,19 +142,36 @@ extern int optind, opterr, optopt; // ************************************* FUNCS +#ifdef HAVE_NANOSLEEP +void +tiny_sleep() { + struct timespec t; + t.tv_sec = 0; + t.tv_nsec = 1; + nanosleep(&t, 0); +} +#else +#define tiny_sleep() +#endif + void -init_engine_dots() { +init_dots() { int i; for(i = 0; iactive = 1; dotptr->decay = 3; dotptr->heat = 6; // dot was created at a random time during the time span - time = frnd() * time_span; // this is how long ago + time = frnd() * t_frame; // this is how long ago // calculate how fast the ship was going when this engine dot was // created (as if it had a smooth acceleration). This is used in @@ -185,7 +211,7 @@ new_engine_dots(float time_span) { // the starting position (not speed) of the dot is calculated as // though the ship were traveling at a constant speed for this - // time_span. + // t_frame. dotptr->x = (ship.x - (ship.dx - screendx) * time) + s[dir]*hx; dotptr->y = (ship.y - (ship.dy - screendy) * time) + s[(dir+1)&3]*hy; if(dir&1) { @@ -202,8 +228,14 @@ new_engine_dots(float time_span) { dotptr->x += (dotptr->dx - screendx) * time; dotptr->y += (dotptr->dy - screendy) * time; - if(dotptr - edot < MAXENGINEDOTS-1) dotptr++; - else dotptr = edot; + if(!fclip(dotptr->x, XSIZE) && !fclip(dotptr->y, YSIZE)) { + dotptr->active = 1; + if(dotptr - edot < MAXENGINEDOTS-1) { + dotptr++; + } else { + dotptr = edot; + } + } } } } @@ -255,64 +287,75 @@ new_bang_dots(struct sprite *s) if(SDL_MUSTLOCK(img)) { SDL_UnlockSurface(img); } } +void +kill_rock(struct rock *r) { + r->x = -200; +} void -move_dot(struct dot *d, float ticks) +move_dot(struct dot *d) { Sprite *hit; float mass; if(d->active) { - d->x += (d->dx - screendx) * ticks; - d->y += (d->dy - screendy) * ticks; - d->mass -= ticks * d->decay; + d->x += (d->dx - screendx) * t_frame; + d->y += (d->dy - screendy) * t_frame; + d->mass -= t_frame * d->decay; if(d->mass < 0 || fclip(d->x, XSIZE) || fclip(d->y, YSIZE)) d->active = 0; else { hit = pixel_collides(d->x, d->y); - if(hit && hit->type != SHIP) { + if(hit) if(hit->type != SHIP) { d->active = 0; mass = sprite_mass(hit); - hit->dx += DOT_MASS_UNIT * d->mass * d->dx / mass; - hit->dy += DOT_MASS_UNIT * d->mass * d->dy / mass; + if(d->type == BANGDOT) { + struct rock *rock = (struct rock*)hit; + rock->life -= (d->dx - hit->dx) * (d->dx - hit->dx) + (d->dy - hit->dy) * (d->dy - hit->dy); + if(rock->life < 0) { + kill_rock(rock); + } + } + hit->dx += DOT_MASS_UNIT * d->mass * (d->dx - hit->dx) / mass; + hit->dy += DOT_MASS_UNIT * d->mass * (d->dy - hit->dy) / mass; } } } } void -move_dots(float ticks) +move_dots(void) { int i; - for(i=0; iactive) { - pixels = (uint16_t *) s->pixels; - row_inc = s->pitch / sizeof(uint16_t); + pixels = (uint16_t *) surf_screen->pixels; + row_inc = surf_screen->pitch / sizeof(uint16_t); pixel = pixels + (int)d->y * row_inc + (int)d->x; *pixel = heatcolor[min(3*W-1, (int)(d->mass * d->heat))]; } } void -draw_dots(SDL_Surface *s) { +draw_dots(void) { int i; - if(SDL_MUSTLOCK(s)) { SDL_LockSurface(s); } - draw_dust(s); - for(i=0; idx < BARRIER_SPEED) ship->dx = BARRIER_SPEED; } else { state = GAME_OVER; + play_tune(TUNE_TITLE_PAGE); state_timeout = 200.0; fadetimer = 0.0; ship->flags = 0; @@ -576,9 +641,9 @@ init_score_entry(void) // Count down the state timer, and change state when it gets to zero or less; void -update_state(float ticks) +update_state(void) { - state_timeout -= ticks*3; + state_timeout -= t_frame*3; if(state_timeout > 0) return; switch(state) { @@ -587,7 +652,6 @@ update_state(float ticks) // Restore the ship and continue playing ship.flags = DRAW|MOVE|COLLIDE; state = GAMEPLAY; - play_tune(TUNE_GAMEPLAY); break; case GAME_OVER: if(new_high_score(score)) init_score_entry(); @@ -619,16 +683,25 @@ gameloop() { for(;;) { ms_frame = SDL_GetTicks() - ms_end; ms_end += ms_frame; - if(ms_frame > 1000) { - ms_frame = 1000; + if(ms_frame > 50) { + ms_frame = 50; } t_frame = gamespeed * ms_frame / 50; frames++; - while(SDL_PollEvent(&e)) { + if(opt_autopilot) { + autopilot(t_frame); + } + + while(paused ? SDL_WaitEvent(&e) : SDL_PollEvent(&e)) { switch(e.type) { case SDL_QUIT: return; case SDL_KEYDOWN: + // even during high-score entry + if(e.key.keysym.sym == SDLK_ESCAPE) { + return; + } + if(state == HIGH_SCORE_ENTRY) { if(!process_score_input(&e.key.keysym)) { // Write the high score table to the file @@ -636,44 +709,88 @@ gameloop() { // continue to display the scores briefly state = HIGH_SCORE_DISPLAY; state_timeout = 200; - play_tune(TUNE_TITLE_PAGE); } - } else if(e.key.keysym.sym == SDLK_q) { - return; - } - - if(e.key.keysym.sym == SDLK_ESCAPE) { - return; + } else { + switch(e.key.keysym.sym) { + case SDLK_q: + return; + case SDLK_3: + case SDLK_PRINT: + { + FILE *screenshot_fp; + char tmp[30]; + char *screenshot_filename = &(tmp[0]); + for(;;) { + snprintf(screenshot_filename, 30, "vor-screenshot-%02i.bmp", screenshot_number++); + screenshot_fp = fopen(screenshot_filename, "r"); + if(screenshot_fp) { + fclose(screenshot_fp); + } else { + break; + } + } + SDL_SaveBMP(surf_screen, screenshot_filename); + } + break; + case SDLK_SPACE: + if(state != GAMEPLAY && state != DEAD_PAUSE) { + // don't conflict with space key to start a new game + break; + } + // else fall through + case SDLK_p: + case SDLK_PAUSE: + paused = !paused; + if(paused) { + pause_tune(); + } else { + resume_tune(); + ms_end = SDL_GetTicks(); + } + break; + case SDLK_f: + case SDLK_F11: + toggle_fullscreen(); + break; + default: + // other keys are handled by checking keystate each frame + break; + } } break; } } keystate = SDL_GetKeyState(NULL); + if(opt_autopilot) { + autopilot_fix_keystates(keystate); + } if(state == GAMEPLAY) { if(!paused) { score += ms_frame; - if(keystate[SDLK_LEFT] || keystate[SDLK_h]) { ship.dx -= THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<0;} - if(keystate[SDLK_DOWN] || keystate[SDLK_t]) { ship.dy += THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<1;} - if(keystate[SDLK_RIGHT] || keystate[SDLK_n]) { ship.dx += THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<2;} - if(keystate[SDLK_UP] || keystate[SDLK_c]) { ship.dy -= THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<3;} - if(keystate[SDLK_3]) { SDL_SaveBMP(surf_screen, "snapshot.bmp"); } - } - - if(keystate[SDLK_p] | keystate[SDLK_s]) { - if(!pausedown) { - paused = !paused; - pausedown = 1; - if(!paused) ms_end = SDL_GetTicks(); + if(keystate[SDLK_LEFT] || keystate[SDLK_KP4]) { + ship.dx -= THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<0; + } + if(keystate[SDLK_DOWN] || keystate[SDLK_KP5] || keystate[SDLK_KP2]) { + ship.dy += THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<1; + } + if(keystate[SDLK_RIGHT] || keystate[SDLK_KP6]) { + ship.dx += THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<2; + } + if(keystate[SDLK_UP] || keystate[SDLK_KP8]) { + ship.dy -= THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<3; + } + if(ship.jets) { + ship.dx = fconstrain2(ship.dx, -50, 50); + ship.dy = fconstrain2(ship.dy, -50, 50); } - } else { - pausedown = 0; } + } if(!paused) { - update_state(t_frame); + update_state(); // SCROLLING tmp = (ship.y+ship.h/2 + ship.dy*t_frame - YSCROLLTO)/25 + (ship.dy-screendy); @@ -687,27 +804,31 @@ gameloop() { dist_ahead += (screendx - BARRIER_SPEED)*t_frame; if(MAX_DIST_AHEAD >= 0) dist_ahead = min(dist_ahead, MAX_DIST_AHEAD); - move_sprites(t_frame); - move_dots(t_frame); - move_dust(t_frame); + move_sprites(); + move_dots(); + move_dust(); - new_rocks(t_frame); - new_engine_dots(t_frame); - - collisions(); + new_rocks(); // BOUNCE off left or right edge of screen if(ship.x < 0 || ship.x+ship.w > XSIZE) { ship.x -= (ship.dx-screendx)*t_frame; ship.dx = screendx - (ship.dx-screendx)*BOUNCINESS; + ship.x = fconstrain(ship.x, XSIZE - ship.w); } // BOUNCE off top or bottom of screen if(ship.y < 0 || ship.y+ship.h > YSIZE) { ship.y -= (ship.dy-screendy)*t_frame; ship.dy = screendy - (ship.dy-screendy)*BOUNCINESS; + ship.y = fconstrain(ship.y, YSIZE - ship.h); } + new_engine_dots(); + + collisions(); // must happen after ship bouncing because it puts pixels where the ship is (thus the ship must be on the screen) + + draw(); // new game @@ -754,6 +875,8 @@ gameloop() { state = HIGH_SCORE_DISPLAY; state_timeout = 400; } + + tiny_sleep(); } }