X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=927d2bb812234c8c12f2862d61ca94ba3cec0b13;hp=43d7bda27f85d3769c51de4ecacf9a5588bf3e54;hb=148882a3cc520f34616a1175ed157fe258d68dcc;hpb=cffdedca2aba899f3e0f8b98f67b9125edf6b5a5

diff --git a/main.c b/main.c
index 43d7bda..927d2bb 100644
--- a/main.c
+++ b/main.c
@@ -99,9 +99,20 @@ enum states {
 enum states state = TITLE_PAGE;
 float state_timeout = 600.0;
 
-#define NSEQUENCE 2
+char *space_msgs[3] = {
+	"Press SPACE to start a new game",
+	"Press SPACE for easy game",
+	"Press SPACE for normal game"
+};
+
+char *other_msgs[2] = {
+	"Press 'e' for easy game",
+	"Press 'n' for normal game"
+};
+#define NSEQUENCE 3
 char *sequence[] = {
-	"Press SPACE to start",
+	"Press SPACE for normal game",
+	"Press 'e' for easy game",
 	"http://jasonwoof.org/vor"
 };
 
@@ -256,6 +267,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 +280,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;
@@ -414,8 +434,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);
@@ -432,6 +454,23 @@ 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 if(initial_rocks == EASY_I_ROCKS) {
+		text0 = space_msgs[1]; sequence[0] = text0;
+		text1 = other_msgs[1]; sequence[1] = text1;
+	} else {
+		text0 = space_msgs[0]; sequence[0] = space_msgs[2];
+		text1 = other_msgs[0]; sequence[1] = text1;
+	}
+
+	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
@@ -458,13 +497,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 = sequence[(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
@@ -576,7 +615,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;
@@ -662,13 +702,23 @@ 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]) {
+						initial_rocks = NORMAL_I_ROCKS;
+						final_rocks = NORMAL_F_ROCKS;
+						if(opt_gamespeed == EASY_GAMESPEED)
+							opt_gamespeed = NORMAL_GAMESPEED;
+					} else if(keystate[SDLK_e]) {
+						initial_rocks = EASY_I_ROCKS;
+						final_rocks = EASY_F_ROCKS;
+						opt_gamespeed = EASY_GAMESPEED;
+					}
 					reset_sprites();
 					reset_rocks();
 					screendx = SCREENDXMIN; screendy = 0;