#include "hud.h"
#include "gui.h"
#include "game.h"
-#include "levels.h"
+#include "progress.h"
#include "config.h"
#include "audio.h"
static int Lhud_id;
static int Rhud_id;
-static int Rhud2_id;
static int time_id;
static int coin_id;
-static int coin2_id;
static int ball_id;
static int scor_id;
static int goal_id;
static void hud_fps(void)
{
- static int fps = 0;
- static int then = 0;
- static int count = 0;
-
- int now = SDL_GetTicks();
-
- if (now - then > 250)
- {
- fps = count * 1000 / (now - then);
- then = now;
- count = 0;
-
- gui_set_count(fps_id, fps);
- }
- else count++;
+ gui_set_count(fps_id, config_perf());
}
void hud_init(void)
gui_layout(Rhud_id, +1, -1);
}
- if ((Rhud2_id = gui_hstack(0)))
- {
- gui_label(Rhud2_id, _("Coins"), GUI_SML, 0, gui_wht, gui_wht);
- coin2_id = gui_count(Rhud2_id, 100, GUI_SML, GUI_NW);
- gui_layout(Rhud2_id, +1, -1);
- }
-
if ((Lhud_id = gui_hstack(0)))
{
if ((id = gui_vstack(Lhud_id)))
void hud_paint(void)
{
- switch (curr_lg()->mode)
- {
- case MODE_CHALLENGE: gui_paint(Lhud_id, config_cheat()); break;
- case MODE_PRACTICE: gui_paint(Rhud2_id, config_cheat()); break;
- default: gui_paint(Rhud_id, config_cheat()); break;
- }
+ if (curr_mode() == MODE_CHALLENGE)
+ gui_paint(Lhud_id);
- gui_paint(time_id, config_cheat());
+ gui_paint(Rhud_id);
+ gui_paint(time_id);
if (config_get_d(CONFIG_FPS))
- gui_paint(fps_id, config_cheat());
+ gui_paint(fps_id);
if (view_timer > 0.0f)
- gui_paint(view_id, config_cheat());
+ gui_paint(view_id);
}
void hud_update(int pulse)
{
- const struct level_game *lg = curr_lg();
-
int clock = curr_clock();
int coins = curr_coins();
int goal = curr_goal();
- int balls = lg->balls;
- int score = lg->score;
- int mode = lg->mode;
+ int balls = curr_balls();
+ int score = curr_score();
int c_id;
int last;
{
gui_set_clock(time_id, clock);
- if (last > clock && pulse && mode != MODE_PRACTICE)
+ if (last > clock && pulse)
{
if (clock <= 1000 && (last / 100) > (clock / 100))
{
/* balls and score + select coin widget */
- switch (mode)
+ switch (curr_mode())
{
case MODE_CHALLENGE:
if (gui_value(ball_id) != balls) gui_set_count(ball_id, balls);
c_id = coin_id;
break;
- case MODE_NORMAL:
- c_id = coin_id;
- break;
-
default:
- c_id = coin2_id;
+ c_id = coin_id;
break;
}