X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=ba1c8b7bd6421c71f35543fd8da979fa5eedda50;hp=258ecd3df09b30709e01c874a3afea2a6342f758;hb=ae2d57cc5b1b64621a76aed51ce14f4c555c3bc8;hpb=d918241a08d6e8b1cc10b3c682edde8876a492ef

diff --git a/main.c b/main.c
index 258ecd3..ba1c8b7 100644
--- a/main.c
+++ b/main.c
@@ -19,10 +19,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include <argp.h>
 #include <math.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_image.h>
+#include <SDL.h>
+#include <SDL_image.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,9 +38,13 @@
 #include "mt.h"
 #include "rocks.h"
 #include "score.h"
-#include "shape.h"
+#include "sprite.h"
 #include "sound.h"
 
+#ifdef WIN32
+#define SDL_SetAlpha(surf, flag, alpha)
+#endif
+
 // ************************************* VARS
 // SDL_Surface global variables
 SDL_Surface 
@@ -51,7 +54,6 @@ SDL_Surface
 	*surf_b_rockdodger, // "rockdodger" banner
 	*surf_b_game,	// Title element "game"
 	*surf_b_over,	// Title element "over"
-	*surf_ship,		// Spaceship element
 	*surf_life,	// Indicator of number of ships remaining
 	*surf_rock[NROCKS],	// THE ROCKS
 	*surf_font_big;	// The big font
@@ -67,22 +69,20 @@ struct bangdots bdot[MAXBANGDOTS], *bdotptr = bdot;
 char topline[1024];
 char *initerror = "";
 
-struct shape shipshape;
-float shipx = XSIZE/2, shipy = YSIZE/2;	// X position, 0..XSIZE
-float shipdx = SCREENDXMIN, shipdy = 0.0;	// Change in X position per tick.
+struct ship ship = { SHIP, 0, NULL, XSIZE/2, YSIZE/2, SCREENDXMIN, 0.0 };
+	  
 float screendx = SCREENDXMIN, screendy = 0.0;
-float xscroll, yscroll;
 float back_dist;
 
 // all movement is based on t_frame.
-float t_frame;  // length of this frame (in ticks = 1/20th second)
+float t_frame;  // length of this frame (in ticks = 1/20th second)  adjusted for gamespeed
 int ms_frame;   // length of this frame (milliseconds)
 int ms_end;     // end of this frame (milliseconds)
 
+int bang = false;
 float bangx, bangy, bangdx, bangdy;
 
-int nships,score;
-int jets = 0;
+int score;
 
 float fadetimer = 0, faderate;
 
@@ -102,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://herkamire.com/jason/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;
@@ -130,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++) {
@@ -158,103 +164,87 @@ new_bang_dots(int xbang, int ybang, int dx, int dy, SDL_Surface *s)
 					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);
 }
 
 void
-draw_bang_dots(SDL_Surface *s) {
+move_bang_dots(float ticks)
+{
 	int i;
-	int first_i, last_i;
-	Uint16 *rawpixel;
-	rawpixel = (Uint16 *) s->pixels;
+	Sprite *hit;
 
-	first_i = -1;
-	last_i = 0;
+	for(i=0; i<MAXBANGDOTS; i++) {
+		if(!bdot[i].active) continue;
 
-	for(i = bd1; (bd1 <= bd2)?(i<bd2):(i >= bd1 && i < bd2); last_i = ++i) {
-
-		i %= MAXBANGDOTS;
-
-		if(bdot[i].x <= 0 || bdot[i].x >= XSIZE || bdot[i].y <= 0 || bdot[i].y >= YSIZE) {
-			// If the dot has drifted outside the perimeter, kill it
+		// decrement life and maybe kill
+		bdot[i].life -= bdot[i].decay;
+		if(bdot[i].life < 0) { bdot[i].active = 0; continue; }
+		
+		// move and clip
+		bdot[i].x += (bdot[i].dx - screendx)*ticks;
+		bdot[i].y += (bdot[i].dy - screendy)*ticks;
+		if(bdot[i].x < 0 || bdot[i].x >= XSIZE || bdot[i].y < 0 || bdot[i].y >= YSIZE) {
 			bdot[i].active = 0;
+			continue;
 		}
 
-		if(bdot[i].active) {
-			if(first_i < 0)
-			first_i = i;
-			rawpixel[(int)(s->pitch/2*(int)(bdot[i].y)) + (int)(bdot[i].x)] = bdot[i].c ? bdot[i].c : heatcolor[(int)(bdot[i].life*3)];
-			bdot[i].life -= bdot[i].decay;
-			bdot[i].x += bdot[i].dx*t_frame - xscroll;
-			bdot[i].y += bdot[i].dy*t_frame - yscroll;
-
-			if(bdot[i].life<0) bdot[i].active = 0;
+		// check collisions
+		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;
+			}
 		}
 	}
-
-	if(first_i >= 0) {
-		bd1 = first_i;
-		bd2 = last_i;
-	}
-	else {
-		bd1 = 0;
-		bd2 = 0;
-	}
-
 }
 
 
 void
-draw_engine_dots(SDL_Surface *s) {
+draw_bang_dots(SDL_Surface *s)
+{
 	int i;
-	Uint16 *rawpixel;
-	rawpixel = (Uint16 *) s->pixels;
+	uint16_t *pixels, *pixel, c;
+	int row_inc = s->pitch/sizeof(uint16_t);
 
-	for(i = 0; i<MAXENGINEDOTS; i++) {
-		if(edot[i].active) {
-			edot[i].x += edot[i].dx*t_frame - xscroll;
-			edot[i].y += edot[i].dy*t_frame - yscroll;
-			edot[i].life -= t_frame*3;
-			if(edot[i].life < 0
-					|| edot[i].y<0 || edot[i].y >= YSIZE
-					|| edot[i].x<0 || edot[i].x >= XSIZE) {
-				edot[i].active = 0;
-			} else {
-				int heatindex;
-				heatindex = edot[i].life * 6;
-				//rawpixel[(int)(s->pitch/2*(int)(edot[i].y)) + (int)(edot[i].x)] = lifecolor[(int)(edot[i].life)];
-				rawpixel[(int)(s->pitch/2*(int)(edot[i].y)) + (int)(edot[i].x)] = heatindex>3*W ? heatcolor[3*W-1] : heatcolor[heatindex];
-			}
-		}
+	pixels = (uint16_t *) s->pixels;
+
+	for(i=0; i<MAXBANGDOTS; i++) {
+		if(!bdot[i].active) 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];
+		*pixel = c;
 	}
 }
 
+
 void
-new_engine_dots(int n, int dir) {
+new_engine_dots(float time_span, int dir) {
 	int i;
+	int n = time_span * ENGINE_DOTS_PER_TIC;
 	float a, r;  // angle, random length
 	float dx, dy;
 	float hx, hy; // half ship width/height.
 	static const int s[4] = { 2, 1, 0, 1 };
+	float time;
+	float accelh, accelv, past_ship_dx, past_ship_dy;
 
-	hx = surf_ship->w / 2;
-	hy = surf_ship->h / 2;
+	hx = ship.image->w / 2;
+	hy = ship.image->h / 2;
 
 	for(i = 0; i<n; i++) {
 		if(dotptr->active == 0) {
@@ -264,18 +254,40 @@ new_engine_dots(int n, int dir) {
 			dy = r * -sin(a);  // screen y is "backwards".
 
 			dotptr->active = 1;
-			dotptr->x = shipx + s[dir]*hx + (frnd()-0.5)*3;
-			dotptr->y = shipy + s[(dir+1)&3]*hy + (frnd()-0.5)*3;
+
+			// dot was created at a random time during the time span
+			time = frnd() * time_span; // this is how long ago
+
+			// calculate how fast the ship was going when this engine dot was
+			// created (as if it had a smooth acceleration). This is used in
+			// determining the velocity of the dots, but not their starting
+			// location.
+			accelh = ((ship.jets >> 2) & 1) - (ship.jets & 1);
+			accelh *= THRUSTER_STRENGTH * time;
+			past_ship_dx = ship.dx - accelh;
+			accelv = ((ship.jets >> 1) & 1) - ((ship.jets >> 3) & 1);
+			accelv *= THRUSTER_STRENGTH * time;
+			past_ship_dy = ship.dy - accelv;
+
+			// the starting position (not speed) of the dot is calculated as
+			// though the ship were traveling at a constant speed for this
+			// time_span.
+			dotptr->x = (ship.x - (ship.dx - screendx) * time) + s[dir]*hx;
+			dotptr->y = (ship.y - (ship.dy - screendy) * time) + s[(dir+1)&3]*hy;
 			if(dir&1) {
-				dotptr->dx = shipdx + 2*dx;
-				dotptr->dy = shipdy + 20*dy;
+				dotptr->dx = past_ship_dx + 2*dx;
+				dotptr->dy = past_ship_dy + 20*dy;
 				dotptr->life = 60 * fabs(dy);
 			} else {
-				dotptr->dx = shipdx + 20*dx;
-				dotptr->dy = shipdy + 2*dy;
+				dotptr->dx = past_ship_dx + 20*dx;
+				dotptr->dy = past_ship_dy + 2*dy;
 				dotptr->life = 60 * fabs(dx);
 			}
 
+			// move the dot as though it were created in the past
+			dotptr->x += (dotptr->dx - screendx) * time;
+			dotptr->y += (dotptr->dy - screendy) * time;
+
 			if(dotptr - edot < MAXENGINEDOTS-1) dotptr++;
 			else dotptr = edot;
 		}
@@ -283,18 +295,60 @@ new_engine_dots(int n, int dir) {
 }
 
 void
-drawdots(SDL_Surface *s) {
+move_engine_dots(float ticks) {
+	int i;
+	Sprite *hit;
+
+	for(i = 0; i<MAXENGINEDOTS; i++) {
+		if(!edot[i].active) continue;
+
+		edot[i].x += (edot[i].dx - screendx)*ticks;
+		edot[i].y += (edot[i].dy - screendy)*ticks;
+		edot[i].life -= t_frame*3;
+		if(edot[i].life < 0 || edot[i].x<0 || edot[i].x >= XSIZE || edot[i].y < 0 || edot[i].y >= YSIZE) {
+			edot[i].active = 0;
+		}
+
+		// 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;
+			}
+		}
+	}
+}
+
+void
+draw_engine_dots(SDL_Surface *s) {
+	int i;
+	uint16_t c;
+	uint16_t *pixels = (uint16_t *) s->pixels;
+	int row_inc = s->pitch/sizeof(uint16_t);
+	int heatindex;
+
+	for(i = 0; i<MAXENGINEDOTS; i++) {
+		if(!edot[i].active) 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;
+	}
+}
+
+void
+draw_dots(SDL_Surface *s) {
 	int m;
 
-	// Create engine dots out the side we're moving from
+	// Create engine dots
 	for(m = 0; m<4; m++) {
-		if(jets & 1<<m) { // 'jets' is a bit field
-			new_engine_dots(80,m);
+		if(ship.jets & 1<<m) { // 'jets' is a bit field
+			new_engine_dots(t_frame,m);
 		}
 	}
 
-	move_dust();
-
 	SDL_LockSurface(s);
 	draw_dust(s);
 	draw_engine_dots(s);
@@ -302,11 +356,33 @@ drawdots(SDL_Surface *s) {
 	SDL_UnlockSurface(s);
 }
 
+SDL_Surface *
+load_image(char *filename)
+{
+	SDL_Surface *tmp, *img = NULL;
+	char *s = add_data_path(filename);
+	if(s) {
+		tmp = IMG_Load(s);
+		free(s);
+		if(tmp) {
+			img = SDL_DisplayFormat(tmp);
+			SDL_FreeSurface(tmp);
+		}
+	}
+	return img;
+}
+
+void
+load_ship(void)
+{
+	load_sprite(SPRITE(&ship), "ship.png");
+}
+
 int
 init(void) {
 
 	int i;
-	SDL_Surface *temp;
+	char *s;
 	Uint32 flag;
 
 	// Where are our data files?
@@ -317,7 +393,7 @@ init(void) {
 		// Initialize SDL with audio and video
 		if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) != 0) {
 			opt_sound = 0;
-			printf ("Can't open sound, starting without it\n");
+			fputs("Can't open sound, starting without it\n", stderr);
 			atexit(SDL_Quit);
 		} else {
 			atexit(SDL_Quit);
@@ -351,37 +427,29 @@ init(void) {
 	}
 
 	// Load the banners
-	NULLERROR(temp = IMG_Load(add_path("banners/variations.png")));
-	NULLERROR(surf_b_variations = SDL_DisplayFormat(temp));
-
-	NULLERROR(temp = IMG_Load(add_path("banners/on.png")));
-	NULLERROR(surf_b_on = SDL_DisplayFormat(temp));
-
-	NULLERROR(temp = IMG_Load(add_path("banners/rockdodger.png")));
-	NULLERROR(surf_b_rockdodger = SDL_DisplayFormat(temp));
-
-	NULLERROR(temp = IMG_Load(add_path("banners/game.png")));
-	NULLERROR(surf_b_game = SDL_DisplayFormat(temp));
+	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(temp = IMG_Load(add_path("banners/over.png")));
-	NULLERROR(surf_b_over = SDL_DisplayFormat(temp));
-
-	surf_font_big = IMG_Load(add_path(BIG_FONT_FILE));
-	g_font = SFont_InitFont(surf_font_big);
-
-	// Load the spaceship graphic.
-	NULLERROR(temp = IMG_Load(add_path("sprites/ship.png")));
-	NULLERROR(surf_ship = SDL_DisplayFormat(temp));
-	get_shape(surf_ship, &shipshape);
+	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(temp = IMG_Load(add_path("indicators/life.png")));
-	NULLERROR(surf_life = SDL_DisplayFormat(temp));
+	NULLERROR(surf_life = load_image("life.png"));
+
+	// Load the font image
+	s = add_data_path("font.png");
+	if(s) {
+		NULLERROR(surf_font_big = IMG_Load(s));
+		free(s);
+		g_font = SFont_InitFont(surf_font_big);
+	}
 
 	init_engine_dots();
 	init_dust();
 
-	init_rocks();
+	init_sprites();
+	add_sprite(SPRITE(&ship));
 
 	// Remove the mouse cursor
 #ifdef SDL_DISABLE
@@ -391,112 +459,110 @@ init(void) {
 	return 0;
 }
 
-int
-draw() {
+void
+show_lives(void)
+{
 	int i;
 	SDL_Rect dest;
-	int bang, x;
-	char *text;
-	float fadegame,fadeover;
 
-	bang = 0;
+	for(i=0; i<ship.lives-1; i++) {
+		dest.x = (i + 1)*(surf_life->w + 10);
+		dest.y = 20;
+		SDL_BlitSurface(surf_life, NULL, surf_screen, &dest);
+	}
+}
 
-	// Draw a fully black background
-	SDL_FillRect(surf_screen,NULL,0);
+void
+draw_game_over(void)
+{
+	int x;
+	char *text0, *text1;
+	SDL_Rect dest;
+	float a_game = 0, a_over = 0;
 
-	// Draw the background dots
-	drawdots(surf_screen);
+	// 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);
 
-	// Draw ship
-	if(state == GAMEPLAY ) {
-		dest.x = shipx;
-		dest.y = shipy;
-		SDL_BlitSurface(surf_ship,NULL,surf_screen,&dest);
-	}
+	fadetimer += t_frame;
 
-	draw_rocks();
+	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);
 
-	// Draw the life indicators.
-	if(state == GAMEPLAY || state == DEAD_PAUSE || state == GAME_OVER) {
-		for(i = 0; i<nships-1; i++) {
-			dest.x = (i + 1)*(surf_life->w + 10);
-			dest.y = 20;
-			SDL_BlitSurface(surf_life, 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];
 	}
 
-	// Draw the score
-	snprintscore_line(topline, 50, score);
-	SFont_Write(surf_screen, g_font, XSIZE-250, 0, topline);
+	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);
 
-	// 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;
-			}
+	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);
+}
 
-			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;
-			}
+void
+draw_title_page(void)
+{
+	int x;
+	char *text;
+	SDL_Rect dest;
 
-			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);
+	fadetimer += t_frame/2.0;
 
-			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;
+	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);
 
-		case TITLE_PAGE:
+	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_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_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);
 
-			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);
+	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);
 
-			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 = "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) {
 
-			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;
+	SDL_FillRect(surf_screen,NULL,0);  // black background
+	draw_dots(surf_screen);             // background dots
+	draw_sprite(SPRITE(&ship));
+	draw_rocks();
 
-		case HIGH_SCORE_ENTRY:
-			play_tune(TUNE_HIGH_SCORE_ENTRY);
-			if(!process_score_input()) {  // done inputting name
+	show_lives();
+	show_score();
 
-				// Change state to briefly show high scores page
-				state = HIGH_SCORE_DISPLAY;
-				state_timeout = 200;
+	// If it's game over, show the game over graphic in the dead centre
+	switch (state) {
+		case GAME_OVER: draw_game_over(); break;
 
-				// Write the high score table to the file
-				write_high_score_table();
-		
-				play_tune(TUNE_TITLE_PAGE);
-			}
+		case TITLE_PAGE: draw_title_page(); break;
+
+		case HIGH_SCORE_ENTRY:
+			play_tune(TUNE_HIGH_SCORE_ENTRY);
 		// FALL THROUGH TO
 		case HIGH_SCORE_DISPLAY:
 			// Display de list o high scores mon.
@@ -507,62 +573,97 @@ draw() {
 			; // no action necessary
 	}
 
-	if(state == GAMEPLAY) {
-		bang = hit_rocks(shipx, shipy, &shipshape);
-	}
+	collisions();
 
 	ms_frame = SDL_GetTicks() - ms_end;
 	ms_end += ms_frame;
-	if(ms_frame>200 || ms_frame<0) {
-		// We won't run at all below 5 frames per second.
-		// This also happens if we were paused, grr.
-		t_frame = 0;
-		ms_frame = 0;
-	} else {
-		t_frame = opt_gamespeed * ms_frame / 50;
-		if(state == GAMEPLAY) score += ms_frame;
-	}
+	t_frame = opt_gamespeed * ms_frame / 50;
+	if(state == GAMEPLAY) score += ms_frame;
 
 	// Update the surface
 	SDL_Flip(surf_screen);
+}
 
+static inline void
+kill_ship(Sprite *ship)
+{
+	ship->flags = MOVE;
+	bang = true;
+}
 
-	return bang;
+void
+do_collision(Sprite *a, Sprite *b)
+{
+	if(a->type == SHIP) kill_ship(a);
+	else if (b->type == SHIP) kill_ship(b);
+	else bounce(a, b);
 }
 
-int
+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() {
+	SDL_Event e;
 	Uint8 *keystate;
 	float tmp;
 
 
 	for(;;) {
+		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) {
 			// Count down the game loop timer, and change state when it gets to zero or less;
 
 			if((state_timeout -= t_frame*3) < 0) {
 				switch(state) {
 					case DEAD_PAUSE:
-						// Create a new ship and start all over again
+						// 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)) {
-							SDL_Event e;
-							state = HIGH_SCORE_ENTRY;
-							state_timeout = 5.0e6;
-							SDL_EnableUNICODE(1);
-							while(SDL_PollEvent(&e))
-								;
-						} else if(!keystate[SDLK_SPACE]) {
+						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;
@@ -575,120 +676,116 @@ gameloop() {
 				}
 			} else {
 				if(state == DEAD_PAUSE) {
-					float blast_radius;
-					int fixonly;
-
-					if(state_timeout < DEAD_PAUSE_LENGTH - 20.0) {
-						blast_radius = BLAST_RADIUS * 1.3;
-						fixonly = 1;
-					} else {
-						blast_radius = BLAST_RADIUS * (DEAD_PAUSE_LENGTH - state_timeout) / 20.0;
-						fixonly = 0;
-					}
-					blast_rocks(bangx, bangy, blast_radius, fixonly);
-
 					if(bangx < 60) bangx = 60;
 				}
 			}
 
-			new_rocks();
-
-			// INERTIA
-			shipx += shipdx*t_frame;
-			shipy += shipdy*t_frame;
-
 			// SCROLLING
-			tmp = (shipy-YSCROLLTO)/25 + (shipdy-screendy);
+			tmp = (ship.y+ship.h/2+ship.dy*t_frame-YSCROLLTO)/25 + (ship.dy-screendy);
 			screendy += tmp * t_frame/12;
-			tmp = (shipx-XSCROLLTO)/25 + (shipdx-screendx);
+			tmp = (ship.x+ship.w/2+ship.dx*t_frame-XSCROLLTO)/25 + (ship.dx-screendx);
 			screendx += tmp * t_frame/12;
 			// taper off so we don't hit the barrier abruptly.
 			// (if we would hit in < 2 seconds, adjust to 2 seconds).
-			if(back_dist + (screendx - SCREENDXMIN)*TO_TICKS(2) < 0) {
+			if(back_dist + (screendx - SCREENDXMIN)*TO_TICKS(2) < 0)
 				screendx = SCREENDXMIN - (back_dist/TO_TICKS(2));
-			}
-
 			back_dist += (screendx - SCREENDXMIN)*t_frame;
 			if(opt_max_lead >= 0) back_dist = min(back_dist, opt_max_lead);
 
-			xscroll = screendx * t_frame;
-			yscroll = screendy * t_frame;
-
-			shipx -= xscroll;
-			shipy -= yscroll;
-
 			// move bang center
-			bangx += bangdx*t_frame - xscroll;
-			bangy += bangdy*t_frame - yscroll;
-
-			move_rocks();
-
-
-			// BOUNCE X
-			if(shipx<0 || shipx>XSIZE-surf_ship->w) {
-				// BOUNCE from left and right wall
-				shipx -= (shipdx-screendx)*t_frame;
-				shipdx = screendx - (shipdx-screendx)*opt_bounciness;
+			bangx += (bangdx - screendx)*t_frame;
+			bangy += (bangdy - screendy)*t_frame;
+
+			move_sprites(t_frame);
+			move_engine_dots(t_frame);
+			move_bang_dots(t_frame);
+			move_dust(t_frame);
+
+			// BOUNCE off left or right edge of screen
+			if(ship.x < 0 || ship.x+ship.w > XSIZE) {
+				ship.x -= (ship.dx-screendx)*t_frame;
+				ship.dx = screendx - (ship.dx-screendx)*opt_bounciness;
 			}
 
-			// BOUNCE Y
-			if(shipy<0 || shipy>YSIZE-surf_ship->h) {
-				// BOUNCE from top and bottom wall
-				shipy -= (shipdy-screendy)*t_frame;
-				shipdy = screendy - (shipdy-screendy)*opt_bounciness;
+			// BOUNCE off top or bottom of screen
+			if(ship.y < 0 || ship.y+ship.h > YSIZE) {
+				ship.y -= (ship.dy-screendy)*t_frame;
+				ship.dy = screendy - (ship.dy-screendy)*opt_bounciness;
 			}
 
+			new_rocks(t_frame);
+
+			draw();
 
-			if(draw() && state == GAMEPLAY) {
+			if(state == GAMEPLAY && bang) {
 				// Died
+				bang = false;
 				play_sound(SOUND_BANG); // Play the explosion sound
-				bangx = shipx; bangy = shipy; bangdx = shipdx; bangdy = shipdy;
-				new_bang_dots(shipx,shipy,shipdx,shipdy,surf_ship);
-				shipdx *= 0.5; shipdy *= 0.5;
-				if(shipdx < SCREENDXMIN) shipdx = SCREENDXMIN;
-				if(--nships <= 0) {
+				bangx = ship.x; bangy = ship.y; bangdx = ship.dx; bangdy = ship.dy;
+				new_bang_dots(ship.x,ship.y,ship.dx,ship.dy,ship.image);
+
+				if(--ship.lives) {
+					state = DEAD_PAUSE;
+					state_timeout = DEAD_PAUSE_LENGTH;
+					ship.dx = (ship.dx < 0) ? -sqrt(-ship.dx) : sqrt(ship.dx);
+					ship.dy = (ship.dy < 0) ? -sqrt(-ship.dy) : sqrt(ship.dy);
+					if(ship.dx < SCREENDXMIN) ship.dx = SCREENDXMIN;
+				} else {
 					state = GAME_OVER;
-					shipdx = SCREENDXMIN; shipdy = 0;
+					ship.dx = SCREENDXMIN; ship.dy = 0;
 					state_timeout = 200.0;
 					fadetimer = 0.0;
 					faderate = t_frame;
 				}
-				else {
-					state = DEAD_PAUSE;
-					state_timeout = DEAD_PAUSE_LENGTH;
-				}
 			}
 
-			SDL_PumpEvents();
-			keystate = SDL_GetKeyState(NULL);
-
 			// new game
-			if(keystate[SDLK_SPACE] && (state == HIGH_SCORE_DISPLAY || state == TITLE_PAGE)) {
-
-				reset_rocks();
+			if((keystate[SDLK_SPACE] || keystate[SDLK_1] || keystate[SDLK_2])
+			   && (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]) {
+						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;
 
-				nships = 4;
-				score = 0;
+					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));
 
-				state = GAMEPLAY;
-				play_tune(TUNE_GAMEPLAY);
+					score = 0;
 
-				shipx = XSIZE/2.2; shipy = YSIZE/2;
-				shipdx = screendx; shipdy = screendy;
+					state = GAMEPLAY;
+					play_tune(TUNE_GAMEPLAY);
+				}
 			}
 
-			jets = 0;
-		} else {
-			SDL_PumpEvents();
-			keystate = SDL_GetKeyState(NULL);
+			ship.jets = 0;
 		}
 
 		if(state == GAMEPLAY) {
 			if(!paused) {
-				if(keystate[SDLK_LEFT]  | keystate[SDLK_h]) { shipdx -= 1.5*t_frame; jets |= 1<<0;}
-				if(keystate[SDLK_DOWN]  | keystate[SDLK_t]) { shipdy += 1.5*t_frame; jets |= 1<<1;}
-				if(keystate[SDLK_RIGHT] | keystate[SDLK_n]) { shipdx += 1.5*t_frame; jets |= 1<<2;}
-				if(keystate[SDLK_UP]    | keystate[SDLK_c]) { shipdy -= 1.5*t_frame; jets |= 1<<3;}
+				// FIXME why is this at the bottom? Shouldn't it be up before the ship movement?
+				if(keystate[SDLK_LEFT]  || keystate[SDLK_h]) { ship.dx -= THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<0;}
+				if(keystate[SDLK_DOWN]  || keystate[SDLK_t]) { ship.dy += THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<1;}
+				if(keystate[SDLK_RIGHT] || keystate[SDLK_n]) { ship.dx += THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<2;}
+				if(keystate[SDLK_UP]    || keystate[SDLK_c]) { ship.dy -= THRUSTER_STRENGTH*t_frame; ship.jets |= 1<<3;}
 				if(keystate[SDLK_3])		{ SDL_SaveBMP(surf_screen, "snapshot.bmp"); }
 			}
 
@@ -696,27 +793,23 @@ gameloop() {
 				if(!pausedown) {
 					paused = !paused;
 					pausedown = 1;
+					if(!paused) ms_end = SDL_GetTicks();
 				}
 			} else {
 				pausedown = 0;
 			}
-		} else if(state == GAME_OVER) {
-			if(keystate[SDLK_SPACE]) {
-				state_timeout = -1;
-			}
 		}
 
-		if(state != HIGH_SCORE_ENTRY && (keystate[SDLK_q] || keystate[SDLK_ESCAPE])) {
-			return 0;
+		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);