X-Git-Url: https://jasonwoof.com/gitweb/?p=vor.git;a=blobdiff_plain;f=main.c;h=a0b50ccd19ec0cdd4a03dab1e25be521c0f13fe8;hp=258ecd3df09b30709e01c874a3afea2a6342f758;hb=cd7fb220b16a73c15ff9dff7a5627bf78478875f;hpb=d918241a08d6e8b1cc10b3c682edde8876a492ef diff --git a/main.c b/main.c index 258ecd3..a0b50cc 100644 --- a/main.c +++ b/main.c @@ -153,6 +153,7 @@ new_bang_dots(int xbang, int ybang, int dx, int dy, SDL_Surface *s) if(c && c != colorkey) { theta = frnd()*M_PI*2; r = frnd(); r = 1 - r*r; + // r = 1 - frnd()*frnd(); bdot[bd2].dx = 45*r*cos(theta) + dx; bdot[bd2].dy = 45*r*sin(theta) + dy; @@ -178,74 +179,43 @@ new_bang_dots(int xbang, int ybang, int dx, int dy, SDL_Surface *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= bd1 && i < bd2); last_i = ++i) { + for(i=0; i= 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; - 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= YSIZE - || 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 @@ -283,6 +253,32 @@ new_engine_dots(int n, int dir) { } 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= 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; + } +} + +void drawdots(SDL_Surface *s) { int m; @@ -302,11 +298,27 @@ drawdots(SDL_Surface *s) { SDL_UnlockSurface(s); } +SDL_Surface * +load_image(char *filename) +{ + SDL_Surface *tmp, *img = NULL; + char *s = add_data_path(filename); + if(s) { + tmp = IMG_Load(s); + free(s); + if(tmp) { + img = SDL_DisplayFormat(tmp); + SDL_FreeSurface(tmp); + } + } + return img; +} + int init(void) { int i; - SDL_Surface *temp; + char *s; Uint32 flag; // Where are our data files? @@ -351,32 +363,27 @@ init(void) { } // Load the banners - NULLERROR(temp = IMG_Load(add_path("banners/variations.png"))); - NULLERROR(surf_b_variations = SDL_DisplayFormat(temp)); - - NULLERROR(temp = IMG_Load(add_path("banners/on.png"))); - NULLERROR(surf_b_on = SDL_DisplayFormat(temp)); + NULLERROR(surf_b_variations = load_image("banners/variations.png")); + NULLERROR(surf_b_on = load_image("banners/on.png")); + NULLERROR(surf_b_rockdodger = load_image("banners/rockdodger.png")); - NULLERROR(temp = IMG_Load(add_path("banners/rockdodger.png"))); - NULLERROR(surf_b_rockdodger = SDL_DisplayFormat(temp)); - - NULLERROR(temp = IMG_Load(add_path("banners/game.png"))); - NULLERROR(surf_b_game = SDL_DisplayFormat(temp)); - - NULLERROR(temp = IMG_Load(add_path("banners/over.png"))); - NULLERROR(surf_b_over = SDL_DisplayFormat(temp)); - - surf_font_big = IMG_Load(add_path(BIG_FONT_FILE)); - g_font = SFont_InitFont(surf_font_big); + NULLERROR(surf_b_game = load_image("banners/game.png")); + NULLERROR(surf_b_over = load_image("banners/over.png")); // Load the spaceship graphic. - NULLERROR(temp = IMG_Load(add_path("sprites/ship.png"))); - NULLERROR(surf_ship = SDL_DisplayFormat(temp)); + NULLERROR(surf_ship = load_image("sprites/ship.png")); get_shape(surf_ship, &shipshape); // Load the life indicator (small ship) graphic. - NULLERROR(temp = IMG_Load(add_path("indicators/life.png"))); - NULLERROR(surf_life = SDL_DisplayFormat(temp)); + NULLERROR(surf_life = load_image("indicators/life.png")); + + // Load the font image + s = add_data_path(BIG_FONT_FILE); + if(s) { + NULLERROR(surf_font_big = IMG_Load(s)); + free(s); + g_font = SFont_InitFont(surf_font_big); + } init_engine_dots(); init_dust(); @@ -532,7 +539,7 @@ draw() { int gameloop() { - Uint8 *keystate; + Uint8 *keystate = SDL_GetKeyState(NULL); float tmp;