X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=f7de24e0f20c1aa38985c52bff1c59facbedc02c;hp=b8b03c376f3b315e8ceff72eccec572595eb4d2f;hb=0224eb908d4084f52a22c8d64404a0efb4acfa35;hpb=f1cd2ff38dd9f3c5c4925d8a5f9588129b3bf343

diff --git a/main.c b/main.c
index b8b03c3..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];
@@ -423,8 +439,10 @@ show_lives(void)
 void
 draw_game_over(void)
 {
-	float a_game = 0, a_over = 0;
+	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);
@@ -441,6 +459,20 @@ draw_game_over(void)
 	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
@@ -467,13 +499,13 @@ draw_title_page(void)
 	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);
-
-	text = sequence[(int)(fadetimer/40)%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);
 }
 
 void
@@ -553,6 +585,7 @@ init_score_entry(void)
 	SDL_EnableUNICODE(1);
 	while(SDL_PollEvent(&e))
 		;
+	insert_score(score);
 }
 
 void
@@ -585,7 +618,8 @@ gameloop() {
 						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;
@@ -671,13 +705,25 @@ 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)) {
 				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;
@@ -719,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;