Correct logic of BSP back/front tests

[neverball] / ball / st_help.c

diff --git a/ball/st_help.c b/ball/st_help.c
index c5d5dc4..8618116 100644 (file)
--- a/ball/st_help.c
+++ b/ball/st_help.c
@@ -17,6 +17,7 @@
 #include "audio.h"
 #include "config.h"
 #include "demo.h"
+#include "keynames.h"
 
 #include "st_shared.h"
 #include "st_title.h"
@@ -24,10 +25,6 @@
 
 /*---------------------------------------------------------------------------*/
 
-struct state st_help_demo;
-
-/*---------------------------------------------------------------------------*/
-
 #define HELP_BACK   0
 #define HELP_RULE   1
 #define HELP_CONT   2
@@ -52,12 +49,14 @@ static int help_action(int t)
         break;
 
     case HELP_DEMO_1:
-        if (demo_replay_init(config_data("gui/demo1.nbr"), NULL))
+        if (demo_replay_init(config_data("gui/demo1.nbr"),
+                             NULL, NULL, NULL, NULL, NULL))
             return goto_state(&st_help_demo);
         break;
 
     case HELP_DEMO_2:
-        if (demo_replay_init(config_data("gui/demo2.nbr"), NULL))
+        if (demo_replay_init(config_data("gui/demo2.nbr"),
+                             NULL, NULL, NULL, NULL, NULL))
             return goto_state(&st_help_demo);
         break;
 
@@ -173,13 +172,13 @@ static int help_controls(int id)
     const char *s9 = _("Lazy View");
     const char *sA = _("Manual View");
     const char *sC = _("Screenshot");
-    
-    const char *k0 = _(SDL_GetKeyName((SDLKey) config_get_d(CONFIG_KEY_PAUSE)));
-    const char *k1 = _("Escape");
-    const char *k2 = SDL_GetKeyName((SDLKey) config_get_d(CONFIG_KEY_CAMERA_1));
-    const char *k3 = SDL_GetKeyName((SDLKey) config_get_d(CONFIG_KEY_CAMERA_2));
-    const char *k4 = SDL_GetKeyName((SDLKey) config_get_d(CONFIG_KEY_CAMERA_3));
-    const char *k6 = SDL_GetKeyName(SDLK_F10);
+
+    const char *k0 = pretty_keyname((SDLKey) config_get_d(CONFIG_KEY_PAUSE));
+    const char *k1 = pretty_keyname(SDLK_ESCAPE);
+    const char *k2 = pretty_keyname((SDLKey) config_get_d(CONFIG_KEY_CAMERA_1));
+    const char *k3 = pretty_keyname((SDLKey) config_get_d(CONFIG_KEY_CAMERA_2));
+    const char *k4 = pretty_keyname((SDLKey) config_get_d(CONFIG_KEY_CAMERA_3));
+    const char *k6 = pretty_keyname(SDLK_F10);
 
     int jd;
 
@@ -244,18 +243,10 @@ static int help_modes(int id)
 
             gui_space(kd);
 
-            gui_label(kd, _("Practice Mode"), GUI_SML, GUI_TOP, 0, 0);
-            gui_multi(kd,
-                      _("Play without time limit or coin constraint.\\"
-                        "Levels cannot be unlocked in this mode."),
-                      GUI_SML, GUI_BOT, gui_wht, gui_wht);
-
-            gui_space(kd);
-
             gui_label(kd, _("Challenge Mode"), GUI_SML, GUI_TOP, 0, 0);
             gui_multi(kd,
                       _("Start playing from the first level of the set.\\"
-                        "You start with only four balls, do not lose them.\\"
+                        "You start with only three balls, do not lose them.\\"
                         "Earn an extra ball for each 100 coins collected."),
                       GUI_SML, GUI_BOT, gui_wht, gui_wht);
         }
@@ -386,9 +377,9 @@ static void help_demo_leave(int id)
     demo_replay_stop(0);
 }
 
-static void help_demo_paint(int id, float st)
+static void help_demo_paint(int id, float t)
 {
-    game_draw(0, st);
+    game_draw(0, t);
 }
 
 static void help_demo_timer(int id, float dt)