X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=main.c;h=9227c913e2ce34b09fb0615e39e31666e084f0dc;hb=refs%2Fheads%2Fjoystick;hp=358faf5e47ab350e4f2a6a61f82ae1f6dfee9c90;hpb=0d16e986bbae8d7b4f061afdb562a052f43f5a85;p=vor.git diff --git a/main.c b/main.c index 358faf5..9227c91 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" @@ -59,6 +61,9 @@ SDL_Surface font *g_font; +#define ENGINEDOT 0 +#define BANGDOT 1 + struct dot { int active; float x, y; @@ -66,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 }; @@ -94,6 +103,9 @@ float fadetimer = 0; int paused = 0; +int num_joysticks = 0; +SDL_Joystick **joysticks = NULL; + // bangdot start (bd1) and end (bd2) position: int bd1 = 0, bd2 = 0; @@ -133,11 +145,28 @@ 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; ix = -200; +} void move_dot(struct dot *d) @@ -279,6 +312,13 @@ move_dot(struct dot *d) if(hit) if(hit->type != SHIP) { d->active = 0; mass = sprite_mass(hit); + 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; } @@ -347,12 +387,31 @@ void font_cleanup() { font_free(g_font); } +void +set_video_mode() { + Uint32 flag; + + // Attempt to get the required video size + flag = SDL_DOUBLEBUF | SDL_HWSURFACE; + if(opt_fullscreen) flag |= SDL_FULLSCREEN; + surf_screen = SDL_SetVideoMode(XSIZE,YSIZE,16,flag); +} + +void +toggle_fullscreen() { + opt_fullscreen = 1 - opt_fullscreen; + set_video_mode(); + if(paused) { + draw(); + } +} + + int init(void) { int i; char *s; - Uint32 flag; // Where are our data files? if(!find_files()) exit(1); @@ -360,7 +419,7 @@ init(void) { if(opt_sound) { // Initialize SDL with audio and video - if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) != 0) { + if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK) != 0) { opt_sound = 0; fputs("Can't open sound, starting without it\n", stderr); atexit(SDL_Quit); @@ -371,16 +430,15 @@ init(void) { } } else { // Initialize with video only - CONDERROR(SDL_Init(SDL_INIT_VIDEO) != 0); + CONDERROR(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) != 0); atexit(SDL_Quit); } play_tune(TUNE_TITLE_PAGE); + // Attempt to get the required video size - flag = SDL_DOUBLEBUF | SDL_HWSURFACE; - if(opt_fullscreen) flag |= SDL_FULLSCREEN; - surf_screen = SDL_SetVideoMode(XSIZE,YSIZE,16,flag); + set_video_mode(); // Set the title bar text SDL_WM_SetCaption("Variations on Rockdodger", "VoR"); @@ -416,7 +474,17 @@ init(void) { exit(1); } - init_engine_dots(); + num_joysticks = SDL_NumJoysticks(); +printf("num_joysticks: %i\n", num_joysticks); + if(num_joysticks) + { + joysticks = (SDL_Joystick **)malloc(num_joysticks * sizeof(SDL_Joystick *)); + for(i = 0; i < num_joysticks; ++i) { + NULLERROR(joysticks[i] = SDL_JoystickOpen(i)); + } + } + + init_dots(); init_dust(); init_sprites(); @@ -500,7 +568,7 @@ draw_title_page(void) x = (XSIZE-font_width(text))/2 + cos(fadetimer/4.5)*10; font_write(x,YSIZE-100 + cos(fadetimer/3)*5,text); - text = "Version " VERSION; + text = "Version " PACKAGE_VERSION; x = (XSIZE-font_width(text))/2 + sin(fadetimer/4.5)*10; font_write(x,YSIZE-50 + sin(fadetimer/2)*5,text); } @@ -517,16 +585,19 @@ draw(void) show_score(); switch (state) { - case GAME_OVER: draw_game_over(); break; + case GAME_OVER: + draw_game_over(); + break; - case TITLE_PAGE: draw_title_page(); break; + case TITLE_PAGE: + draw_title_page(); + break; - case HIGH_SCORE_ENTRY: play_tune(TUNE_HIGH_SCORE_ENTRY); - // and fall through to + case HIGH_SCORE_ENTRY: case HIGH_SCORE_DISPLAY: - // Display de list o high scores mon. display_scores(150,50); break; + case GAMEPLAY: case DEAD_PAUSE: ; // no action necessary @@ -552,6 +623,7 @@ kill_ship(struct ship *ship) if(ship->dx < 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; @@ -593,7 +665,6 @@ update_state(void) // 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(); @@ -620,6 +691,9 @@ void gameloop() { SDL_Event e; Uint8 *keystate; + Sint16 x_move, y_move; + char button_pressed = 0; + short i, j; float tmp; for(;;) { @@ -635,7 +709,7 @@ gameloop() { autopilot(t_frame); } - while(SDL_PollEvent(&e)) { + while(paused ? SDL_WaitEvent(&e) : SDL_PollEvent(&e)) { switch(e.type) { case SDL_QUIT: return; case SDL_KEYDOWN: @@ -651,7 +725,6 @@ gameloop() { // continue to display the scores briefly state = HIGH_SCORE_DISPLAY; state_timeout = 200; - play_tune(TUNE_TITLE_PAGE); } } else { switch(e.key.keysym.sym) { @@ -659,16 +732,42 @@ gameloop() { return; case SDLK_3: case SDLK_PRINT: - // FIXME make a unique filename like vor-screenshot--.bmp - SDL_SaveBMP(surf_screen, "snapshot.bmp"); + { + 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) { + 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; @@ -678,6 +777,43 @@ gameloop() { } } keystate = SDL_GetKeyState(NULL); + if(num_joysticks) { + SDL_JoystickUpdate(); + if(opt_joystick_enabled) { + x_move = SDL_JoystickGetAxis(joysticks[opt_joystick_number], opt_joystick_x_axis); + y_move = SDL_JoystickGetAxis(joysticks[opt_joystick_number], opt_joystick_y_axis); + button_pressed = 0; + for(i = 1; i <= SDL_JoystickNumButtons(joysticks[opt_joystick_number]); i++) + { + if(SDL_JoystickGetButton(joysticks[opt_joystick_number], i) == 1) + { + button_pressed = 1; + break; + } + } + } else { // there is at least one joystick, but it hasn't been enabled yet + // if any joystick has a button down, enable that joystick + for(j = 0; j <= num_joysticks; j++) { + for(i = 1; i <= SDL_JoystickNumButtons(joysticks[j]); i++) + { + if(SDL_JoystickGetButton(joysticks[j], i) == 1) + { + opt_joystick_enabled = 1; + opt_joystick_number = j; +printf("enabled joystick #%i\n", opt_joystick_number); + if(state != GAMEPLAY) { + // first (enabling) press of the joystick + // button should start a game, but should + // not pause a running game + button_pressed = 1; + } + break; + } + } + } + } + } + if(opt_autopilot) { autopilot_fix_keystates(keystate); } @@ -698,6 +834,12 @@ gameloop() { if(keystate[SDLK_UP] || keystate[SDLK_KP8]) { ship.dy -= THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<3; } + if(opt_joystick_enabled) { + if(x_move < -3000) { ship.dx += x_move*THRUSTER_STRENGTH*t_frame/22768; ship.jets |= 1<<0;} + if(y_move > 3000) { ship.dy += y_move*THRUSTER_STRENGTH*t_frame/22768; ship.jets |= 1<<1;} + if(x_move > 3000) { ship.dx += x_move*THRUSTER_STRENGTH*t_frame/22768; ship.jets |= 1<<2;} + if(y_move < -3000) { ship.dy += y_move*THRUSTER_STRENGTH*t_frame/22768; ship.jets |= 1<<3;} + } if(ship.jets) { ship.dx = fconstrain2(ship.dx, -50, 50); ship.dy = fconstrain2(ship.dy, -50, 50); @@ -749,14 +891,14 @@ gameloop() { draw(); // new game - if((keystate[SDLK_SPACE] || keystate[SDLK_1] || keystate[SDLK_2]) + if((keystate[SDLK_SPACE] || keystate[SDLK_1] || keystate[SDLK_2] || button_pressed) && (state == HIGH_SCORE_DISPLAY || state == TITLE_PAGE || state == GAME_OVER)) { if(state == GAME_OVER && new_high_score(score)) init_score_entry(); else { - if((keystate[SDLK_SPACE] && !initial_rocks) || keystate[SDLK_2]) { + if((keystate[SDLK_SPACE] && !initial_rocks) || keystate[SDLK_2] || button_pressed) { g_easy = 0; initial_rocks = NORMAL_I_ROCKS; final_rocks = NORMAL_F_ROCKS; @@ -792,6 +934,8 @@ gameloop() { state = HIGH_SCORE_DISPLAY; state_timeout = 400; } + + tiny_sleep(); } } @@ -808,7 +952,7 @@ main(int argc, char **argv) { frames = 0; gameloop(); end = SDL_GetTicks(); - // printf("%ld frames in %ld ms, %.2f fps.\n", frames, end-start, frames * 1000.0 / (end-start)); + printf("%ld frames in %ld ms, %.2f fps.\n", frames, end-start, frames * 1000.0 / (end-start)); return 0; }