JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
oops, didn't fix bang dots correctly.
[vor.git] / main.c
diff --git a/main.c b/main.c
index 5fb2fbf..ea1f536 100644 (file)
--- a/main.c
+++ b/main.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include <argp.h>
 #include <math.h>
 #include <SDL.h>
 #include <SDL_image.h>
 #include "sprite.h"
 #include "sound.h"
 
+#ifdef WIN32
+#define SDL_SetAlpha(surf, flag, alpha)
+#endif
+
 // ************************************* VARS
 // SDL_Surface global variables
 SDL_Surface 
@@ -99,10 +102,18 @@ enum states {
 enum states state = TITLE_PAGE;
 float state_timeout = 600.0;
 
-#define NSEQUENCE 2
-char *sequence[] = {
-       "Press SPACE to start",
-       "http://jasonwoof.org/vor"
+#define NSEQUENCE 3
+char *msgs[2][3] = {
+       {
+               "Press SPACE for normal game",
+               "Press '1' for easy game",
+               "http://jasonwoof.org/vor"
+       },
+       {
+               "Press SPACE for easy game",
+               "Press '2' for normal game",
+               "http://jasonwoof.org/vor"
+       }
 };
 
 int bangdotlife, nbangdots;
@@ -127,22 +138,20 @@ init_engine_dots() {
 void
 new_bang_dots(int xbang, int ybang, int dx, int dy, SDL_Surface *s)
 {
-       int x,y,endcount;
-       uint16_t *pixel,c;
+       int i, n, x, y;
+       uint16_t *pixel, c;
        uint32_t colorkey;
        int row_inc;
-       double theta,r;
-       int begin_generate;
+       double theta, r;
 
-       begin_generate = SDL_GetTicks();
+       n = 24.0 * t_frame;
        pixel = s->pixels;
        row_inc = s->pitch/sizeof(uint16_t) - s->w;
        colorkey = s->format->colorkey;
 
        SDL_LockSurface(s);
 
-       endcount = 0;
-       while (endcount<3) {
+       for(i=0; i<n; i++) {
                pixel = s->pixels;
                for(y=0; y<s->h; y++) {
                        for(x = 0; x<s->w; x++) {
@@ -150,26 +159,21 @@ new_bang_dots(int xbang, int ybang, int dx, int dy, SDL_Surface *s)
                                if(c && c != colorkey) {
                                        theta = frnd()*M_PI*2;
                                        r = frnd(); r = 1 - r*r;
-                                       // r = 1 - frnd()*frnd();
 
                                        bdot[bd2].dx = 45*r*cos(theta) + dx;
                                        bdot[bd2].dy = 45*r*sin(theta) + dy;
                                        bdot[bd2].x = x + xbang;
                                        bdot[bd2].y = y + ybang;
-                                       bdot[bd2].c = 0;
+                                       bdot[bd2].c = (i < n-3) ? 0 : c;
                                        bdot[bd2].life = 100;
                                        bdot[bd2].decay = frnd()*3 + 1;
                                        bdot[bd2].active = 1;
 
-                                       // Replace the last few bang dots with the pixels from the exploding object
-                                       if(endcount>0) bdot[bd2].c = c;
-
                                        bd2 = (bd2+1) % MAXBANGDOTS;
                                }
                                pixel += row_inc;
                        }
                }
-               if(SDL_GetTicks() - begin_generate > 7) endcount++;
        }
 
        SDL_UnlockSurface(s);
@@ -182,6 +186,7 @@ draw_bang_dots(SDL_Surface *s)
        int first_i, last_i;
        uint16_t *pixels, *pixel, c;
        int row_inc = s->pitch/sizeof(uint16_t);
+       Sprite *hit;
 
        pixels = (uint16_t *) s->pixels;
        first_i = -1;
@@ -203,7 +208,14 @@ draw_bang_dots(SDL_Surface *s)
                }
 
                // check collisions
-               if(pixel_collides(bdot[i].x, bdot[i].y)) { bdot[i].active = 0; continue; }
+               if((hit = pixel_collides(bdot[i].x, bdot[i].y))) {
+                       if(hit->type != SHIP) { // they shouldn't hit the ship, but they do
+                               bdot[i].active = 0;
+                               hit->dx += ENGINE_DOT_WEIGHT * bdot[i].life * bdot[i].dx / sprite_mass(hit);
+                               hit->dy += ENGINE_DOT_WEIGHT * bdot[i].life * bdot[i].dy / sprite_mass(hit);
+                               continue;
+                       }
+               }
 
                pixel = pixels + row_inc*(int)(bdot[i].y) + (int)(bdot[i].x);
                if(bdot[i].c) c = bdot[i].c; else c = heatcolor[(int)(bdot[i].life)*3];
@@ -256,6 +268,7 @@ draw_engine_dots(SDL_Surface *s) {
        uint16_t *pixels = (uint16_t *) s->pixels;
        int row_inc = s->pitch/sizeof(uint16_t);
        int heatindex;
+       Sprite *hit;
 
        for(i = 0; i<MAXENGINEDOTS; i++) {
                if(!edot[i].active) continue;
@@ -268,7 +281,15 @@ draw_engine_dots(SDL_Surface *s) {
                        edot[i].active = 0;
                        continue;
                }
-               if(pixel_collides(edot[i].x, edot[i].y)) { edot[i].active = 0; continue; }
+               // check collisions
+               if((hit = pixel_collides(edot[i].x, edot[i].y))) {
+                       if(hit->type != SHIP) { // they shouldn't hit the ship, but they do
+                               edot[i].active = 0;
+                               hit->dx += ENGINE_DOT_WEIGHT * edot[i].life * edot[i].dx / sprite_mass(hit);
+                               hit->dy += ENGINE_DOT_WEIGHT * edot[i].life * edot[i].dy / sprite_mass(hit);
+                               continue;
+                       }
+               }
                heatindex = edot[i].life * 6;
                c = heatindex>3*W ? heatcolor[3*W-1] : heatcolor[heatindex];
                pixels[row_inc*(int)(edot[i].y) + (int)(edot[i].x)] = c;
@@ -282,7 +303,7 @@ drawdots(SDL_Surface *s) {
        // Create engine dots out the side we're moving from
        for(m = 0; m<4; m++) {
                if(ship.jets & 1<<m) { // 'jets' is a bit field
-                       new_engine_dots(80,m);
+                       new_engine_dots(200.0*t_frame,m);
                }
        }
 
@@ -314,7 +335,7 @@ load_image(char *filename)
 void
 load_ship(void)
 {
-       load_sprite(SPRITE(&ship), "sprites/ship.png");
+       load_sprite(SPRITE(&ship), "ship.png");
 }
 
 int
@@ -366,18 +387,18 @@ init(void) {
        }
 
        // Load the banners
-       NULLERROR(surf_b_variations = load_image("banners/variations.png"));
-       NULLERROR(surf_b_on = load_image("banners/on.png"));
-       NULLERROR(surf_b_rockdodger = load_image("banners/rockdodger.png"));
+       NULLERROR(surf_b_variations = load_image("b_variations.png"));
+       NULLERROR(surf_b_on = load_image("b_on.png"));
+       NULLERROR(surf_b_rockdodger = load_image("b_rockdodger.png"));
 
-       NULLERROR(surf_b_game = load_image("banners/game.png"));
-       NULLERROR(surf_b_over = load_image("banners/over.png"));
+       NULLERROR(surf_b_game = load_image("b_game.png"));
+       NULLERROR(surf_b_over = load_image("b_over.png"));
 
        // Load the life indicator (small ship) graphic.
-       NULLERROR(surf_life = load_image("indicators/life.png"));
+       NULLERROR(surf_life = load_image("life.png"));
 
        // Load the font image
-       s = add_data_path(BIG_FONT_FILE);
+       s = add_data_path("font.png");
        if(s) {
                NULLERROR(surf_font_big = IMG_Load(s));
                free(s);
@@ -412,11 +433,79 @@ show_lives(void)
 }
 
 void
-draw(void) {
+draw_game_over(void)
+{
+       int x;
+       char *text0, *text1;
        SDL_Rect dest;
+       float a_game = 0, a_over = 0;
+
+       // fade in "GAME", then "OVER".
+       a_game = min(1.0, faderate*fadetimer/3.0);
+       if(a_game == 1.0) a_over = min(1.0, faderate*fadetimer/3.0 - 1);
+
+       fadetimer += t_frame;
+
+       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)(a_game*(200 + 55*cos(fadetimer))));
+       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)(a_over*(200 + 55*sin(fadetimer))));
+       SDL_BlitSurface(surf_b_over,NULL,surf_screen,&dest);
+
+       if(new_high_score(score)) {
+               text0 = "New High Score!";
+               text1 = "Press SPACE to continue";
+       } else {
+               text0 = msgs[g_easy][0];
+               text1 = msgs[g_easy][1];
+       }
+
+       x = (XSIZE-SFont_TextWidth(g_font,text0))/2 + cos(fadetimer/9)*10;
+       SFont_Write(surf_screen,g_font,x,YSIZE-100 + cos(fadetimer/6)*5,text0);
+
+       x = (XSIZE-SFont_TextWidth(g_font,text1))/2 + sin(fadetimer/9)*10;
+       SFont_Write(surf_screen,g_font,x,YSIZE-50 + sin(fadetimer/4)*5,text1);
+}
+
+void
+draw_title_page(void)
+{
        int x;
        char *text;
-       float fadegame,fadeover;
+       SDL_Rect dest;
+
+       fadetimer += t_frame/2.0;
+
+       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)));
+       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,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,NULL,surf_screen,&dest);
+
+       text = msgs[g_easy][(int)(fadetimer/35)%NSEQUENCE];
+       x = (XSIZE-SFont_TextWidth(g_font,text))/2 + cos(fadetimer/4.5)*10;
+       SFont_Write(surf_screen,g_font,x,YSIZE-100 + cos(fadetimer/3)*5,text);
+
+       text = "Version " VERSION;
+       x = (XSIZE-SFont_TextWidth(g_font,text))/2 + sin(fadetimer/4.5)*10;
+       SFont_Write(surf_screen,g_font,x,YSIZE-50 + sin(fadetimer/2)*5,text);
+}
+
+void
+draw(void) {
 
        SDL_FillRect(surf_screen,NULL,0);  // black background
        drawdots(surf_screen);             // background dots
@@ -428,72 +517,12 @@ draw(void) {
 
        // If it's game over, show the game over graphic in the dead centre
        switch (state) {
-               case GAME_OVER:
-                       if(fadetimer<3.0/faderate) {
-                               fadegame = fadetimer/(3.0/faderate);
-                       } else {
-                               fadegame = 1.0;
-                       }
-
-                       if(fadetimer<3.0/faderate) {
-                               fadeover = 0.0;
-                       } else if(fadetimer<6.0/faderate) {
-                               fadeover = ((3.0/faderate)-fadetimer)/(6.0/faderate);
-                       } else {
-                               fadeover = 1.0;
-                       }
-
-                       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 += t_frame/1.0))));
-                       SDL_BlitSurface(surf_b_game,NULL,surf_screen,&dest);
+               case GAME_OVER: draw_game_over(); break;
 
-                       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,NULL,surf_screen,&dest);
-               break;
-
-               case TITLE_PAGE:
-
-                       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 += t_frame/2.0)));
-                       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,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,NULL,surf_screen,&dest);
-
-                       text = "Version " VERSION;
-                       x = (XSIZE-SFont_TextWidth(g_font,text))/2 + sin(fadetimer/4.5)*10;
-                       SFont_Write(surf_screen,g_font,x,YSIZE-50 + sin(fadetimer/2)*5,text);
-
-                       text = sequence[(int)(fadetimer/40)%NSEQUENCE];
-                       //text = "Press SPACE to start!";
-                       x = (XSIZE-SFont_TextWidth(g_font,text))/2 + cos(fadetimer/4.5)*10;
-                       SFont_Write(surf_screen,g_font,x,YSIZE-100 + cos(fadetimer/3)*5,text);
-               break;
+               case TITLE_PAGE: draw_title_page(); break;
 
                case HIGH_SCORE_ENTRY:
                        play_tune(TUNE_HIGH_SCORE_ENTRY);
-                       if(!process_score_input()) {  // done inputting name
-
-                               // Change state to briefly show high scores page
-                               state = HIGH_SCORE_DISPLAY;
-                               state_timeout = 200;
-
-                               // Write the high score table to the file
-                               write_high_score_table();
-               
-                               play_tune(TUNE_TITLE_PAGE);
-                       }
                // FALL THROUGH TO
                case HIGH_SCORE_DISPLAY:
                        // Display de list o high scores mon.
@@ -518,8 +547,7 @@ draw(void) {
 static inline void
 kill_ship(Sprite *ship)
 {
-       ship->flags = MOVE|DRAW;
-       SDL_SetAlpha(ship->image, SDL_SRCALPHA, 0);
+       ship->flags = MOVE;
        bang = true;
 }
 
@@ -532,13 +560,46 @@ do_collision(Sprite *a, Sprite *b)
 }
 
 void
+init_score_entry(void)
+{
+       SDL_Event e;
+       state = HIGH_SCORE_ENTRY;
+       state_timeout = 5.0e6;
+       SDL_EnableUNICODE(1);
+       while(SDL_PollEvent(&e))
+               ;
+       insert_score(score);
+}
+
+void
 gameloop() {
-       Uint8 *keystate = SDL_GetKeyState(NULL);
+       SDL_Event e;
+       Uint8 *keystate;
        float tmp;
 
 
        for(;;) {
-               SDL_PumpEvents();
+               while(SDL_PollEvent(&e)) {
+                       switch(e.type) {
+                               case SDL_QUIT: return;
+                               case SDL_KEYUP:
+                                       if(e.key.keysym.sym == SDLK_ESCAPE
+                                          || e.key.keysym.sym == SDLK_q)
+                                               return;
+                                       break;
+                               case SDL_KEYDOWN:
+                                       if(state == HIGH_SCORE_ENTRY)
+                                               if(!process_score_input(&e.key.keysym)) {
+                                                       // Write the high score table to the file
+                                                       write_high_score_table();
+                                                       // continue to display the scores briefly
+                                                       state = HIGH_SCORE_DISPLAY;
+                                                       state_timeout = 200;
+                                                       play_tune(TUNE_TITLE_PAGE);
+                                               }
+                                       break;
+                       }
+               }
                keystate = SDL_GetKeyState(NULL);
 
                if(!paused) {
@@ -553,21 +614,16 @@ gameloop() {
                                                play_tune(TUNE_GAMEPLAY);
                                                break;
                                        case GAME_OVER:
-                                               if(new_high_score(score)) {
-                                                       SDL_Event e;
-                                                       state = HIGH_SCORE_ENTRY;
-                                                       state_timeout = 5.0e6;
-                                                       SDL_EnableUNICODE(1);
-                                                       while(SDL_PollEvent(&e))
-                                                               ;
-                                               } else {
+                                               if(new_high_score(score)) init_score_entry();
+                                               else {
                                                        state = HIGH_SCORE_DISPLAY;
                                                        state_timeout = 400;
                                                }
                                                break;
                                        case HIGH_SCORE_DISPLAY:
                                                state = TITLE_PAGE;
-                                               state_timeout = 500.0;
+                                               state_timeout = 600.0;
+                                               fadetimer = 0.0;
                                                break;
                                        case HIGH_SCORE_ENTRY:
                                                break;
@@ -580,16 +636,7 @@ gameloop() {
                                }
                        } else {
                                if(state == DEAD_PAUSE) {
-                                       float blast_radius, alpha;
-                                       if(state_timeout >= DEAD_PAUSE_LENGTH - 20.0) {
-                                               blast_radius = BLAST_RADIUS * (DEAD_PAUSE_LENGTH - state_timeout) / 20.0;
-                                               blast_rocks(bangx, bangy, blast_radius);
-                                       }
-
                                        if(bangx < 60) bangx = 60;
-
-                                       alpha = 255.0 * (DEAD_PAUSE_LENGTH - state_timeout) / DEAD_PAUSE_LENGTH;
-                                       SDL_SetAlpha(ship.image, SDL_SRCALPHA, (uint8_t)alpha);
                                }
                        }
 
@@ -651,31 +698,46 @@ gameloop() {
                        }
 
                        // new game
-                       if(keystate[SDLK_SPACE]
+                       if((keystate[SDLK_SPACE] || keystate[SDLK_1] || keystate[SDLK_2])
                           && (state == HIGH_SCORE_DISPLAY
                               || state == TITLE_PAGE
                               || state == GAME_OVER)) {
-                               reset_sprites();
-                               reset_rocks();
-                               screendx = SCREENDXMIN; screendy = 0;
+                               if(state == GAME_OVER && new_high_score(score))
+                                       init_score_entry();
+                               else {
+                                       if((keystate[SDLK_SPACE] && !initial_rocks) || keystate[SDLK_2]) {
+                                               g_easy = 0;
+                                               initial_rocks = NORMAL_I_ROCKS;
+                                               final_rocks = NORMAL_F_ROCKS;
+                                               if(opt_gamespeed == EASY_GAMESPEED)
+                                                       opt_gamespeed = NORMAL_GAMESPEED;
+                                       } else if(keystate[SDLK_1]) {
+                                               g_easy = 1;
+                                               initial_rocks = EASY_I_ROCKS;
+                                               final_rocks = EASY_F_ROCKS;
+                                               opt_gamespeed = EASY_GAMESPEED;
+                                       }
+                                       reset_sprites();
+                                       reset_rocks();
+                                       screendx = SCREENDXMIN; screendy = 0;
 
-                               ship.x = XSIZE/2.2; ship.y = YSIZE/2;
-                               ship.dx = screendx; ship.dy = screendy;
-                               ship.lives = 4;
-                               ship.flags = MOVE|DRAW|COLLIDE;
-                               SDL_SetAlpha(ship.image, SDL_SRCALPHA, SDL_ALPHA_OPAQUE);
-                               add_sprite(SPRITE(&ship));
+                                       ship.x = XSIZE/2.2; ship.y = YSIZE/2;
+                                       ship.dx = screendx; ship.dy = screendy;
+                                       ship.lives = 4;
+                                       ship.flags = MOVE|DRAW|COLLIDE;
+                                       add_sprite(SPRITE(&ship));
 
-                               score = 0;
+                                       score = 0;
 
-                               state = GAMEPLAY;
-                               play_tune(TUNE_GAMEPLAY);
+                                       state = GAMEPLAY;
+                                       play_tune(TUNE_GAMEPLAY);
+                               }
                        }
 
                        ship.jets = 0;
                }
 
-               if(state == GAMEPLAY || state == DEAD_PAUSE) {
+               if(state == GAMEPLAY) {
                        if(!paused) {
                                if(keystate[SDLK_LEFT]  | keystate[SDLK_h]) { ship.dx -= 1.5*t_frame; ship.jets |= 1<<0;}
                                if(keystate[SDLK_DOWN]  | keystate[SDLK_t]) { ship.dy += 1.5*t_frame; ship.jets |= 1<<1;}
@@ -695,16 +757,16 @@ gameloop() {
                        }
                }
 
-               if(state != HIGH_SCORE_ENTRY && (keystate[SDLK_q] || keystate[SDLK_ESCAPE]))
-                       return;
-
+               if(state == TITLE_PAGE && keystate[SDLK_h]) {
+                       state = HIGH_SCORE_DISPLAY;
+                       state_timeout = 400;
+               }
        }
 }
 
 int
 main(int argc, char **argv) {
-       init_opts();
-       argp_parse(&argp, argc, argv, 0, 0, 0);
+       if(!parse_opts(argc, argv)) return 1;
 
        if(init()) {
                printf ("ta: '%s'\n",initerror);