rnd-20020904-1-src

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index 627ba8074b7998fac809b922aad5261659b23e97..8499f619bda35cd748456f3241a29c4c82f5e5e5 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -1,7 +1,7 @@
 /***********************************************************
 * Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-* (c) 1995-2001 Artsoft Entertainment                      *
+* (c) 1995-2002 Artsoft Entertainment                      *
 *               Holger Schemel                             *
 *               Detmolder Strasse 189                      *
 *               33604 Bielefeld                            *
@@ -1362,6 +1362,10 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 static struct TokenInfo *setup_info;
 static int num_setup_info;
 
+static char *graphics_set_name;
+static char *sounds_set_name;
+static char *music_set_name;
+
 static void execSetupMain()
 {
   setup_mode = SETUP_MODE_MAIN;
@@ -1391,9 +1395,14 @@ static void execSetupArtwork()
   /* needed if last screen (setup choice) changed graphics, sounds or music */
   ReloadCustomArtwork();
 
-  setup.graphics_set = artwork.gfx_current->name;
-  setup.sounds_set = artwork.snd_current->name;
-  setup.music_set = artwork.mus_current->name;
+  setup.graphics_set = artwork.gfx_current->identifier;
+  setup.sounds_set = artwork.snd_current->identifier;
+  setup.music_set = artwork.mus_current->identifier;
+
+  /* needed for displaying artwork name instead of artwork identifier */
+  graphics_set_name = artwork.gfx_current->name;
+  sounds_set_name = artwork.snd_current->name;
+  music_set_name = artwork.mus_current->name;
 
   setup_mode = SETUP_MODE_ARTWORK;
   DrawSetupScreen();
@@ -1497,11 +1506,11 @@ static struct TokenInfo setup_info_sound[] =
 static struct TokenInfo setup_info_artwork[] =
 {
   { TYPE_ENTER_MENU,   execSetupChooseGraphics,"Custom Graphics"       },
-  { TYPE_STRING,       &setup.graphics_set,    ""                      },
+  { TYPE_STRING,       &graphics_set_name,     ""                      },
   { TYPE_ENTER_MENU,   execSetupChooseSounds,  "Custom Sounds"         },
-  { TYPE_STRING,       &setup.sounds_set,      ""                      },
+  { TYPE_STRING,       &sounds_set_name,       ""                      },
   { TYPE_ENTER_MENU,   execSetupChooseMusic,   "Custom Music"          },
-  { TYPE_STRING,       &setup.music_set,       ""                      },
+  { TYPE_STRING,       &music_set_name,        ""                      },
   { TYPE_EMPTY,                NULL,                   ""                      },
   { TYPE_STRING,       NULL,                   "Override Level Artwork:"},
   { TYPE_YES_NO,       &setup.override_level_graphics, "Graphics:"     },
@@ -2097,7 +2106,7 @@ void CustomizeKeyboard(int player_nr)
       {
         case EVENT_KEYPRESS:
          {
-           Key key = GetEventKey((KeyEvent *)&event, TRUE);
+           Key key = GetEventKey((KeyEvent *)&event, FALSE);
 
            if (key == KSYM_Escape || (key == KSYM_Return && step_nr == 6))
            {