* General Public License for more details.
*/
+#include <stdio.h>
+
#include "gui.h"
#include "game.h"
#include "util.h"
-#include "levels.h"
+#include "progress.h"
#include "audio.h"
#include "config.h"
#include "demo.h"
#define GOAL_SAVE 3
#define GOAL_BACK 4
#define GOAL_DONE 5
-#define GOAL_NAME 6
-#define GOAL_OVER 7
+#define GOAL_OVER 6
static int balls_id;
static int coins_id;
static int score_id;
+/* Bread crumbs. */
+
static int new_name;
-static int be_back_soon;
+static int resume;
static int goal_action(int i)
{
/* Fall through. */
case GOAL_OVER:
- level_stop();
+ progress_stop();
return goto_state(&st_over);
case GOAL_SAVE:
- be_back_soon = 1;
+ resume = 1;
- level_stop();
+ progress_stop();
return goto_save(&st_goal, &st_goal);
- case GOAL_NAME:
+ case GUI_NAME:
new_name = 1;
- be_back_soon = 1;
+ resume = 1;
- level_stop();
- return goto_name(&st_goal, &st_goal);
+ progress_stop();
+ return goto_name(&st_goal, &st_goal, 0);
case GOAL_DONE:
- level_stop();
+ progress_stop();
+ progress_exit();
return goto_state(&st_done);
+ case GUI_MOST_COINS:
+ case GUI_BEST_TIMES:
+ case GUI_UNLOCK_GOAL:
+ gui_score_set(i);
+ resume = 1;
+ return goto_state(&st_goal);
+
case GOAL_NEXT:
- level_next();
- return goto_state(&st_level);
+ if (progress_next())
+ return goto_state(&st_level);
+ break;
case GOAL_SAME:
- level_same();
- return goto_state(&st_level);
+ if (progress_same())
+ return goto_state(&st_level);
+ break;
}
return 1;
static int goal_enter(void)
{
- int id, jd, kd;
+ const char *s1 = _("New Record");
+ const char *s2 = _("GOAL");
- const struct level_game *lg = curr_lg();
- const struct level *l = lg->level;
+ int id, jd, kd;
- int high;
+ const struct level *l = get_level(curr_level());
- high = (lg->time_rank < 3) || (lg->goal_rank < 3) || (lg->coin_rank < 3);
-
- /* Reset hack. */
- be_back_soon = 0;
+ int high = progress_lvl_high();
if (new_name)
{
- level_update_player_name();
+ progress_rename(0);
new_name = 0;
}
int gid;
if (high)
- gid = gui_label(id, _("New Record"), GUI_MED, GUI_ALL, gui_grn, gui_grn);
+ gid = gui_label(id, s1, GUI_MED, GUI_ALL, gui_grn, gui_grn);
else
- gid = gui_label(id, _("GOAL"), GUI_LRG, GUI_ALL, gui_blu, gui_grn);
+ gid = gui_label(id, s2, GUI_LRG, GUI_ALL, gui_blu, gui_grn);
gui_space(id);
- if (lg->mode == MODE_CHALLENGE)
+ if (curr_mode() == MODE_CHALLENGE)
{
- int coins = lg->coins;
- int score = lg->score - coins;
- int balls = lg->balls - count_extra_balls(score, coins);
+ int coins, score, balls;
+ char msg[MAXSTR] = "";
+ int i;
+
+ /* Reverse-engineer initial score and balls. */
+
+ if (resume)
+ {
+ coins = 0;
+ score = curr_score();
+ balls = curr_balls();
+ }
+ else
+ {
+ coins = curr_coins();
+ score = curr_score() - coins;
+ balls = curr_balls();
+
+ for (i = curr_score(); i > score; i--)
+ if (progress_reward_ball(i))
+ balls--;
+ }
+
+ sprintf(msg, ngettext("%d new bonus level",
+ "%d new bonus levels",
+ curr_bonus()), curr_bonus());
if ((jd = gui_hstack(id)))
{
+
if ((kd = gui_harray(jd)))
{
- balls_id = gui_count(kd, 100, GUI_MED, GUI_RGT);
- gui_label(kd, _("Balls"), GUI_SML, GUI_LFT, gui_wht, gui_wht);
+ balls_id = gui_count(kd, 100, GUI_MED, GUI_NE);
+ gui_label(kd, _("Balls"), GUI_SML, 0, gui_wht, gui_wht);
}
if ((kd = gui_harray(jd)))
{
- score_id = gui_count(kd, 1000, GUI_MED, GUI_RGT);
- gui_label(kd, _("Score"), GUI_SML, GUI_LFT, gui_wht, gui_wht);
+ score_id = gui_count(kd, 1000, GUI_MED, 0);
+ gui_label(kd, _("Score"), GUI_SML, 0, gui_wht, gui_wht);
}
if ((kd = gui_harray(jd)))
{
- coins_id = gui_count(kd, 100, GUI_MED, GUI_RGT);
- gui_label(kd, _("Coins"), GUI_SML, GUI_LFT, gui_wht, gui_wht);
+ coins_id = gui_count(kd, 100, GUI_MED, 0);
+ gui_label(kd, _("Coins"), GUI_SML, GUI_NW, gui_wht, gui_wht);
}
gui_set_count(balls_id, balls);
gui_set_count(score_id, score);
gui_set_count(coins_id, coins);
+
}
+
+ gui_label(id, msg, GUI_SML, GUI_BOT, 0, 0);
+
+ gui_space(id);
}
else
{
balls_id = score_id = coins_id = 0;
}
- gui_space(id);
-
- if ((jd = gui_harray(id)))
- {
- gui_most_coins(jd, 1);
- gui_best_times(jd, 1);
- }
+ if ((jd = gui_hstack(id)))
+ gui_score_board(jd, 1, high);
gui_space(id);
if ((jd = gui_harray(id)))
{
- int next_id = 0, retry_id = 0;
-
- if (lg->win)
+ if (progress_done())
gui_start(jd, _("Finish"), GUI_SML, GOAL_DONE, 0);
- else
- next_id = gui_maybe(jd, _("Next Level"), GOAL_NEXT,
- lg->next_level != NULL);
- if (lg->dead)
- gui_start(jd, _("Game Over"), GUI_SML, GOAL_OVER, 0);
- else
- {
- retry_id = gui_maybe(jd, _("Retry Level"), GOAL_SAME,
- lg->mode != MODE_CHALLENGE);
- }
-
- gui_maybe(jd, _("Save Replay"), GOAL_SAVE, demo_saved());
+ if (progress_next_avail())
+ gui_start(jd, _("Next Level"), GUI_SML, GOAL_NEXT, 0);
- /* Default is next if the next level is newly unlocked. */
+ if (progress_same_avail())
+ gui_start(jd, _("Retry Level"), GUI_SML, GOAL_SAME, 0);
- if (next_id && lg->unlock)
- gui_focus(next_id);
- else if (lg->mode != MODE_CHALLENGE)
- gui_focus(retry_id);
+ if (demo_saved())
+ gui_state(jd, _("Save Replay"), GUI_SML, GOAL_SAVE, 0);
}
- /* FIXME, I'm ugly. */
-
- if (high)
- gui_state(id, _("Change Player Name"), GUI_SML, GOAL_NAME, 0);
+ if (!resume)
+ gui_pulse(gid, 1.2f);
- gui_pulse(gid, 1.2f);
gui_layout(id, 0, 0);
}
- set_most_coins(&l->score.most_coins, lg->coin_rank);
-
- if (lg->mode == MODE_CHALLENGE || lg->mode == MODE_NORMAL)
- set_best_times(&l->score.unlock_goal, lg->goal_rank, 1);
- else
- set_best_times(&l->score.best_times, lg->time_rank, 0);
+ set_score_board(&l->score.most_coins, progress_coin_rank(),
+ &l->score.best_times, progress_time_rank(),
+ &l->score.unlock_goal, progress_goal_rank());
audio_music_fade_out(2.0f);
config_clr_grab();
+ /* Reset hack. */
+ resume = 0;
+
return id;
}
static void goal_timer(int id, float dt)
{
- static float DT = 0.0f;
+ static float t = 0.0f;
float g[3] = { 0.0f, 9.8f, 0.0f };
- DT += dt;
+ t += dt;
if (time_state() < 1.f)
{
+ demo_play_step();
game_step(g, dt, 0);
- demo_play_step(dt);
}
- else if (DT > 0.05f && coins_id)
+ else if (t > 0.05f && coins_id)
{
int coins = gui_value(coins_id);
gui_set_count(score_id, score + 1);
gui_pulse(score_id, 1.1f);
- if ((score + 1) % 100 == 0)
+ if (progress_reward_ball(score + 1))
{
gui_set_count(balls_id, balls + 1);
gui_pulse(balls_id, 2.0f);
audio_play(AUD_BALL, 1.0f);
}
}
- DT = 0.0f;
+ t = 0.0f;
}
gui_timer(id, dt);
- audio_timer(dt);
+}
+
+static int goal_keybd(int c, int d)
+{
+ if (d)
+ {
+ if (config_tst_d(CONFIG_KEY_SCORE_NEXT, c))
+ return goal_action(gui_score_next(gui_score_get()));
+ if (config_tst_d(CONFIG_KEY_RESTART, c) && progress_same_avail())
+ return goal_action(GOAL_SAME);
+ }
+
+ return 1;
}
static int goal_buttn(int b, int d)
static void goal_leave(int id)
{
/* HACK: don't run animation if only "visiting" a state. */
- st_goal.timer = be_back_soon ? shared_timer : goal_timer;
+ st_goal.timer = resume ? shared_timer : goal_timer;
gui_delete(id);
}
goal_timer,
shared_point,
shared_stick,
+ shared_angle,
shared_click,
- NULL,
+ goal_keybd,
goal_buttn,
1, 0
};
projects / neverball / blobdiff