X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=be5ae97d21f794424319be6b88f4f991e62145bb;hp=9b593084c53293d8dff927f20272f6f69f9e03f0;hb=5bc27bd36ff9d698e4e757a5dd8f981b31cfaeab;hpb=30a8f3daae083e91cd30b016213286a7cdcecb09

diff --git a/main.c b/main.c
index 9b59308..be5ae97 100644
--- a/main.c
+++ b/main.c
@@ -216,7 +216,7 @@ makebangdots(int xbang, int ybang, int dx, int dy, SDL_Surface *s, int power) {
 		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)) {
+				if(c && c != s->format->colorkey) {
 
 					theta = rnd()*M_PI*2;
 
@@ -565,7 +565,7 @@ init(int fullscreen) {
 	for(i = 0; i<NROCKS; i++) {
 		char a[MAX_PATH_LEN];
 
-		snprintf(a,MAX_PATH_LEN,add_path("sprites/rock%d.png"),i);
+		snprintf(a,MAX_PATH_LEN,add_path("sprites/rock%02d.png"),i);
 		NULLERROR(temp = IMG_Load(a));
 		NULLERROR(surf_rock[i] = SDL_DisplayFormat(temp));
 	}
@@ -832,13 +832,32 @@ gameloop() {
 				}
 			} else {
 				if(state == DEAD_PAUSE) {
-					float blast_radius = BLAST_RADIUS * state_timeout / 20.0;
+					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;
+					}
+
 					if(shipx < 60) shipx = 60;
 					for(i = 0; i<MAXROCKS; i++ ) {
 						float dx, dy, n;
 						if(rock[i].x <= 0) continue;
+
+						// This makes it so your explosion from dying magically doesn't leave
+						// any rocks that aren't moving much on the x axis. After the first
+						// 20 tics, only rocks that are barely moving will be pushed.
+						if(fixonly && (!rock[i].dead || rock[i].dx < -4 || rock[i].dx > 3)) {
+							continue;
+						}
+
 						dx = rock[i].x - shipx;
 						dy = rock[i].y - shipy;
+
 						n = sqrt(dx*dx + dy*dy);
 						if(n < blast_radius) {
 							n *= 20;
@@ -944,7 +963,7 @@ gameloop() {
 				}
 				else {
 					state = DEAD_PAUSE;
-					state_timeout = 20.0;
+					state_timeout = DEAD_PAUSE_LENGTH;
 					shipdx = 0;
 					shipdy = 0;
 				}
@@ -1000,18 +1019,6 @@ gameloop() {
 				if(keystate[SDLK_p] | keystate[SDLK_s]) {
 					if(!pausedown) {
 						paused = !paused;
-						if(paused) {
-							SDL_Rect src,dest;
-							src.w = surf_b_variations->w;
-							src.h = surf_b_variations->h;
-							dest.w = src.w;
-							dest.h = src.h;
-							dest.x = (XSIZE-src.w)/2;
-							dest.y = (YSIZE-src.h)/2;
-							SDL_BlitSurface(surf_b_variations,&src,surf_screen,&dest);
-							// Update the surface
-							SDL_Flip(surf_screen);
-						}
 						pausedown = 1;
 					}
 				} else {