X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=4942aa2c5ac0f0f721fb0316d0ebdd57b432bb40;hp=db2f42824512c7a5aa780705c60f36e50d4e3858;hb=e10d6c0b95e2f4fe7acd75733370dae71bb3b73f;hpb=2d2b3b82e471f06e44f22be54cf9b6ffb9f9d259

diff --git a/main.c b/main.c
index db2f428..4942aa2 100644
--- a/main.c
+++ b/main.c
@@ -21,31 +21,24 @@
 
 #undef DEBUG
 
-extern int font_height;
-void clearBuffer();
-
-// includes {{{
 #include "config.h"
+#include "file.h"
+#include "score.h"
+#include "sound.h"
+
+#include <math.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_image.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-#include <stdarg.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include "SFont.h"
-// }}}
-// constants {{{
-// }}}
-// macros {{{
+
 #define CONDERROR(a) if((a)) {initerror = strdup(SDL_GetError());return 1;}
 #define NULLERROR(a) CONDERROR((a) == NULL)
-// }}}
 
 // ************************************* STRUCTS
 struct rock_struct {
@@ -54,9 +47,10 @@ struct rock_struct {
 	// soon as it isn't we BLOW UP
 	float x,y,xvel,yvel;
 	int active;
+	int dead;  // has been blown out of the way
+	           // to make room for a new ship appearing.
 	SDL_Surface *image;
 	int type_number;
-	float heat;
 }; 
 struct black_point_struct {
 	int x,y;
@@ -85,25 +79,9 @@ struct spacedot {
 	float x,y,dx;
 	Uint16 color;
 };
-// High score table {{{
-struct highscore {
-	int score;
-	char *name;
-	int allocated;
-} high[] = {
-	{13000,"Pad",0},
-	{12500,"Pad",0},
-	{6500,"Pad",0},
-	{5000,"Pad",0},
-	{3000,"Pad",0},
-	{2500,"Pad",0},
-	{2000,"Pad",0},
-	{1500,"Pad",0}
-};
-// }}}
 
 // ************************************* VARS
-// SDL_Surface global variables {{{
+// SDL_Surface global variables
 SDL_Surface 
 	*surf_screen,	// Screen
 	*surf_b_variations, // "variations" banner
@@ -116,23 +94,24 @@ SDL_Surface
 	*surf_rock[NROCKS],	// THE ROCKS
 	*surf_deadrock[NROCKS],	// THE DEAD ROCKS
 	*surf_font_big;	// The big font
-// }}}
-// Structure global variables {{{
+
+SFont_Font *g_font;
+
+// Structure global variables
 struct enginedots edot[MAXENGINEDOTS], *dotptr = edot;
 struct rock_struct rock[MAXROCKS], *rockptr = rock;
 struct black_point_struct black_point[MAXBLACKPOINTS], *blackptr = black_point;
 struct bangdots bdot[MAXBANGDOTS], *bdotptr = bdot;
 struct spacedot sdot[MAXSPACEDOTS];
-// }}}
-// Other global variables {{{
+
+// Other global variables
 char topline[1024];
 char *initerror = "";
-char name[1024], debug1[1024];
 
 float xship,yship = 240.0;	// X position, 0..XSIZE
 float xvel,yvel;	// Change in X position per tick.
 float rockrate,rockspeed;
-float movementrate;
+float movementrate;  // this controls the speed of everything that moves.
 float yscroll;
 float scrollvel;
 
@@ -140,19 +119,16 @@ int nships,score,initticks,ticks_since_last, last_ticks;
 int gameover;
 int countdown = 0;
 int maneuver = 0;
-int oss_sound_flag = 0;
+int sound_flag = 1, music_flag = 0;
 int tail_plume = 0; // display big engine at the back?
 int friction = 0;	// should there be friction?
-int scorerank;
-float fadetimer = 0,faderate;
+float fadetimer = 0, faderate;
 
-int pausedown = 0,paused = 0;
+int pausedown = 0, paused = 0;
 
 // bangdot start (bd1) and end (bd2) position:
 int bd1 = 0, bd2 = 0;
 
-int xoffset[NROCKS][MAXROCKHEIGHT];
-
 enum states {
 	TITLE_PAGE,
 	GAMEPLAY,
@@ -165,8 +141,6 @@ enum states {
 enum states state = TITLE_PAGE;
 float state_timeout = 600.0;
 
-const int fakesin[] = {0,1,0,-1};
-const int fakecos[] = {1,0,-1,0};
 #define NSEQUENCE 2
 char *sequence[] = {
 	"Press SPACE to start",
@@ -179,7 +153,6 @@ Uint16 heatcolor[W*3];
 char *data_dir;
 extern char *optarg;
 extern int optind, opterr, optopt;
-// }}}
 
 float dist_sq(float x1, float y1, float x2, float y2)
 {
@@ -188,80 +161,21 @@ float dist_sq(float x1, float y1, float x2, float y2)
 
 // ************************************* FUNCS
 
-FILE *hs_fopen(char *mode) {
-	FILE *f;
-	mode_t mask;
-	mask = umask(0111);
-	if(f = fopen("/usr/share/vor/.highscore",mode)) {
-		umask(mask);
-		return f;
-	}
-	else {
-		char s[1024];
-		umask(0177);
-		sprintf(s,"%s/.vor-high",getenv("HOME"));
-		if(f = fopen(s,mode)) {
-			umask(mask);
-			return f;
-		}
-		else {
-			umask(mask);
-			return 0;
-		}
-	}
-}
-void read_high_score_table() {
-	FILE *f;
-	int i;
-	if(f = hs_fopen("r")) {
-		// If the file exists, read from it
-		for(i = 0; i<8; i++) {
-			char s[1024];
-			int highscore;
-			if(fscanf (f, "%d %[^\n]", &highscore, s) != 2) {
-				break;
-			}
-			if(high[i].allocated) {
-				free(high[i].name);
-			}
-			high[i].name = strdup(s);
-			high[i].score = highscore;
-			high[i].allocated = 1;
-		}
-		fclose(f);
-	}
-}
-void write_high_score_table() {
-	FILE *f;
-	int i;
-	if(f = hs_fopen("w")) {
-		// If the file exists, write to it
-		for(i = 0; i<8; i++) {
-			fprintf (f, "%d %s\n", high[i].score, high[i].name);
-		}
-		fclose(f);
-	}
-}
-void snprintscore(char *s, size_t n, int score) {
-	int min = score/60000;
-	int sec = score/1000%60;
-	int tenths = score%1000/100;
-	if(min) {
-		snprintf(s, n, "%2d:%.2d.%d", min, sec, tenths);
-	} else {
-		snprintf(s, n, " %2d.%d", sec, tenths);
-	}
-}
-float rnd() {
+float
+rnd() {
 	return (float)random()/(float)RAND_MAX;
 }
-void init_engine_dots() {
+
+void
+init_engine_dots() {
 	int i;
 	for(i = 0; i<MAXENGINEDOTS; i++) {
 		edot[i].active = 0;
 	}
 }
-void init_space_dots() {
+
+void
+init_space_dots() {
 	int i,intensity;
 	for(i = 0; i<MAXSPACEDOTS; i++) {
 		float r;
@@ -279,14 +193,15 @@ void init_space_dots() {
 	}
 }
 
-int makebangdots(int xbang, int ybang, int xvel, int yvel, SDL_Surface *s, int power) {
+void
+makebangdots(int xbang, int ybang, int xvel, int yvel, SDL_Surface *s, int power) {
 
 	// TODO - stop generating dots after a certain amount of time has passed, to cope with slower CPUs.
 	// TODO - generate and display dots in a circular buffer
 
-	int i,x,y,n,endcount;
+	int x,y,endcount;
 	Uint16 *rawpixel,c;
-	double theta,r,dx,dy;
+	double theta,r;
 	int begin_generate;
 
 	begin_generate = SDL_GetTicks();
@@ -298,47 +213,45 @@ int makebangdots(int xbang, int ybang, int xvel, int yvel, SDL_Surface *s, int p
 
 	endcount = 0;
 	while (endcount<3) {
+		for(x = 0; x<s->w; x++) {
+			for(y = 0; y<s->h; y++) {
+				c = rawpixel[s->pitch/2*y + x];
+				if(c && c != SDL_MapRGB(s->format,0,255,0)) {
 
-	for(x = 0; x<s->w; x++) {
-		for(y = 0; y<s->h; y++) {
-			c = rawpixel[s->pitch/2*y + x];
-			if(c && c != SDL_MapRGB(s->format,0,255,0)) {
-
-				theta = rnd()*M_PI*2;
+					theta = rnd()*M_PI*2;
 
-				r = 1-(rnd()*rnd());
+					r = 1-(rnd()*rnd());
 
-				bdot[bd2].dx = (power/50.0)*45.0*cos(theta)*r + xvel;
-				bdot[bd2].dy = (power/50.0)*45.0*sin(theta)*r + yvel;
-				bdot[bd2].x = x + xbang;
-				bdot[bd2].y = y + ybang;
+					bdot[bd2].dx = (power/50.0)*45.0*cos(theta)*r + xvel;
+					bdot[bd2].dy = (power/50.0)*45.0*sin(theta)*r + yvel;
+					bdot[bd2].x = x + xbang;
+					bdot[bd2].y = y + ybang;
 
-				// Replace the last few bang dots with the pixels from the exploding object
-				bdot[bd2].c = (endcount>0)?c:0;
-				bdot[bd2].life = 100;
-				bdot[bd2].decay = rnd()*3 + 1;
-				bdot[bd2].active = 1;
+					// Replace the last few bang dots with the pixels from the exploding object
+					bdot[bd2].c = (endcount>0)?c:0;
+					bdot[bd2].life = 100;
+					bdot[bd2].decay = rnd()*3 + 1;
+					bdot[bd2].active = 1;
 
-				bd2++;
-				bd2 %= MAXBANGDOTS;
+					bd2++;
+					bd2 %= MAXBANGDOTS;
 
-				// If the circular buffer is filled, who cares? They've had their chance.
-				//if(bd2 == bd1-1) goto exitloop;
+					// If the circular buffer is filled, who cares? They've had their chance.
+					//if(bd2 == bd1-1) goto exitloop;
 
+				}
 			}
 		}
-	}
-
-	if(SDL_GetTicks() - begin_generate > 7) endcount++;
 
+		if(SDL_GetTicks() - begin_generate > 7) endcount++;
 	}
-exitloop:
 
 	SDL_UnlockSurface(s);
 
 }
 
-void draw_bang_dots(SDL_Surface *s) {
+void
+draw_bang_dots(SDL_Surface *s) {
 	int i;
 	int first_i, last_i;
 	Uint16 *rawpixel;
@@ -381,7 +294,8 @@ void draw_bang_dots(SDL_Surface *s) {
 }
 
 
-void draw_space_dots(SDL_Surface *s) {
+void
+draw_space_dots(SDL_Surface *s) {
 	int i;
 	Uint16 *rawpixel;
 	rawpixel = (Uint16 *) s->pixels;
@@ -404,7 +318,8 @@ void draw_space_dots(SDL_Surface *s) {
 	}
 }
 
-void draw_engine_dots(SDL_Surface *s) {
+void
+draw_engine_dots(SDL_Surface *s) {
 	int i;
 	Uint16 *rawpixel;
 	rawpixel = (Uint16 *) s->pixels;
@@ -427,7 +342,8 @@ void draw_engine_dots(SDL_Surface *s) {
 	}
 }
 
-void create_engine_dots(int newdots) {
+void
+create_engine_dots(int newdots) {
 	int i;
 	double theta,r,dx,dy;
 
@@ -457,7 +373,8 @@ void create_engine_dots(int newdots) {
 	}
 }
 
-void create_engine_dots2(int newdots, int m) {
+void
+create_engine_dots2(int newdots, int m) {
 	int i;
 	double theta, theta2, dx, dy, adx, ady;
 
@@ -512,8 +429,9 @@ void create_engine_dots2(int newdots, int m) {
 	}
 }
 
-int drawdots(SDL_Surface *s) {
-	int m, scorepos, n;
+void
+drawdots(SDL_Surface *s) {
+	int m;
 
 	SDL_LockSurface(s);
 	// Draw the background stars aka space dots
@@ -523,10 +441,8 @@ int drawdots(SDL_Surface *s) {
 	if(1 || state == GAMEPLAY || state == DEAD_PAUSE || state == GAME_OVER ) {
 		SDL_UnlockSurface(s);
 
-		scorepos = XSIZE-250;
-		n = snprintf(topline, 50, "Time: ");
-		snprintscore(topline + n, 50-n, score);
-		PutString(s,scorepos,0,topline);
+		snprintscore_line(topline, 50, score);
+		SFont_Write(s,g_font,XSIZE-250,0,topline);
 
 		SDL_LockSurface(s);
 	}
@@ -535,8 +451,7 @@ int drawdots(SDL_Surface *s) {
 	draw_engine_dots(s);
 
 	// Create more engine dots comin out da back
-	if(!gameover)
-	create_engine_dots(200);
+	if(!gameover) create_engine_dots(200);
 
 	// Create engine dots out the side we're moving from
 	for(m = 0; m<4; m++) {
@@ -552,71 +467,35 @@ int drawdots(SDL_Surface *s) {
 	SDL_UnlockSurface(s);
 }
 
-char * load_file(char *s) {
-	static char retval[1024];
-	snprintf(retval, 1024, "%s/%s", data_dir, s);
-	return retval;
-}
-
-
-int missing(char *dirname) {
-	struct stat buf;
-	stat(dirname, &buf);
-	return (!S_ISDIR(buf.st_mode));
-}
-
-int init(int fullscreen) {
+int
+init(int fullscreen) {
 
 	int i,j;
 	SDL_Surface *temp;
 	Uint16 *raw_pixels;
 	Uint32 flag;
 
+	// Where are our data files?
+	if(!find_files()) exit(1);
 	read_high_score_table();
 
-	// Where are our data files?
-	// default: ./data
-	// second alternative: RD_DATADIR
-	// final alternative: /usr/share/vor
-	data_dir = strdup("./data");
-	if(missing(data_dir)) {
-		char *env;
-		env = getenv("RD_DATADIR");
-		if(env != NULL) {
-			data_dir = strdup(env);
-			if(missing(data_dir)) {
-				fprintf (stderr,"Cannot find data directory $RD_DATADIR\n");
-				exit(-1);
-			}
+	if(sound_flag) {
+		// Initialize SDL with audio and video
+		if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) != 0) {
+			sound_flag = 0;
+			printf ("Can't open sound, starting without it\n");
+			atexit(SDL_Quit);
 		} else {
-			data_dir = strdup("/usr/share/vor");
-			if(missing(data_dir)) {
-				fprintf (stderr,"Cannot find data in %s\n", data_dir);
-				exit(-2);
-			}
+			atexit(SDL_Quit);
+			atexit(SDL_CloseAudio);
+			sound_flag = init_sound();
 		}
-	}
-
-	if(oss_sound_flag) {
-
-	// Initialise SDL with audio and video
-	if(SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) != 0) {
-		oss_sound_flag = 0;
-		printf ("Can't open sound, starting without it\n");
-		atexit(SDL_Quit);
 	} else {
-		atexit(SDL_Quit);
-		atexit(SDL_CloseAudio);
-		oss_sound_flag = init_sound();
-	}
-
-	} else {
-		// Initialise with video only
+		// Initialize with video only
 		CONDERROR(SDL_Init(SDL_INIT_VIDEO) != 0);
 		atexit(SDL_Quit);
 	}
 
-	if(oss_sound_flag)
 	play_tune(0);
 
 	// Attempt to get the required video size
@@ -625,7 +504,7 @@ int init(int fullscreen) {
 	surf_screen = SDL_SetVideoMode(XSIZE,YSIZE,16,flag);
 
 	// Set the title bar text
-	SDL_WM_SetCaption("Rock Dodgers", "rockdodgers");
+	SDL_WM_SetCaption("Variations on Rockdodger", "VoR");
 
 	NULLERROR(surf_screen);
 
@@ -638,30 +517,30 @@ int init(int fullscreen) {
 	}
 
 	// Load the banners
-	NULLERROR(temp = IMG_Load(load_file("banners/variations.png")));
+	NULLERROR(temp = IMG_Load(add_path("banners/variations.png")));
 	NULLERROR(surf_b_variations = SDL_DisplayFormat(temp));
 
-	NULLERROR(temp = IMG_Load(load_file("banners/on.png")));
+	NULLERROR(temp = IMG_Load(add_path("banners/on.png")));
 	NULLERROR(surf_b_on = SDL_DisplayFormat(temp));
 
-	NULLERROR(temp = IMG_Load(load_file("banners/rockdodger.png")));
+	NULLERROR(temp = IMG_Load(add_path("banners/rockdodger.png")));
 	NULLERROR(surf_b_rockdodger = SDL_DisplayFormat(temp));
 
-	NULLERROR(temp = IMG_Load(load_file("banners/game.png")));
+	NULLERROR(temp = IMG_Load(add_path("banners/game.png")));
 	NULLERROR(surf_b_game = SDL_DisplayFormat(temp));
 
-	NULLERROR(temp = IMG_Load(load_file("banners/over.png")));
+	NULLERROR(temp = IMG_Load(add_path("banners/over.png")));
 	NULLERROR(surf_b_over = SDL_DisplayFormat(temp));
 
-	surf_font_big = IMG_Load(load_file(BIG_FONT_FILE));
-	InitFont(surf_font_big);
+	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(load_file("sprites/ship.png")));
+	NULLERROR(temp = IMG_Load(add_path("sprites/ship.png")));
 	NULLERROR(surf_ship = SDL_DisplayFormat(temp));
 
 	// Load the life indicator (small ship) graphic.
-	NULLERROR(temp = IMG_Load(load_file("indicators/life.png")));
+	NULLERROR(temp = IMG_Load(add_path("indicators/life.png")));
 	NULLERROR(surf_life = SDL_DisplayFormat(temp));
 
 	// Create the array of black points;
@@ -686,11 +565,11 @@ int init(int fullscreen) {
 	for(i = 0; i<NROCKS; i++) {
 		char a[100];
 
-		sprintf(a,load_file("sprites/rock%d.png"),i);
+		sprintf(a,add_path("sprites/rock%d.png"),i);
 		NULLERROR(temp = IMG_Load(a));
 		NULLERROR(surf_rock[i] = SDL_DisplayFormat(temp));
 
-		sprintf(a,load_file("sprites/deadrock%d.png"),i);
+		sprintf(a,add_path("sprites/deadrock%d.png"),i);
 		NULLERROR(temp = IMG_Load(a));
 		NULLERROR(surf_deadrock[i] = SDL_DisplayFormat(temp));
 	}
@@ -702,8 +581,10 @@ int init(int fullscreen) {
 
 	return 0;
 }
-int draw() {
-	int i,n;
+
+int
+draw() {
+	int i;
 	SDL_Rect src,dest;
 	struct black_point_struct *p;
 	Uint16 *raw_pixels;
@@ -711,8 +592,6 @@ int draw() {
 	char *text;
 	float fadegame,fadeover;
 
-	char *statedisplay, buf[1024];
-	
 	bang = 0;
 
 	src.x = 0;
@@ -723,38 +602,6 @@ int draw() {
 	// Draw a fully black background
 	SDL_FillRect(surf_screen,NULL,0);
 
-
-#ifdef DEBUG
-	// DEBUG {{{
-	// Show the current state
-	switch (state) {
-		case TITLE_PAGE:
-			statedisplay = "title_page";
-		break;
-		case GAMEPLAY:
-			statedisplay = "gameplay";
-		break;
-		case DEAD_PAUSE:
-			statedisplay = "dead_pause";
-		break;
-		case GAME_OVER:
-			statedisplay = "game_over";
-		break;
-		case HIGH_SCORE_ENTRY:
-			statedisplay = "high_score_entry";
-		break;
-		case HIGH_SCORE_DISPLAY:
-			statedisplay = "high_score_display";
-		break;
-		case DEMO:
-			statedisplay = "demo";
-		break;
-	}
-	snprintf(buf,1024, "mode = %s", statedisplay);
-	PutString(surf_screen,0,YSIZE-50,buf);
-	// }}}
-#endif
-	
 	// Draw the background dots
 	drawdots(surf_screen);
 
@@ -783,28 +630,6 @@ int draw() {
 			// Draw the rock
 			SDL_BlitSurface(rock[i].image,&src,surf_screen,&dest);
 
-			// Draw the heated part of the rock, in an alpha which reflects the
-			// amount of heat in the rock.
-			if(rock[i].heat>0) {
-				SDL_Surface *deadrock;
-				deadrock = surf_deadrock[rock[i].type_number];
-				SDL_SetAlpha(deadrock,SDL_SRCALPHA,rock[i].heat*255/rock[i].image->h);
-				dest.x = (int) rock[i].x; // kludge
-				SDL_BlitSurface(deadrock,&src,surf_screen,&dest);
-				if(rnd()<0.3) {
-					rock[i].heat -= movementrate;
-				}
-			}
-
-			// If the rock is heated past a certain point, the water content of
-			// the rock flashes to steam, releasing enough energy to destroy
-			// the rock in spectacular fashion.
-			if(rock[i].heat>rock[i].image->h) {
-				rock[i].active = 0;
-				play_sound(1 + (int)(rnd()*3));
-				makebangdots(rock[i].x,rock[i].y,rock[i].xvel,rock[i].yvel,rock[i].image,10);
-			}
-
 		}
 	}
 
@@ -874,62 +699,33 @@ int draw() {
 			SDL_BlitSurface(surf_b_rockdodger,&src,surf_screen,&dest);
 
 			text = "Version " VERSION;
-			x = (XSIZE-SFont_wide(text))/2 + sin(fadetimer/4.5)*10;
-			PutString(surf_screen,x,YSIZE-50 + sin(fadetimer/2)*5,text);
+			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_wide(text))/2 + cos(fadetimer/4.5)*10;
-			PutString(surf_screen,x,YSIZE-100 + cos(fadetimer/3)*5,text);
+			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 HIGH_SCORE_ENTRY:
+			play_tune(2);
+			if(!process_score_input()) {  // done inputting name
 
-			if(score >= high[7].score) {
-				play_tune(2);
-				if(SFont_Input (surf_screen, 330, 50 + (scorerank + 2)*font_height, 300, name)) {
-					// Insert name into high score table
-
-					// Lose the lowest name forever (loser!)
-					//if(high[7].allocated)
-					//	free(high[7].name);			// THIS WAS CRASHING SO I REMOVED IT
-
-					// Insert new high score
-					high[scorerank].score = score;
-					high[scorerank].name = strdup(name);	// MEMORY NEVER FREED!
-					high[scorerank].allocated = 1;
-			
-					// Set the global name string to "", ready for the next winner
-					name[0] = 0;
-			
-					// 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 the title page tune
-					play_tune(0);
-				}
-			} else {
+				// Change state to briefly show high scores page
 				state = HIGH_SCORE_DISPLAY;
-				state_timeout = 400;
-			}
-		// FALL THROUGH
+				state_timeout = 200;
 
+				// Write the high score table to the file
+				write_high_score_table();
+		
+				// Play the title page tune
+				play_tune(0);
+			}
+		// FALL THROUGH TO
 		case HIGH_SCORE_DISPLAY:
 			// Display de list o high scores mon.
-			PutString(surf_screen,180,50,"High scores");
-			for(i = 0; i<8; i++) {
-				char s[1024];
-				sprintf(s, "#%1d",i + 1);
-				PutString(surf_screen, 150, 50 + (i + 2)*font_height,s);
-				snprintscore(s, 1024, high[i].score);
-				PutString(surf_screen, 200, 50 + (i + 2)*font_height,s);
-				sprintf(s, "%3s", high[i].name);
-				PutString(surf_screen, 330, 50 + (i + 2)*font_height,s);
-			}
+			display_scores(surf_screen, 150,50);
 
 	}
 
@@ -987,7 +783,9 @@ int draw() {
 
 	return bang;
 }
-int gameloop() {
+
+int
+gameloop() {
 	int i = 0;
 	Uint8 *keystate;
 
@@ -1002,49 +800,30 @@ int gameloop() {
 						// Create a new ship and start all over again
 						state = GAMEPLAY;
 						play_tune(1);
-						xship = 10;
-						yship = YSIZE/2;
-						xvel = 3;
-						yvel = 0;
-					break;
+						xship -= 50;
+						break;
 					case GAME_OVER:
 						state = HIGH_SCORE_ENTRY;
-						clearBuffer();
-						name[0] = 0;
 						state_timeout = 5.0e6;
-
-						if(score >= high[7].score) {
-							// Read the high score table from the storage file
-							read_high_score_table();
-
-							// Find ranking of this score, store as scorerank
-							for(i = 0; i<8; i++) {
-							if(high[i].score <= score) {
-								scorerank = i;
-								break;
-							}
-							}
-
-							// Move all lower scores down a notch
-							for(i = 7; i >= scorerank; i--)
-							high[i] = high[i-1];
-
-							// Insert blank high score
-							high[scorerank].score = score;
-							high[scorerank].name = "";
-							high[scorerank].allocated = 0;
+						if(new_high_score(score)) {
+							SDL_Event e;
+							SDL_EnableUNICODE(1);
+							while(SDL_PollEvent(&e))
+								;
+						} else {
+							state = HIGH_SCORE_DISPLAY;
+							state_timeout = 400;
 						}
-
-					break;
+						break;
 					case HIGH_SCORE_DISPLAY:
 						state = TITLE_PAGE;
 						state_timeout = 500.0;
-					break;
+						break;
 					case HIGH_SCORE_ENTRY:
 						// state = TITLE_PAGE;
 						// play_tune(1);
 						// state_timeout = 100.0;
-					break;
+						break;
 					case TITLE_PAGE:
 						state = HIGH_SCORE_DISPLAY;
 						state_timeout = 200.0;
@@ -1052,17 +831,19 @@ int gameloop() {
 				}
 			} else {
 				if(state == DEAD_PAUSE) {
-					float blast_radius = START_RAD * state_timeout / 50.0;
+					float blast_radius = BLAST_RADIUS * state_timeout / 20.0;
+					if(xship < 60) xship = 60;
 					for(i = 0; i<MAXROCKS; i++ ) {
 						float dx, dy, n;
-						dx = rock[i].x + 100;
-						dy = rock[i].y - YSIZE/2;
+						if(rock[i].x <= 0) continue;
+						dx = rock[i].x - xship;
+						dy = rock[i].y - yship;
 						n = sqrt(dx*dx + dy*dy);
-						if(n < blast_radius+100) {
-							n *= 50;
+						if(n < blast_radius) {
+							n *= 20;
 							rock[i].xvel += rockrate*(dx+30)/n;
 							rock[i].yvel += rockrate*dy/n;
-							if(rock[i].xvel <= 0) rock[i].xvel = 1;
+							rock[i].dead = 1;
 						}
 					}
 				}
@@ -1079,7 +860,6 @@ int gameloop() {
 					rockptr->xvel = -(rockspeed)*(1 + rnd());
 					rockptr->yvel = rnd()-0.5;
 					rockptr->type_number = random() % NROCKS;
-					rockptr->heat = 0;
 					rockptr->image = surf_rock[rockptr->type_number];// [random()%NROCKS];
 					rockptr->active = 1;
 					rockptr->y = rnd()*(YSIZE + rockptr->image->h);
@@ -1113,20 +893,24 @@ int gameloop() {
 			yship += yscroll;
 			
 			// Move all the rocks
-			for(i = 0; i<MAXROCKS; i++) if(rock[i].active) {
-				rock[i].x += rock[i].xvel*movementrate;
-				rock[i].y += rock[i].yvel*movementrate + yscroll;
-				if(rock[i].y > YSIZE) {
-					rock[i].y -= YSIZE;
-					rock[i].y -= rock[i].image->w;
-				} else if(rock[i].y < -rock[i].image->w) {
-					rock[i].y += YSIZE;
-					rock[i].y += rock[i].image->w;
-				}
-				if(rock[i].x < -32.0) rock[i].active = 0;
-				if(rock[i].xvel > 0) {
-					if(rock[i].y < 0 || rock[i].y > YSIZE) rock[i].active = 0;
-					if(rock[i].x > XSIZE) rock[i].active = 0;
+			for(i = 0; i < MAXROCKS; i++) {
+				if(rock[i].active) {
+					rock[i].x += rock[i].xvel*movementrate;
+					rock[i].y += rock[i].yvel*movementrate + yscroll;
+					if(rock[i].y > YSIZE || rock[i].y < -rock[i].image->h) {
+						if(rock[i].dead) {
+							rock[i].dead = 0;
+							rock[i].active = 0;
+						} else {
+							// wrap
+							rock[i].y = (YSIZE - rock[i].image->h) - rock[i].y;
+							rock[i].y += (rock[i].yvel*movementrate + yscroll) * 1.01;
+						}
+					}
+					if(rock[i].x < -rock[i].image->w || rock[i].x > XSIZE) {
+						rock[i].active = 0;
+						rock[i].dead = 0;
+					}
 				}
 			}
 
@@ -1147,10 +931,8 @@ int gameloop() {
 
 
 			if(draw() && state == GAMEPLAY) {
-				if(oss_sound_flag) {
-					// Play the explosion sound
-					play_sound(0);
-				}
+				// Play the explosion sound
+				play_sound(0);
 				makebangdots(xship,yship,xvel,yvel,surf_ship,30);
 				if(--nships <= 0) {
 					gameover = 1;
@@ -1161,7 +943,9 @@ int gameloop() {
 				}
 				else {
 					state = DEAD_PAUSE;
-					state_timeout = 50.0;
+					state_timeout = 20.0;
+					xvel = 0;
+					yvel = 0;
 				}
 			}
 
@@ -1176,6 +960,7 @@ int gameloop() {
 
 				for(i = 0; i<MAXROCKS; i++ ) {
 					rock[i].active = 0;
+					rock[i].dead = 0;
 				}
 
 				rockrate = 54.0;
@@ -1245,15 +1030,18 @@ int gameloop() {
 		}
 	}
 }
+
+int
 main(int argc, char **argv) {
 	int i, x, fullscreen;
 
 	fullscreen = 0;
 	tail_plume = 0;
 	friction = 0;
-	oss_sound_flag = 1;
+	sound_flag = 1;
+	music_flag = 0;
 
-	while ((x = getopt(argc,argv,"efhsp")) >= 0) {
+	while ((x = getopt(argc,argv,"efhmps")) >= 0) {
 		switch(x) {
 			case 'e': // engine
 				tail_plume = 1;
@@ -1266,15 +1054,19 @@ main(int argc, char **argv) {
 				       " -e big tail [E]ngine\n"
 				       " -f [F]ull screen\n"
 				       " -h this [H]elp message\n"
+				       " -m enable [M]usic\n"
 				       " -p original [P]hysics (friction)\n"
 				       " -s [S]ilent (no sound)\n");
 				exit(0);
 			break;
+			case 'm': // music
+				music_flag = 1;
 			case 'p': // physics
 				friction = 1;
 			break;
 			case 's': // silent
-				oss_sound_flag = 0;
+				sound_flag = 0;
+				music_flag = 0;
 			break;
 		}
 	}
@@ -1284,19 +1076,14 @@ main(int argc, char **argv) {
 		return 1;
 	}
 
-	while(1) {
-		for(i = 0; i<MAXROCKS; i++) {
-			rock[i].active = 0;
-		}
-		rockrate = 54.0;
-		rockspeed = 5.0;
-		initticks = SDL_GetTicks();
-		if(gameloop() == 0) {
-			break;
-		}
-		printf ("score = %d\n",score);
-		SDL_Delay(1000);
+	for(i = 0; i<MAXROCKS; i++) {
+		rock[i].active = 0;
+		rock[i].dead = 0;
 	}
+	rockrate = 54.0;
+	rockspeed = 5.0;
+	initticks = SDL_GetTicks();
+	gameloop();
 
 	return 0;
 }