/*---------------------------------------------------------------------------*/
-int goto_end_level(void)
-{
- switch (curr_lg()->mode)
- {
- case MODE_CHALLENGE:
- return goto_state(&st_over);
- default:
- return goto_state(&st_start);
- }
-}
-
-
-/*---------------------------------------------------------------------------*/
-
#define START_BACK -1
#define START_PRACTICE -2
#define START_NORMAL -3
static void gui_level(int id, int i)
{
const GLfloat *fore, *back;
-
- const struct set *s = curr_set();
const struct level *l;
int jd;
- if (!set_level_exists(s, i))
+ if (!set_level_exists(curr_set(), i))
{
gui_space(id);
return;
switch (i)
{
case START_CHALLENGE:
- gui_set_image(shot_id, curr_set()->shot);
- set_most_coins(&curr_set()->coin_score, -1);
- set_best_times(&curr_set()->time_score, -1, 0);
+ gui_set_image(shot_id, set_shot(curr_set()));
+ set_most_coins(set_coin_score(curr_set()), -1);
+ set_best_times(set_time_score(curr_set()), -1, 0);
gui_set_label(status_id, _("Challenge all levels from the first one"));
break;
if (!l->is_locked || config_cheat())
{
if (level_play(l, mode))
+ {
return goto_state(&st_level);
+ }
else
{
- level_stat(GAME_NONE, curr_clock(), curr_coins());
level_stop();
return 1;
}
if ((jd = gui_hstack(id)))
{
- gui_label(jd, _(curr_set()->name), GUI_SML, GUI_ALL,
+ gui_label(jd, set_name(curr_set()), GUI_SML, GUI_ALL,
gui_yel, gui_red);
gui_filler(jd);
gui_start(jd, _("Back"), GUI_SML, START_BACK, 0);
if ((jd = gui_harray(id)))
{
- shot_id = gui_image(jd, curr_set()->shot, 7 * w / 16, 7 * h / 16);
+ shot_id = gui_image(jd, set_shot(curr_set()), 7 * w / 16, 7 * h / 16);
if ((kd = gui_varray(jd)))
{
shared_timer,
start_point,
start_stick,
+ shared_angle,
shared_click,
start_keybd,
start_buttn,