X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=ecdc4e6c80e559405eaff05d22332dea2010da0c;hp=6b575bd61f9093c066a90cc6e9be6bf2df7826c5;hb=28956e4738468200963dad131b05a24d92f0baa9;hpb=0179e60b6196d115000cb77fcd4cc880eecb177f

diff --git a/main.c b/main.c
index 6b575bd..ecdc4e6 100644
--- a/main.c
+++ b/main.c
@@ -132,8 +132,8 @@ init_space_dots() {
 	for(i = 0; i<MAXSPACEDOTS; i++) {
 		sdot[i].x = rnd()*(XSIZE-5);
 		sdot[i].y = rnd()*(YSIZE-5);
-		sdot[i].z = 4*rnd();
-		b = (4 - sdot[i].z) * 255.0 / 4;
+		sdot[i].z = MAXDUSTDEPTH*sqrt(rnd());
+		b = (MAXDUSTDEPTH - sdot[i].z) * 255.0 / MAXDUSTDEPTH;
 		sdot[i].color = SDL_MapRGB(surf_screen->format, b, b, b);
 	}
 }
@@ -668,7 +668,6 @@ gameloop() {
 						// Create a new ship and start all over again
 						state = GAMEPLAY;
 						play_tune(1);
-						shipx -= 50;
 						break;
 					case GAME_OVER:
 						state = HIGH_SCORE_ENTRY;
@@ -725,27 +724,29 @@ gameloop() {
 				shipdy *= pow((double)0.9,(double)gamerate);
 			}
 
+			// INERTIA
+			shipx += shipdx*gamerate;
+			shipy += shipdy*gamerate;
+			
 			// SCROLLING
-			tmp = shipy - (YSIZE / 2);
-			tmp += shipdy * 25;
-			tmp /= -25;
-			tmp = ((screendy * (gamerate - 12)) + (tmp * gamerate)) / 12;
-			screendy = -tmp;
 			if(state == GAMEPLAY) {
+				tmp = shipy - (YSIZE / 2);
+				tmp += shipdy * 25;
+				tmp /= -25;
+				tmp = ((screendy * (gamerate - 12)) + (tmp * gamerate)) / 12;
+				screendy = -tmp;
 				tmp = shipx - (XSIZE / 2);
 				tmp += shipdx * 25;
 				tmp /= -25;
 				tmp = ((screendx * (gamerate - 12)) + (tmp * gamerate)) / 12;
 				screendx = -tmp;
-			} else screendx = 7.5;
+			} else if(state != DEAD_PAUSE) screendx = 7.5;
 
 			xscroll = screendx * gamerate;
 			yscroll = screendy * gamerate;
+			shipx -= xscroll;
+			shipy -= yscroll;
 
-			// INERTIA
-			shipx += shipdx*gamerate - xscroll;
-			shipy += shipdy*gamerate - yscroll;
-			
 			move_rocks();
 
 
@@ -753,7 +754,7 @@ gameloop() {
 			if(shipx<0 || shipx>XSIZE-surf_ship->w) {
 				// BOUNCE from left and right wall
 				shipx -= shipdx*gamerate;
-				shipdx *= -0.99;
+				shipdx *= -99;
 			}
 
 			// BOUNCE Y
@@ -768,9 +769,9 @@ gameloop() {
 				// Play the explosion sound
 				play_sound(0);
 				make_bang_dots(shipx,shipy,shipdx,shipdy,surf_ship,30);
-				shipdx = screendx;
-				shipdy = 0;
+				shipdx *= 0.5; shipdy *= 0.5;
 				if(--nships <= 0) {
+					shipdx = 0; shipdy = 0;
 					gameover = 1;
 					state = GAME_OVER;
 					state_timeout = 200.0;
@@ -797,10 +798,8 @@ gameloop() {
 				play_tune(1);
 
 				gameover = 0;
-				shipx = 2*XSIZE/3;
-				shipy = YSIZE/2;
-				shipdx = screendx;
-				shipdy = 0;
+				shipx = XSIZE/2; shipy = YSIZE/2;
+				shipdx = screendx; shipdy = screendy;
 			}
 
 			maneuver = 0;