}
void
-new_bang_dots(int xbang, int ybang, int dx, int dy, SDL_Surface *s, int power)
+new_bang_dots(int xbang, int ybang, int dx, int dy, SDL_Surface *s)
{
int x,y,endcount;
- Uint16 *rawpixel,c;
+ uint16_t *pixel,c;
+ uint32_t colorkey;
+ int row_inc;
double theta,r;
int begin_generate;
begin_generate = SDL_GetTicks();
+ pixel = s->pixels;
+ row_inc = s->pitch/sizeof(uint16_t) - s->w;
+ colorkey = s->format->colorkey;
SDL_LockSurface(s);
- rawpixel = (Uint16 *) s->pixels;
-
- //for(n = 0; n <= power/2; n++) {
endcount = 0;
while (endcount<3) {
- for(x = 0; x<s->w; x++) {
- for(y = 0; y<s->h; y++) {
- c = rawpixel[s->pitch/2*y + x];
- if(c && c != s->format->colorkey) {
-
+ pixel = s->pixels;
+ for(y=0; y<s->h; y++) {
+ for(x = 0; x<s->w; x++) {
+ c = *pixel++;
+ if(c && c != colorkey) {
theta = frnd()*M_PI*2;
+ r = frnd(); r = 1 - r*r;
+ // r = 1 - frnd()*frnd();
- r = 1-(frnd()*frnd());
-
- 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].dx = 45*r*cos(theta) + dx;
+ bdot[bd2].dy = 45*r*sin(theta) + dy;
bdot[bd2].x = x + xbang;
bdot[bd2].y = y + ybang;
-
- // Replace the last few bang dots with the pixels from the exploding object
- bdot[bd2].c = (endcount>0)?c:0;
+ bdot[bd2].c = 0;
bdot[bd2].life = 100;
bdot[bd2].decay = frnd()*3 + 1;
bdot[bd2].active = 1;
- bd2++;
- bd2 %= MAXBANGDOTS;
-
- // If the circular buffer is filled, who cares? They've had their chance.
- //if(bd2 == bd1-1) goto exitloop;
+ // Replace the last few bang dots with the pixels from the exploding object
+ if(endcount>0) bdot[bd2].c = c;
+ bd2 = (bd2+1) % MAXBANGDOTS;
}
+ pixel += row_inc;
}
}
-
if(SDL_GetTicks() - begin_generate > 7) endcount++;
}
SDL_UnlockSurface(s);
-
}
void
-draw_bang_dots(SDL_Surface *s) {
+draw_bang_dots(SDL_Surface *s)
+{
int i;
int first_i, last_i;
- Uint16 *rawpixel;
- rawpixel = (Uint16 *) s->pixels;
+ uint16_t *pixels, *pixel, c;
+ int row_inc = s->pitch/sizeof(uint16_t);
+ pixels = (uint16_t *) s->pixels;
first_i = -1;
last_i = 0;
- for(i = bd1; (bd1 <= bd2)?(i<bd2):(i >= bd1 && i < bd2); last_i = ++i) {
+ for(i=0; i<MAXBANGDOTS; i++) {
+ if(!bdot[i].active) continue;
- i %= MAXBANGDOTS;
+ // decrement life and maybe kill
+ bdot[i].life -= bdot[i].decay;
+ if(bdot[i].life<0) { bdot[i].active = 0; continue; }
- if(bdot[i].x <= 0 || bdot[i].x >= XSIZE || bdot[i].y <= 0 || bdot[i].y >= YSIZE) {
- // If the dot has drifted outside the perimeter, kill it
+ // move and clip
+ bdot[i].x += bdot[i].dx*t_frame - xscroll;
+ bdot[i].y += bdot[i].dy*t_frame - yscroll;
+ if(bdot[i].x < 0 || bdot[i].x >= XSIZE || bdot[i].y < 0 || bdot[i].y >= YSIZE) {
bdot[i].active = 0;
+ continue;
}
- if(bdot[i].active) {
- if(first_i < 0)
- first_i = i;
- //last_i = i + 1;
- rawpixel[(int)(s->pitch/2*(int)(bdot[i].y)) + (int)(bdot[i].x)] = bdot[i].c ? bdot[i].c : heatcolor[(int)(bdot[i].life*3)];
- bdot[i].life -= bdot[i].decay;
- bdot[i].x += bdot[i].dx*t_frame - xscroll;
- bdot[i].y += bdot[i].dy*t_frame - yscroll;
+ // check collisions
+ if(pixel_hit_rocks(bdot[i].x, bdot[i].y)) { bdot[i].active = 0; continue; }
- if(bdot[i].life<0)
- bdot[i].active = 0;
- }
- }
-
- if(first_i >= 0) {
- bd1 = first_i;
- bd2 = last_i;
- }
- else {
- bd1 = 0;
- bd2 = 0;
+ pixel = pixels + row_inc*(int)(bdot[i].y) + (int)(bdot[i].x);
+ if(bdot[i].c) c = bdot[i].c; else c = heatcolor[(int)(bdot[i].life)*3];
+ *pixel = c;
}
-
}
void
-draw_engine_dots(SDL_Surface *s) {
- int i;
- Uint16 *rawpixel;
- rawpixel = (Uint16 *) s->pixels;
-
- for(i = 0; i<MAXENGINEDOTS; i++) {
- if(edot[i].active) {
- edot[i].x += edot[i].dx*t_frame - xscroll;
- edot[i].y += edot[i].dy*t_frame - yscroll;
- if((edot[i].life -= t_frame*3)<0 || edot[i].y<0 || edot[i].y>YSIZE) {
- edot[i].active = 0;
- } else if(edot[i].x<0 || edot[i].x>XSIZE) {
- edot[i].active = 0;
- } else {
- int heatindex;
- heatindex = edot[i].life * 6;
- //rawpixel[(int)(s->pitch/2*(int)(edot[i].y)) + (int)(edot[i].x)] = lifecolor[(int)(edot[i].life)];
- rawpixel[(int)(s->pitch/2*(int)(edot[i].y)) + (int)(edot[i].x)] = heatindex>3*W ? heatcolor[3*W-1] : heatcolor[heatindex];
- }
- }
- }
-}
-
-void
new_engine_dots(int n, int dir) {
int i;
float a, r; // angle, random length
dotptr->life = 60 * fabs(dx);
}
- dotptr++;
- if(dotptr-edot >= MAXENGINEDOTS) {
- dotptr = edot;
- }
+ if(dotptr - edot < MAXENGINEDOTS-1) dotptr++;
+ else dotptr = edot;
+ }
+ }
+}
+
+void
+draw_engine_dots(SDL_Surface *s) {
+ int i;
+ uint16_t c;
+ uint16_t *pixels = (uint16_t *) s->pixels;
+ int row_inc = s->pitch/sizeof(uint16_t);
+ int heatindex;
+
+ for(i = 0; i<MAXENGINEDOTS; i++) {
+ if(!edot[i].active) continue;
+ edot[i].x += edot[i].dx*t_frame - xscroll;
+ edot[i].y += edot[i].dy*t_frame - yscroll;
+ edot[i].life -= t_frame*3;
+ if(edot[i].life < 0
+ || edot[i].x<0 || edot[i].x >= XSIZE
+ || edot[i].y<0 || edot[i].y >= YSIZE) {
+ edot[i].active = 0;
+ continue;
}
+ if(pixel_hit_rocks(edot[i].x, edot[i].y)) { edot[i].active = 0; continue; }
+ heatindex = edot[i].life * 6;
+ c = heatindex>3*W ? heatcolor[3*W-1] : heatcolor[heatindex];
+ pixels[row_inc*(int)(edot[i].y) + (int)(edot[i].x)] = c;
}
}
// Died
play_sound(SOUND_BANG); // Play the explosion sound
bangx = shipx; bangy = shipy; bangdx = shipdx; bangdy = shipdy;
- new_bang_dots(shipx,shipy,shipdx,shipdy,surf_ship,30);
+ new_bang_dots(shipx,shipy,shipdx,shipdy,surf_ship);
shipdx *= 0.5; shipdy *= 0.5;
if(shipdx < SCREENDXMIN) shipdx = SCREENDXMIN;
if(--nships <= 0) {