X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=ball%2Fst_title.c;h=70d85bdf57ef96f34e56d0a4e8061240e614c6e8;hb=afcca7618054cd6c5e900cb32f71466c45edb0cd;hp=f4e7dee81bf45153a210a22fad1815fe3070629d;hpb=d19583ee18b31ff4119b92576ea9067ca32bc069;p=neverball diff --git a/ball/st_title.c b/ball/st_title.c index f4e7dee..70d85bd 100644 --- a/ball/st_title.c +++ b/ball/st_title.c @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2003 Robert Kooima * * NEVERBALL is free software; you can redistribute it and/or modify @@ -12,11 +12,8 @@ * General Public License for more details. */ -#include - #include "gui.h" #include "vec3.h" -#include "back.h" #include "demo.h" #include "game.h" #include "audio.h" @@ -24,6 +21,7 @@ #include "st_shared.h" #include "st_title.h" +#include "st_help.h" #include "st_demo.h" #include "st_conf.h" #include "st_set.h" @@ -48,12 +46,14 @@ static int title_action(int i) switch (i) { - case TITLE_PLAY: - config_get_s(CONFIG_PLAYER, player, MAXNAM); - if (player[0] == '\0') - return goto_name(&st_set, &st_title); - else - return goto_state(&st_set); + case TITLE_PLAY: + config_get_s(CONFIG_PLAYER, player, MAXNAM); + + if (player[0] == '\0') + return goto_name(&st_set, &st_title); + else + return goto_state(&st_set); + case TITLE_HELP: return goto_state(&st_help); case TITLE_DEMO: return goto_state(&st_demo); case TITLE_CONF: return goto_state(&st_conf); @@ -72,7 +72,7 @@ static int title_enter(void) if ((id = gui_vstack(0))) { - gui_label(id, _("Neverball"), GUI_LRG, GUI_ALL, 0, 0); + gui_label(id, "Neverball", GUI_LRG, GUI_ALL, 0, 0); gui_space(id); if ((jd = gui_harray(id))) @@ -98,10 +98,7 @@ static int title_enter(void) audio_music_fade_to(0.5f, "bgm/title.ogg"); /* Initialize the first level of the first set for display. */ - strcpy(title_level.file, config_data("map-rlk/title.sol")); - strcpy(title_level.back, "map-back/jupiter.sol"); - strcpy(title_level.grad, "png/space.png"); - + level_load("map-rlk/title.sol", &title_level); game_init(&title_level, 0, 0); real_time = 0.0f; @@ -144,7 +141,7 @@ static void title_timer(int id, float dt) { if ((demo = demo_pick())) { - demo_replay_init(demo, NULL, NULL, NULL, NULL); + demo_replay_init(demo, NULL); demo_time = 0.0f; real_time = 0.0f; mode = 2; @@ -164,7 +161,7 @@ static void title_timer(int id, float dt) if (demo_replay_step(&t)) demo_time += t; else - { + { demo_replay_stop(0); game_fade(+1.0f); real_time = 0.0f; @@ -191,10 +188,10 @@ static void title_timer(int id, float dt) static int title_keybd(int c, int d) { if (d && c == SDLK_c && ALLOW_CHEAT) - config_tgl_d(CONFIG_CHEAT); - return 1; + config_tgl_d(CONFIG_CHEAT); + return 1; } - + static int title_buttn(int b, int d) { if (d) @@ -209,91 +206,6 @@ static int title_buttn(int b, int d) /*---------------------------------------------------------------------------*/ -static int help_enter(void) -{ - const char *s0 = - _("Move the mouse or joystick to tilt the floor\\" - "causing the ball to roll. Roll over coins to\\" - "collect them. Collect coins to unlock the goal\\" - "and finish the level. Earn an extra ball for\\" - "each 100 coins collected.\\"); - - const char *s4 = _("Left and right mouse buttons rotate the view."); - const char *s5 = _("Hold Shift for faster view rotation."); - const char *s6 = _("Pause / Release Pointer"); - const char *s7 = _("Exit / Cancel Menu"); - const char *s8 = _("Chase View"); - const char *s9 = _("Lazy View"); - const char *sA = _("Manual View"); - const char *sB = _("Comments? Problems? robert.kooima@gmail.com"); - - const char *k0 = _("Spacebar"); - const char *k1 = _("Escape"); - const char *k2 = SDL_GetKeyName(config_get_d(CONFIG_KEY_CAMERA_1)); - const char *k3 = SDL_GetKeyName(config_get_d(CONFIG_KEY_CAMERA_2)); - const char *k4 = SDL_GetKeyName(config_get_d(CONFIG_KEY_CAMERA_3)); - - int id, jd; - - if ((id = gui_vstack(0))) - { - gui_multi(id, s0, GUI_SML, GUI_ALL, gui_wht, gui_wht); - gui_space(id); - - if ((jd = gui_harray(id))) - { - gui_label(jd, s6, GUI_SML, GUI_NE, gui_wht, gui_wht); - gui_label(jd, k0, GUI_SML, GUI_NW, gui_yel, gui_yel); - } - if ((jd = gui_harray(id))) - { - gui_label(jd, s7, GUI_SML, 0, gui_wht, gui_wht); - gui_label(jd, k1, GUI_SML, 0, gui_yel, gui_yel); - } - if ((jd = gui_harray(id))) - { - gui_label(jd, s8, GUI_SML, 0, gui_wht, gui_wht); - gui_label(jd, k2, GUI_SML, 0, gui_yel, gui_yel); - } - if ((jd = gui_harray(id))) - { - gui_label(jd, s9, GUI_SML, 0, gui_wht, gui_wht); - gui_label(jd, k3, GUI_SML, 0, gui_yel, gui_yel); - } - if ((jd = gui_harray(id))) - { - gui_label(jd, sA, GUI_SML, GUI_SE, gui_wht, gui_wht); - gui_label(jd, k4, GUI_SML, GUI_SW, gui_yel, gui_yel); - } - - gui_space(id); - gui_label(id, s4, GUI_SML, GUI_TOP, gui_wht, gui_wht); - gui_label(id, s5, GUI_SML, GUI_BOT, gui_wht, gui_wht); - gui_space(id); - gui_label(id, sB, GUI_SML, GUI_ALL, gui_wht, gui_wht); - - gui_layout(id, 0, 0); - } - return id; -} - -static int help_click(int b, int d) -{ - return d ? goto_state(&st_title) : 1; -} - -static int help_keybd(int c, int d) -{ - return d ? goto_state(&st_title) : 1; -} - -static int help_buttn(int b, int d) -{ - return d ? goto_state(&st_title) : 1; -} - -/*---------------------------------------------------------------------------*/ - struct state st_title = { title_enter, title_leave, @@ -307,15 +219,3 @@ struct state st_title = { 1, 0 }; -struct state st_help = { - help_enter, - shared_leave, - shared_paint, - shared_timer, - NULL, - NULL, - help_click, - help_keybd, - help_buttn, - 1, 0 -};