From: Jason Woofenden <jason@jasonwoof.com>
Date: Tue, 3 May 2005 20:11:09 +0000 (+0000)
Subject: fixed bug when you bounce off the left or right
X-Git-Tag: 0.3~7
X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=commitdiff_plain;h=04a50f75c62ca742bed40524cc242b605e68ace6

fixed bug when you bounce off the left or right
fixed avg speed meter for subsequent games
---

diff --git a/Makefile b/Makefile
index 7965c18..5c76c75 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 
 debug := $(if $(DEBUG),1,0)
 ldflags := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer
-cflags := $(shell sdl-config --cflags) -Wall -DDEBUG=$(debug)
+cflags := $(shell sdl-config --cflags) -Wall -DDEBUG=$(debug) $(CFLAGS)
 
 my_objects := file.o rocks.o score.o shape.o sound.o main.o $(if $(DEBUG),debug.o)
 libs := SFont.o
diff --git a/main.c b/main.c
index 9926f76..e636cd3 100644
--- a/main.c
+++ b/main.c
@@ -210,6 +210,7 @@ draw_bang_dots(SDL_Surface *s) {
 	rawpixel = (Uint16 *) s->pixels;
 
 	first_i = -1;
+	last_i = 0;
 
 	for(i = bd1; (bd1 <= bd2)?(i<bd2):(i >= bd1 && i < bd2); last_i = ++i) {
 
@@ -532,9 +533,9 @@ draw() {
 		game_ticks += ticks_since_last;
 		if(game_ticks < 2*1000) avg_speed = cur_speed;
 		else avg_speed = game_dist/game_ticks;
-		// printf("avg=%.2f, cur=%.2f.\n", avg_speed, cur_speed);
-		avg_speed_w = 10 + 64*avg_speed/20;
-		cur_speed_w = 10 + 64*cur_speed/20;
+		//printf("avg=%.2f, cur=%.2f. shipdx=%.2f\n", avg_speed, cur_speed, shipdx);
+		avg_speed_w = 2 + 64*avg_speed/20;
+		cur_speed_w = 2 + 64*cur_speed/20;
 	}
 
 	if(state == GAMEPLAY || state == DEAD_PAUSE) {
@@ -758,7 +759,7 @@ gameloop() {
 			if(shipx<0 || shipx>XSIZE-surf_ship->w) {
 				// BOUNCE from left and right wall
 				shipx -= shipdx*gamerate;
-				shipdx *= -99;
+				shipdx *= -0.99;
 			}
 
 			// BOUNCE Y
@@ -792,11 +793,13 @@ gameloop() {
 			SDL_PumpEvents();
 			keystate = SDL_GetKeyState(NULL);
 
+			// new game
 			if(keystate[SDLK_SPACE] && (state == HIGH_SCORE_DISPLAY || state == TITLE_PAGE)) {
 
 				reset_rocks();
 
 				game_ticks = 0;
+				game_dist = 0;
 
 				nships = 4;
 				score = 0;