fixed avg speed meter for subsequent games
debug := $(if $(DEBUG),1,0)
ldflags := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer
debug := $(if $(DEBUG),1,0)
ldflags := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer
-cflags := $(shell sdl-config --cflags) -Wall -DDEBUG=$(debug)
+cflags := $(shell sdl-config --cflags) -Wall -DDEBUG=$(debug) $(CFLAGS)
my_objects := file.o rocks.o score.o shape.o sound.o main.o $(if $(DEBUG),debug.o)
libs := SFont.o
my_objects := file.o rocks.o score.o shape.o sound.o main.o $(if $(DEBUG),debug.o)
libs := SFont.o
rawpixel = (Uint16 *) s->pixels;
first_i = -1;
rawpixel = (Uint16 *) s->pixels;
first_i = -1;
for(i = bd1; (bd1 <= bd2)?(i<bd2):(i >= bd1 && i < bd2); last_i = ++i) {
for(i = bd1; (bd1 <= bd2)?(i<bd2):(i >= bd1 && i < bd2); last_i = ++i) {
game_ticks += ticks_since_last;
if(game_ticks < 2*1000) avg_speed = cur_speed;
else avg_speed = game_dist/game_ticks;
game_ticks += ticks_since_last;
if(game_ticks < 2*1000) avg_speed = cur_speed;
else avg_speed = game_dist/game_ticks;
- // printf("avg=%.2f, cur=%.2f.\n", avg_speed, cur_speed);
- avg_speed_w = 10 + 64*avg_speed/20;
- cur_speed_w = 10 + 64*cur_speed/20;
+ //printf("avg=%.2f, cur=%.2f. shipdx=%.2f\n", avg_speed, cur_speed, shipdx);
+ avg_speed_w = 2 + 64*avg_speed/20;
+ cur_speed_w = 2 + 64*cur_speed/20;
}
if(state == GAMEPLAY || state == DEAD_PAUSE) {
}
if(state == GAMEPLAY || state == DEAD_PAUSE) {
if(shipx<0 || shipx>XSIZE-surf_ship->w) {
// BOUNCE from left and right wall
shipx -= shipdx*gamerate;
if(shipx<0 || shipx>XSIZE-surf_ship->w) {
// BOUNCE from left and right wall
shipx -= shipdx*gamerate;
SDL_PumpEvents();
keystate = SDL_GetKeyState(NULL);
SDL_PumpEvents();
keystate = SDL_GetKeyState(NULL);
if(keystate[SDLK_SPACE] && (state == HIGH_SCORE_DISPLAY || state == TITLE_PAGE)) {
reset_rocks();
game_ticks = 0;
if(keystate[SDLK_SPACE] && (state == HIGH_SCORE_DISPLAY || state == TITLE_PAGE)) {
reset_rocks();
game_ticks = 0;