projects
/
neverball
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correct logic of BSP back/front tests
[neverball]
/
ball
/
hud.c
diff --git
a/ball/hud.c
b/ball/hud.c
index
3a3f966
..
c339d4a
100644
(file)
--- a/
ball/hud.c
+++ b/
ball/hud.c
@@
-20,7
+20,7
@@
#include "hud.h"
#include "gui.h"
#include "game.h"
#include "hud.h"
#include "gui.h"
#include "game.h"
-#include "levels.h"
+#include "progress.h"
#include "config.h"
#include "audio.h"
#include "config.h"
#include "audio.h"
@@
-28,11
+28,9
@@
static int Lhud_id;
static int Rhud_id;
static int Lhud_id;
static int Rhud_id;
-static int Rhud2_id;
static int time_id;
static int coin_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 int ball_id;
static int scor_id;
static int goal_id;
@@
-43,21
+41,7
@@
static float view_timer;
static void hud_fps(void)
{
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)
}
void hud_init(void)
@@
-80,13
+64,6
@@
void hud_init(void)
gui_layout(Rhud_id, +1, -1);
}
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)))
if ((Lhud_id = gui_hstack(0)))
{
if ((id = gui_vstack(Lhud_id)))
@@
-126,13
+103,10
@@
void hud_free(void)
void hud_paint(void)
{
void hud_paint(void)
{
- int mode = curr_lg()->mode;
- if (mode == MODE_CHALLENGE)
+ if (curr_mode() == MODE_CHALLENGE)
gui_paint(Lhud_id);
gui_paint(Lhud_id);
- if (mode == MODE_PRACTICE || mode == MODE_SINGLE)
- gui_paint(Rhud2_id);
- else
- gui_paint(Rhud_id);
+
+ gui_paint(Rhud_id);
gui_paint(time_id);
if (config_get_d(CONFIG_FPS))
gui_paint(time_id);
if (config_get_d(CONFIG_FPS))
@@
-144,14
+118,11
@@
void hud_paint(void)
void hud_update(int pulse)
{
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 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;
int c_id;
int last;
@@
-171,9
+142,7
@@
void hud_update(int pulse)
{
gui_set_clock(time_id, clock);
{
gui_set_clock(time_id, clock);
- if (last > clock && pulse &&
- mode != MODE_PRACTICE &&
- mode != MODE_SINGLE)
+ if (last > clock && pulse)
{
if (clock <= 1000 && (last / 100) > (clock / 100))
{
{
if (clock <= 1000 && (last / 100) > (clock / 100))
{
@@
-190,20
+159,7
@@
void hud_update(int pulse)
/* balls and score + select coin widget */
/* balls and score + select coin widget */
-#if 0
- if (mode == MODE_CHALLENGE)
- {
- if (gui_value(ball_id) != balls) gui_set_count(ball_id, balls);
- if (gui_value(scor_id) != score) gui_set_count(scor_id, score);
- c_id = coin_id;
- }
- else if (mode == MODE_NORMAL)
- c_id = coin_id;
- else
- c_id = coin2_id;
-#endif
-
- switch (mode)
+ switch (curr_mode())
{
case MODE_CHALLENGE:
if (gui_value(ball_id) != balls) gui_set_count(ball_id, balls);
{
case MODE_CHALLENGE:
if (gui_value(ball_id) != balls) gui_set_count(ball_id, balls);
@@
-212,12
+168,8
@@
void hud_update(int pulse)
c_id = coin_id;
break;
c_id = coin_id;
break;
- case MODE_NORMAL:
- c_id = coin_id;
- break;
-
default:
default:
- c_id = coin2_id;
+ c_id = coin_id;
break;
}
break;
}