X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=f7de24e0f20c1aa38985c52bff1c59facbedc02c;hp=5fb2fbff01643521da489f1ca1ff3b36e32c4659;hb=0224eb908d4084f52a22c8d64404a0efb4acfa35;hpb=3cfde1edc98388c11d4efbbba7c8deaf56c4b1ae diff --git a/main.c b/main.c index 5fb2fbf..f7de24e 100644 --- a/main.c +++ b/main.c @@ -99,10 +99,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 'e' for easy game", + "http://jasonwoof.org/vor" + }, + { + "Press SPACE for easy game", + "Press 'n' for normal game", + "http://jasonwoof.org/vor" + } }; int bangdotlife, nbangdots; @@ -182,6 +190,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 +212,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 +272,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; itype != 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; @@ -412,11 +437,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,58 +521,9 @@ 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); - - 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 GAME_OVER: draw_game_over(); 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); @@ -518,8 +562,9 @@ draw(void) { static inline void kill_ship(Sprite *ship) { - ship->flags = MOVE|DRAW; - SDL_SetAlpha(ship->image, SDL_SRCALPHA, 0); + ship->flags = MOVE; + // ship->flags = MOVE|DRAW; // FADE SHIP + // SDL_SetAlpha(ship->image, SDL_SRCALPHA, 0); // FADE SHIP bang = true; } @@ -532,6 +577,18 @@ 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); float tmp; @@ -553,21 +610,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,7 +632,8 @@ gameloop() { } } else { if(state == DEAD_PAUSE) { - float blast_radius, alpha; + float blast_radius; + // float alpha; // FADE SHIP 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); @@ -588,8 +641,9 @@ gameloop() { 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); + // FADE SHIP + // alpha = 255.0 * (DEAD_PAUSE_LENGTH - state_timeout) / DEAD_PAUSE_LENGTH; + // SDL_SetAlpha(ship.image, SDL_SRCALPHA, (uint8_t)alpha); } } @@ -651,31 +705,47 @@ gameloop() { } // new game - if(keystate[SDLK_SPACE] + if((keystate[SDLK_SPACE] || keystate[SDLK_e] || keystate[SDLK_n]) && (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_n]) { + 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_e]) { + 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; + // SDL_SetAlpha(ship.image, SDL_SRCALPHA, SDL_ALPHA_OPAQUE); // FADE SHIP + 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,6 +765,11 @@ gameloop() { } } + if(state == TITLE_PAGE && keystate[SDLK_h]) { + state = HIGH_SCORE_DISPLAY; + state_timeout = 400; + } + if(state != HIGH_SCORE_ENTRY && (keystate[SDLK_q] || keystate[SDLK_ESCAPE])) return;