projects
/
neverball
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
running: tweaks
[neverball]
/
ball
/
st_over.c
diff --git
a/ball/st_over.c
b/ball/st_over.c
index
1d486f3
..
4a141b4
100644
(file)
--- a/
ball/st_over.c
+++ b/
ball/st_over.c
@@
-15,7
+15,7
@@
#include "gui.h"
#include "set.h"
#include "game.h"
#include "gui.h"
#include "set.h"
#include "game.h"
-#include "levels.h"
+#include "progress.h"
#include "audio.h"
#include "config.h"
#include "demo.h"
#include "audio.h"
#include "config.h"
#include "demo.h"
@@
-30,7
+30,7
@@
static int over_enter(void)
{
int id;
{
int id;
- if (curr_lg()->mode != MODE_CHALLENGE)
+ if (curr_mode() != MODE_CHALLENGE)
return 0;
if ((id = gui_label(0, _("GAME OVER"), GUI_LRG, GUI_ALL, gui_gry, gui_red)))
return 0;
if ((id = gui_label(0, _("GAME OVER"), GUI_LRG, GUI_ALL, gui_gry, gui_red)))
@@
-49,11
+49,10
@@
static int over_enter(void)
static void over_timer(int id, float dt)
{
static void over_timer(int id, float dt)
{
- if (curr_lg()->mode != MODE_CHALLENGE || time_state() > 3.f)
+ if (curr_mode() != MODE_CHALLENGE || time_state() > 3.f)
goto_state(&st_start);
gui_timer(id, dt);
goto_state(&st_start);
gui_timer(id, dt);
- audio_timer(dt);
}
static int over_click(int b, int d)
}
static int over_click(int b, int d)
@@
-81,6
+80,7
@@
struct state st_over = {
over_timer,
NULL,
NULL,
over_timer,
NULL,
NULL,
+ NULL,
over_click,
NULL,
over_buttn,
over_click,
NULL,
over_buttn,