ball/st_demo.o \
ball/st_save.o \
ball/st_goal.o \
- ball/st_fall_out.o \
- ball/st_time_out.o \
+ ball/st_fail.o \
ball/st_done.o \
ball/st_level.o \
ball/st_over.o \
--- /dev/null
+/*
+ * Copyright (C) 2007 Robert Kooima
+ *
+ * NEVERBALL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#include "util.h"
+#include "progress.h"
+#include "demo.h"
+#include "audio.h"
+#include "gui.h"
+#include "config.h"
+#include "video.h"
+
+#include "game_common.h"
+#include "game_server.h"
+#include "game_client.h"
+
+#include "st_over.h"
+#include "st_start.h"
+#include "st_save.h"
+#include "st_fail.h"
+#include "st_level.h"
+#include "st_shared.h"
+#include "st_play.h"
+
+/*---------------------------------------------------------------------------*/
+
+#define FAIL_NEXT 1
+#define FAIL_SAME 2
+#define FAIL_SAVE 3
+#define FAIL_BACK 4
+#define FAIL_OVER 5
+
+static int resume;
+static int status;
+
+static int fail_action(int i)
+{
+ audio_play(AUD_MENU, 1.0f);
+
+ switch (i)
+ {
+ case FAIL_BACK:
+ /* Fall through. */
+
+ case FAIL_OVER:
+ progress_stop();
+ return goto_state(&st_over);
+
+ case FAIL_SAVE:
+ progress_stop();
+ return goto_save(&st_fail, &st_fail);
+
+ case FAIL_NEXT:
+ if (progress_next())
+ return goto_state(&st_level);
+ break;
+
+ case FAIL_SAME:
+ if (progress_same())
+ return goto_state(&st_level);
+ break;
+ }
+
+ return 1;
+}
+
+static int fail_gui(void)
+{
+ int id, jd, kd;
+
+ const char *label = "";
+
+ if (status == GAME_FALL)
+ label = _("Fall-out!");
+ else if (status == GAME_TIME)
+ label = _("Time's Up!");
+
+ if ((id = gui_vstack(0)))
+ {
+ kd = gui_label(id, label, GUI_LRG, GUI_ALL, gui_gry, gui_red);
+
+ gui_space(id);
+
+ if ((jd = gui_harray(id)))
+ {
+ if (progress_dead())
+ gui_start(jd, _("Exit"), GUI_SML, FAIL_OVER, 0);
+
+ if (progress_next_avail())
+ gui_start(jd, _("Next Level"), GUI_SML, FAIL_NEXT, 0);
+
+ if (progress_same_avail())
+ gui_start(jd, _("Retry Level"), GUI_SML, FAIL_SAME, 0);
+
+ if (demo_saved())
+ gui_state(jd, _("Save Replay"), GUI_SML, FAIL_SAVE, 0);
+ }
+
+ gui_space(id);
+
+ gui_pulse(kd, 1.2f);
+ gui_layout(id, 0, 0);
+ }
+
+ return id;
+}
+
+static int fail_enter(struct state *st, struct state *prev)
+{
+ audio_music_fade_out(2.0f);
+ video_clr_grab();
+
+ /* Check if we came from a known previous state. */
+
+ resume = (prev == &st_fail || prev == &st_save);
+
+ /* Note the current status if we got here from elsewhere. */
+
+ if (!resume)
+ status = curr_status();
+
+ return fail_gui();
+}
+
+static void fail_timer(int id, float dt)
+{
+ if (status == GAME_FALL)
+ {
+ if (!resume && time_state() < 2.f)
+ {
+ game_server_step(dt);
+ game_client_sync(demo_fp);
+ }
+ }
+
+ gui_timer(id, dt);
+}
+
+static int fail_keybd(int c, int d)
+{
+ if (d)
+ {
+ if (config_tst_d(CONFIG_KEY_RESTART, c) && progress_same_avail())
+ {
+ if (progress_same())
+ goto_state(&st_play_ready);
+ }
+ }
+ return 1;
+}
+
+static int fail_buttn(int b, int d)
+{
+ if (d)
+ {
+ if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
+ return fail_action(gui_token(gui_click()));
+ if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
+ return fail_action(FAIL_BACK);
+ }
+ return 1;
+}
+
+/*---------------------------------------------------------------------------*/
+
+struct state st_fail = {
+ fail_enter,
+ shared_leave,
+ shared_paint,
+ fail_timer,
+ shared_point,
+ shared_stick,
+ shared_angle,
+ shared_click,
+ fail_keybd,
+ fail_buttn,
+ 1, 0
+};
+
--- /dev/null
+#ifndef ST_FAIL_H
+#define ST_FAIL_H
+
+#include <state.h>
+
+extern struct state st_fail;
+
+#endif
+++ /dev/null
-/*
- * Copyright (C) 2007 Robert Kooima
- *
- * NEVERBALL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
-
-#include "gui.h"
-#include "util.h"
-#include "progress.h"
-#include "audio.h"
-#include "config.h"
-#include "video.h"
-#include "demo.h"
-
-#include "game_common.h"
-#include "game_server.h"
-#include "game_client.h"
-
-#include "st_fall_out.h"
-#include "st_save.h"
-#include "st_over.h"
-#include "st_start.h"
-#include "st_level.h"
-#include "st_shared.h"
-#include "st_play.h"
-
-/*---------------------------------------------------------------------------*/
-
-#define FALL_OUT_NEXT 1
-#define FALL_OUT_SAME 2
-#define FALL_OUT_SAVE 3
-#define FALL_OUT_BACK 4
-#define FALL_OUT_OVER 5
-
-static int resume;
-
-static int fall_out_action(int i)
-{
- audio_play(AUD_MENU, 1.0f);
-
- switch (i)
- {
- case FALL_OUT_BACK:
- /* Fall through. */
-
- case FALL_OUT_OVER:
- progress_stop();
- return goto_state(&st_over);
-
- case FALL_OUT_SAVE:
- progress_stop();
- return goto_save(&st_fall_out, &st_fall_out);
-
- case FALL_OUT_NEXT:
- if (progress_next())
- return goto_state(&st_level);
- break;
-
- case FALL_OUT_SAME:
- if (progress_same())
- return goto_state(&st_level);
- break;
- }
-
- return 1;
-}
-
-static int fall_out_gui(void)
-{
- int id, jd, kd;
-
- if ((id = gui_vstack(0)))
- {
- kd = gui_label(id, _("Fall-out!"), GUI_LRG, GUI_ALL, gui_gry, gui_red);
-
- gui_space(id);
-
- if ((jd = gui_harray(id)))
- {
- if (progress_dead())
- gui_start(jd, _("Exit"), GUI_SML, FALL_OUT_OVER, 0);
-
- if (progress_next_avail())
- gui_start(jd, _("Next Level"), GUI_SML, FALL_OUT_NEXT, 0);
-
- if (progress_same_avail())
- gui_start(jd, _("Retry Level"), GUI_SML, FALL_OUT_SAME, 0);
-
- if (demo_saved())
- gui_state(jd, _("Save Replay"), GUI_SML, FALL_OUT_SAVE, 0);
- }
-
- gui_space(id);
-
- gui_pulse(kd, 1.2f);
- gui_layout(id, 0, 0);
- }
-
- return id;
-}
-
-static int fall_out_enter(struct state *st, struct state *prev)
-{
- audio_music_fade_out(2.0f);
- video_clr_grab();
- resume = (prev == &st_fall_out || prev == &st_save);
- return fall_out_gui();
-}
-
-static void fall_out_timer(int id, float dt)
-{
- if (!resume)
- {
- if (time_state() < 2.f)
- {
- game_server_step(dt);
- game_client_sync(demo_fp);
- }
- }
-
- gui_timer(id, dt);
-}
-
-static int fall_out_keybd(int c, int d)
-{
- if (d)
- {
- if (config_tst_d(CONFIG_KEY_RESTART, c) && progress_same_avail())
- {
- if (progress_same())
- goto_state(&st_play_ready);
- }
- }
- return 1;
-}
-
-static int fall_out_buttn(int b, int d)
-{
- if (d)
- {
- if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
- return fall_out_action(gui_token(gui_click()));
- if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
- return fall_out_action(FALL_OUT_BACK);
- }
- return 1;
-}
-
-/*---------------------------------------------------------------------------*/
-
-struct state st_fall_out = {
- fall_out_enter,
- shared_leave,
- shared_paint,
- fall_out_timer,
- shared_point,
- shared_stick,
- NULL,
- shared_click,
- fall_out_keybd,
- fall_out_buttn,
- 1, 0
-};
-
+++ /dev/null
-#ifndef ST_FALL_OUT_H
-#define ST_FALL_OUT_H
-
-#include "state.h"
-
-extern struct state st_fall_out;
-
-#endif
-
#include "st_play.h"
#include "st_goal.h"
-#include "st_fall_out.h"
-#include "st_time_out.h"
+#include "st_fail.h"
#include "st_over.h"
#include "st_pause.h"
#include "st_shared.h"
case GAME_FALL:
progress_stat(GAME_FALL);
- goto_state(&st_fall_out);
+ goto_state(&st_fail);
break;
case GAME_TIME:
progress_stat(GAME_TIME);
- goto_state(&st_time_out);
+ goto_state(&st_fail);
break;
default:
+++ /dev/null
-/*
- * Copyright (C) 2007 Robert Kooima
- *
- * NEVERBALL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- */
-
-#include "util.h"
-#include "progress.h"
-#include "demo.h"
-#include "audio.h"
-#include "gui.h"
-#include "config.h"
-#include "video.h"
-
-#include "game_common.h"
-
-#include "st_over.h"
-#include "st_start.h"
-#include "st_save.h"
-#include "st_time_out.h"
-#include "st_level.h"
-#include "st_shared.h"
-#include "st_play.h"
-
-/*---------------------------------------------------------------------------*/
-
-#define TIME_OUT_NEXT 1
-#define TIME_OUT_SAME 2
-#define TIME_OUT_SAVE 3
-#define TIME_OUT_BACK 4
-#define TIME_OUT_OVER 5
-
-static int time_out_action(int i)
-{
- audio_play(AUD_MENU, 1.0f);
-
- switch (i)
- {
- case TIME_OUT_BACK:
- /* Fall through. */
-
- case TIME_OUT_OVER:
- progress_stop();
- return goto_state(&st_over);
-
- case TIME_OUT_SAVE:
- progress_stop();
- return goto_save(&st_time_out, &st_time_out);
-
- case TIME_OUT_NEXT:
- if (progress_next())
- return goto_state(&st_level);
- break;
-
- case TIME_OUT_SAME:
- if (progress_same())
- return goto_state(&st_level);
- break;
- }
-
- return 1;
-}
-
-static int time_out_gui(void)
-{
- int id, jd, kd;
-
- if ((id = gui_vstack(0)))
- {
- kd = gui_label(id, _("Time's Up!"), GUI_LRG, GUI_ALL, gui_gry, gui_red);
-
- gui_space(id);
-
- if ((jd = gui_harray(id)))
- {
- if (progress_dead())
- gui_start(jd, _("Exit"), GUI_SML, TIME_OUT_OVER, 0);
-
- if (progress_next_avail())
- gui_start(jd, _("Next Level"), GUI_SML, TIME_OUT_NEXT, 0);
-
- if (progress_same_avail())
- gui_start(jd, _("Retry Level"), GUI_SML, TIME_OUT_SAME, 0);
-
- if (demo_saved())
- gui_state(jd, _("Save Replay"), GUI_SML, TIME_OUT_SAVE, 0);
- }
- gui_space(id);
-
- gui_pulse(kd, 1.2f);
- gui_layout(id, 0, 0);
- }
-
- return id;
-}
-
-static int time_out_enter(struct state *st, struct state *prev)
-{
- audio_music_fade_out(2.0f);
- /* audio_play(AUD_TIME, 1.0f); */
-
- video_clr_grab();
-
- return time_out_gui();
-}
-
-static int time_out_keybd(int c, int d)
-{
- if (d)
- {
- if (config_tst_d(CONFIG_KEY_RESTART, c) && progress_same_avail())
- {
- if (progress_same())
- goto_state(&st_play_ready);
- }
- }
- return 1;
-}
-
-static int time_out_buttn(int b, int d)
-{
- if (d)
- {
- if (config_tst_d(CONFIG_JOYSTICK_BUTTON_A, b))
- return time_out_action(gui_token(gui_click()));
- if (config_tst_d(CONFIG_JOYSTICK_BUTTON_EXIT, b))
- return time_out_action(TIME_OUT_BACK);
- }
- return 1;
-}
-
-/*---------------------------------------------------------------------------*/
-
-struct state st_time_out = {
- time_out_enter,
- shared_leave,
- shared_paint,
- shared_timer,
- shared_point,
- shared_stick,
- shared_angle,
- shared_click,
- time_out_keybd,
- time_out_buttn,
- 1, 0
-};
-
+++ /dev/null
-#ifndef ST_TIME_OUT_H
-#define ST_TIME_OUT_H
-
-#include "state.h"
-
-extern struct state st_time_out;
-
-#endif
projects / neverball / commitdiff