number of rocks on screen now starts at 25, gradually increasing

[vor.git] / main.c

diff --git a/main.c b/main.c
index 6b575bd..61b2caa 100644 (file)
--- a/main.c
+++ b/main.c
@@ -68,13 +68,15 @@ char topline[1024];
 char *initerror = "";
 
 struct shape shipshape;
-float shipx = 320.0, shipy = 240.0;    // X position, 0..XSIZE
-float shipdx,shipdy;   // Change in X position per tick.
+float shipx = XSIZE/2, shipy = YSIZE/2;        // X position, 0..XSIZE
+float shipdx = 8, shipdy = 0;  // Change in X position per tick.
 float screendx = 7.5, screendy = 0.0;
 float xscroll, yscroll;
 float gamerate;  // this controls the speed of everything that moves.
 
-int nships,score,initticks,ticks_since_last, last_ticks;
+float bangx, bangy, bangdx, bangdy;
+
+int nships,score,ticks_since_last, last_ticks;
 int gameover;
 int maneuver = 0;
 int sound_flag, music_flag;
@@ -132,8 +134,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);
        }
 }
@@ -250,8 +252,8 @@ draw_space_dots(SDL_Surface *s) {
                        sdot[i].y = 0;
                }
                rawpixel[(int)(s->pitch/2*(int)sdot[i].y) + (int)(sdot[i].x)] = sdot[i].color;
-               sdot[i].x -= xscroll / (1 + sdot[i].z);
-               sdot[i].y -= yscroll / (1 + sdot[i].z);
+               sdot[i].x -= xscroll / (1.3 + sdot[i].z);
+               sdot[i].y -= yscroll / (1.3 + sdot[i].z);
                if(sdot[i].y >= XSIZE) sdot[i].x -= XSIZE;
                else if(sdot[i].x < 0) sdot[i].x = XSIZE-1;
                if(sdot[i].y > YSIZE) sdot[i].y -= YSIZE;
@@ -668,7 +670,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;
@@ -711,9 +712,9 @@ gameloop() {
                                                blast_radius = BLAST_RADIUS * (DEAD_PAUSE_LENGTH - state_timeout) / 20.0;
                                                fixonly = 0;
                                        }
-                                       blast_rocks(shipx, shipy, blast_radius, fixonly);
+                                       blast_rocks(bangx, bangy, blast_radius, fixonly);
 
-                                       if(shipx < 60) shipx = 60;
+                                       if(bangx < 60) bangx = 60;
                                }
                        }
 
@@ -725,27 +726,31 @@ 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 = shipx - (XSIZE / 2);
-                               tmp += shipdx * 25;
-                               tmp /= -25;
-                               tmp = ((screendx * (gamerate - 12)) + (tmp * gamerate)) / 12;
-                               screendx = -tmp;
-                       } else screendx = 7.5;
+                       tmp = shipx - (XSIZE / 3);
+                       tmp += shipdx * 25;
+                       tmp /= -25;
+                       tmp = ((screendx * (gamerate - 12)) + (tmp * gamerate)) / 12;
+                       screendx = -tmp;
 
                        xscroll = screendx * gamerate;
                        yscroll = screendy * gamerate;
+                       shipx -= xscroll;
+                       shipy -= yscroll;
+
+                       // move bang center
+                       bangx += bangdx*gamerate - xscroll;
+                       bangy += bangdy*gamerate - yscroll;
 
-                       // INERTIA
-                       shipx += shipdx*gamerate - xscroll;
-                       shipy += shipdy*gamerate - yscroll;
-                       
                        move_rocks();
 
 
@@ -753,7 +758,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
@@ -765,14 +770,15 @@ gameloop() {
 
 
                        if(draw() && state == GAMEPLAY) {
-                               // Play the explosion sound
-                               play_sound(0);
+                               // Died
+                               play_sound(0); // Play the explosion sound
+                               bangx = shipx; bangy = shipy; bangdx = shipdx; bangdy = shipdy;
                                make_bang_dots(shipx,shipy,shipdx,shipdy,surf_ship,30);
-                               shipdx = screendx;
-                               shipdy = 0;
+                               shipdx *= 0.5; shipdy *= 0.5;
                                if(--nships <= 0) {
-                                       gameover = 1;
                                        state = GAME_OVER;
+                                       gameover = 1;
+                                       shipdx = 8; shipdy = 0;
                                        state_timeout = 200.0;
                                        fadetimer = 0.0;
                                        faderate = gamerate;
@@ -797,10 +803,8 @@ gameloop() {
                                play_tune(1);
 
                                gameover = 0;
-                               shipx = 2*XSIZE/3;
-                               shipy = YSIZE/2;
-                               shipdx = screendx;
-                               shipdy = 0;
+                               shipx = XSIZE/2.2; shipy = YSIZE/2;
+                               shipdx = screendx; shipdy = screendy;
                        }
 
                        maneuver = 0;
@@ -893,7 +897,6 @@ main(int argc, char **argv) {
        }
 
        reset_rocks();
-       initticks = SDL_GetTicks();
        gameloop();
 
        return 0;