rnd-20020506-1-src

[rocksndiamonds.git] / src / libgame / setup.c

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 122f1dfe2a8415bdbacc9784e2e9bb4d3d658428..7b0189b880f3744e0ff6a0d85137cc7b261bf233 100644 (file)
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -79,7 +79,8 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] =
                         IS_LEVELCLASS_USER(n) ?                7 : \
                         9)
 
-#define TOKEN_VALUE_POSITION           30
+#define TOKEN_VALUE_POSITION           40
+#define TOKEN_COMMENT_POSITION         60
 
 #define MAX_COOKIE_LEN                 256
 
@@ -422,6 +423,11 @@ char *getCustomSoundFilename(char *basename)
   return NULL;                                 /* cannot find image file */
 }
 
+char *getCustomSoundConfigFilename()
+{
+  return getCustomSoundFilename(SOUNDSINFO_FILENAME);
+}
+
 char *getCustomMusicDirectory(void)
 {
   static char *directory = NULL;
@@ -1814,25 +1820,6 @@ void LoadArtworkInfo()
 #endif
 }
 
-void LoadSoundsInfo()
-{
-#if 0
-  char *filename = getCustomSoundFilename(SOUNDSINFO_FILENAME);
-  struct SetupFileList *setup_file_list = loadSetupFileList(filename);
-
-  if (setup_file_list)
-  {
-#if 0
-    for (i=0; i<NUM_LEVELINFO_TOKENS; i++)
-      setSetupInfo(levelinfo_tokens, i,
-                  getTokenValue(setup_file_list, levelinfo_tokens[i].text));
-#endif
-
-    freeSetupFileList(setup_file_list);
-  }
-#endif
-}
-
 static void SaveUserLevelInfo()
 {
   char *filename;
@@ -1941,7 +1928,9 @@ char *getSetupLine(struct TokenInfo *token_info, char *prefix, int token_nr)
     if (strcmp(keyname, "(undefined)") != 0 &&
        strcmp(keyname, "(unknown)") != 0)
     {
-      for (i=strlen(entry); i<50; i++)
+      /* add at least one whitespace */
+      strcat(entry, " ");
+      for (i=strlen(entry); i<TOKEN_COMMENT_POSITION; i++)
        strcat(entry, " ");
 
       strcat(entry, "# ");