X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=058fbad97cd78927e9ae615bcdd75c09bcc7696e;hp=ab97cbc611dc46b60f043111c0d7778b1e325d4f;hb=11849d10c3ffc3fa9cd659c87d7692bec522b880;hpb=44c1168e314f92adf033104c615284384572c0b7 diff --git a/main.c b/main.c index ab97cbc..058fbad 100644 --- a/main.c +++ b/main.c @@ -19,7 +19,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#undef DEBUG +#ifdef DEBUG +#include "debug.h" +#endif #include "config.h" #include "file.h" @@ -45,7 +47,7 @@ struct rock_struct { // Array of black pixel coordinates. This is scanned // every frame to see if it's still black, and as // soon as it isn't we BLOW UP - float x,y,xvel,yvel; + float x,y,dx,dy; int active; int dead; // has been blown out of the way // to make room for a new ship appearing. @@ -92,7 +94,6 @@ SDL_Surface *surf_ship, // Spaceship element *surf_life, // Indicator of number of ships remaining *surf_rock[NROCKS], // THE ROCKS - *surf_deadrock[NROCKS], // THE DEAD ROCKS *surf_font_big; // The big font SFont_Font *g_font; @@ -108,8 +109,8 @@ struct spacedot sdot[MAXSPACEDOTS]; char topline[1024]; char *initerror = ""; -float xship,yship = 240.0; // X position, 0..XSIZE -float xvel,yvel; // Change in X position per tick. +float shipx,shipy = 240.0; // X position, 0..XSIZE +float shipdx,shipdy; // Change in X position per tick. float rockrate,rockspeed; float movementrate; // this controls the speed of everything that moves. float yscroll; @@ -193,7 +194,7 @@ init_space_dots() { } void -makebangdots(int xbang, int ybang, int xvel, int yvel, SDL_Surface *s, int power) { +makebangdots(int xbang, int ybang, int dx, int dy, 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 @@ -215,14 +216,14 @@ makebangdots(int xbang, int ybang, int xvel, int yvel, SDL_Surface *s, int power for(x = 0; xw; x++) { for(y = 0; yh; 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; 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].dx = (power/50.0)*45.0*cos(theta)*r + dx; + bdot[bd2].dy = (power/50.0)*45.0*sin(theta)*r + dy; bdot[bd2].x = x + xbang; bdot[bd2].y = y + ybang; @@ -357,10 +358,10 @@ create_engine_dots(int newdots) { dy = sin(theta)*r; dotptr->active = 1; - dotptr->x = xship + surf_ship->w/2-14; - dotptr->y = yship + surf_ship->h/2 + (rnd()-0.5)*5-1; - dotptr->dx = 10*(dx-1.5) + xvel; - dotptr->dy = 1*dy + yvel; + dotptr->x = shipx + surf_ship->w/2-14; + dotptr->y = shipy + surf_ship->h/2 + (rnd()-0.5)*5-1; + dotptr->dx = 10*(dx-1.5) + shipdx; + dotptr->dy = 1*dy + shipdy; dotptr->life = 45 + rnd(1)*5; dotptr++; @@ -393,30 +394,30 @@ create_engine_dots2(int newdots, int m) { dotptr->active = 1; - dotptr->x = xship + surf_ship->w/2 + (rnd()-0.5)*3; - dotptr->y = yship + surf_ship->h/2 + (rnd()-0.5)*3; + dotptr->x = shipx + surf_ship->w/2 + (rnd()-0.5)*3; + dotptr->y = shipy + surf_ship->h/2 + (rnd()-0.5)*3; switch(m) { case 0: dotptr->x -= 14; - dotptr->dx = -20*adx + xvel; - dotptr->dy = 2*dy + yvel; + dotptr->dx = -20*adx + shipdx; + dotptr->dy = 2*dy + shipdy; dotptr->life = 60 * adx; break; case 1: - dotptr->dx = 2*dx + xvel; - dotptr->dy = -20*ady + yvel; + dotptr->dx = 2*dx + shipdx; + dotptr->dy = -20*ady + shipdy; dotptr->life = 60 * ady; break; case 2: dotptr->x += 14; - dotptr->dx = 20*adx + xvel; - dotptr->dy = 2*dy + yvel; + dotptr->dx = 20*adx + shipdx; + dotptr->dy = 2*dy + shipdy; dotptr->life = 60 * adx; break; case 3: - dotptr->dx = 2*dx + xvel; - dotptr->dy = 20*ady + yvel; + dotptr->dx = 2*dx + shipdx; + dotptr->dy = 20*ady + shipdy; dotptr->life = 60 * ady; break; } @@ -562,15 +563,11 @@ init(int fullscreen) { // Load all our lovely rocks for(i = 0; ih; dest.w = src.w; dest.h = src.h; - dest.x = (int)xship; - dest.y = (int)yship; + dest.x = (int)shipx; + dest.y = (int)shipy; SDL_BlitSurface(surf_ship,&src,surf_screen,&dest); } @@ -725,6 +722,7 @@ draw() { case HIGH_SCORE_DISPLAY: // Display de list o high scores mon. display_scores(surf_screen, 150,50); + break; case GAMEPLAY: case DEAD_PAUSE: ; // no action necessary @@ -736,7 +734,7 @@ draw() { // Check that the black points on the ship are // still black, and not covered up by rocks. for(p = black_point; ppitch/2 * (p->y + (int)yship) + p->x + (int)xship; + offset = surf_screen->pitch/2 * (p->y + (int)shipy) + p->x + (int)shipx; if(raw_pixels[offset]) { // Set the bang flag bang = 1; @@ -801,7 +799,7 @@ gameloop() { // Create a new ship and start all over again state = GAMEPLAY; play_tune(1); - xship -= 50; + shipx -= 50; break; case GAME_OVER: state = HIGH_SCORE_ENTRY; @@ -834,18 +832,37 @@ gameloop() { } } else { if(state == DEAD_PAUSE) { - float blast_radius = BLAST_RADIUS * state_timeout / 20.0; - if(xship < 60) xship = 60; + 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 3)) { + continue; + } + + dx = rock[i].x - shipx; + dy = rock[i].y - shipy; + n = sqrt(dx*dx + dy*dy); if(n < blast_radius) { n *= 20; - rock[i].xvel += rockrate*(dx+30)/n; - rock[i].yvel += rockrate*dy/n; + rock[i].dx += rockrate*(dx+30)/n; + rock[i].dy += rockrate*dy/n; rock[i].dead = 1; } } @@ -860,8 +877,8 @@ gameloop() { } if(!rockptr->active) { rockptr->x = (float)XSIZE; - rockptr->xvel = -(rockspeed)*(1 + rnd()); - rockptr->yvel = rnd()-0.5; + rockptr->dx = -(rockspeed)*(1 + rnd()); + rockptr->dy = rnd()-0.5; rockptr->type_number = random() % NROCKS; rockptr->image = surf_rock[rockptr->type_number];// [random()%NROCKS]; rockptr->active = 1; @@ -876,30 +893,30 @@ gameloop() { // FRICTION? if(friction) { - xvel *= pow((double)0.9,(double)movementrate); - yvel *= pow((double)0.9,(double)movementrate); - // if(abs(xvel)<0.00001) xvel = 0; - // if(abs(yvel)<0.00001) yvel = 0; + shipdx *= pow((double)0.9,(double)movementrate); + shipdy *= pow((double)0.9,(double)movementrate); + // if(abs(shipdx)<0.00001) shipdx = 0; + // if(abs(shipdy)<0.00001) shipdy = 0; } // INERTIA - xship += xvel*movementrate; - yship += yvel*movementrate; + shipx += shipdx*movementrate; + shipy += shipdy*movementrate; // SCROLLING - yscroll = yship - (YSIZE / 2); - yscroll += yvel * 25; + yscroll = shipy - (YSIZE / 2); + yscroll += shipdy * 25; yscroll /= -25; yscroll = ((scrollvel * (12 - movementrate)) + (yscroll * movementrate)) / 12; scrollvel = yscroll; yscroll = yscroll*movementrate; - yship += yscroll; + shipy += 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; + rock[i].x += rock[i].dx*movementrate; + rock[i].y += rock[i].dy*movementrate + yscroll; if(rock[i].y > YSIZE || rock[i].y < -rock[i].image->h) { if(rock[i].dead) { rock[i].dead = 0; @@ -907,7 +924,7 @@ gameloop() { } else { // wrap rock[i].y = (YSIZE - rock[i].image->h) - rock[i].y; - rock[i].y += (rock[i].yvel*movementrate + yscroll) * 1.01; + rock[i].y += (rock[i].dy*movementrate + yscroll) * 1.01; } } if(rock[i].x < -rock[i].image->w || rock[i].x > XSIZE) { @@ -919,24 +936,24 @@ gameloop() { // BOUNCE X - if(xship<0 || xship>XSIZE-surf_ship->w) { + if(shipx<0 || shipx>XSIZE-surf_ship->w) { // BOUNCE from left and right wall - xship -= xvel*movementrate; - xvel *= -0.99; + shipx -= shipdx*movementrate; + shipdx *= -0.99; } // BOUNCE Y - if(yship<0 || yship>YSIZE-surf_ship->h) { + if(shipy<0 || shipy>YSIZE-surf_ship->h) { // BOUNCE from top and bottom wall - yship -= yvel; - yvel *= -0.99; + shipy -= shipdy; + shipdy *= -0.99; } if(draw() && state == GAMEPLAY) { // Play the explosion sound play_sound(0); - makebangdots(xship,yship,xvel,yvel,surf_ship,30); + makebangdots(shipx,shipy,shipdx,shipdy,surf_ship,30); if(--nships <= 0) { gameover = 1; state = GAME_OVER; @@ -946,9 +963,9 @@ gameloop() { } else { state = DEAD_PAUSE; - state_timeout = 20.0; - xvel = 0; - yvel = 0; + state_timeout = DEAD_PAUSE_LENGTH; + shipdx = 0; + shipdy = 0; } } @@ -975,12 +992,11 @@ gameloop() { state = GAMEPLAY; play_tune(1); - xvel = -1; gameover = 0; - yvel = 0; - xship = 0; - yship = YSIZE/2; - + shipx = 0; + shipy = YSIZE/2; + shipdx = -1; + shipdy = 0; } maneuver = 0; @@ -993,28 +1009,16 @@ gameloop() { if(!gameover) { if(!paused) { - if(keystate[SDLK_UP] | keystate[SDLK_c]) { yvel -= 1.5*movementrate; maneuver |= 1<<3;} - if(keystate[SDLK_DOWN] | keystate[SDLK_t]) { yvel += 1.5*movementrate; maneuver |= 1<<1;} - if(keystate[SDLK_LEFT] | keystate[SDLK_h]) { xvel -= 1.5*movementrate; maneuver |= 1<<2;} - if(keystate[SDLK_RIGHT] | keystate[SDLK_n]) { xvel += 1.5*movementrate; maneuver |= 1;} + if(keystate[SDLK_UP] | keystate[SDLK_c]) { shipdy -= 1.5*movementrate; maneuver |= 1<<3;} + if(keystate[SDLK_DOWN] | keystate[SDLK_t]) { shipdy += 1.5*movementrate; maneuver |= 1<<1;} + if(keystate[SDLK_LEFT] | keystate[SDLK_h]) { shipdx -= 1.5*movementrate; maneuver |= 1<<2;} + if(keystate[SDLK_RIGHT] | keystate[SDLK_n]) { shipdx += 1.5*movementrate; maneuver |= 1;} if(keystate[SDLK_3]) { SDL_SaveBMP(surf_screen, "snapshot.bmp"); } } 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 {