X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=9d1c35ac393fe7c5372dcc4bec9515631543201f;hb=a5d330d5d963ee2fe972ff582cb98b7664c8531f;hp=343c6d9431342da4593034f924acb22d858f06be;hpb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 343c6d94..9d1c35ac 100644
--- a/src/files.c
+++ b/src/files.c
@@ -8067,21 +8067,20 @@ static struct TokenInfo global_setup_tokens[] =
   { TYPE_INTEGER,&si.touch.drop_distance,     "touch.drop_distance"	},
 };
 
-static boolean not_used = FALSE;
 static struct TokenInfo editor_setup_tokens[] =
 {
-  { TYPE_SWITCH, &not_used,		"editor.el_boulderdash"		},
-  { TYPE_SWITCH, &not_used,		"editor.el_emerald_mine"	},
-  { TYPE_SWITCH, &not_used,		"editor.el_emerald_mine_club"	},
-  { TYPE_SWITCH, &not_used,		"editor.el_more"		},
-  { TYPE_SWITCH, &not_used,		"editor.el_sokoban"		},
-  { TYPE_SWITCH, &not_used,		"editor.el_supaplex"		},
-  { TYPE_SWITCH, &not_used,		"editor.el_diamond_caves"	},
-  { TYPE_SWITCH, &not_used,		"editor.el_dx_boulderdash"	},
+  { TYPE_SWITCH, &sei.el_boulderdash,	"editor.el_boulderdash"		},
+  { TYPE_SWITCH, &sei.el_emerald_mine,	"editor.el_emerald_mine"	},
+  { TYPE_SWITCH, &sei.el_emerald_mine_club,"editor.el_emerald_mine_club"},
+  { TYPE_SWITCH, &sei.el_more,		"editor.el_more"		},
+  { TYPE_SWITCH, &sei.el_sokoban,	"editor.el_sokoban"		},
+  { TYPE_SWITCH, &sei.el_supaplex,	"editor.el_supaplex"		},
+  { TYPE_SWITCH, &sei.el_diamond_caves,	"editor.el_diamond_caves"	},
+  { TYPE_SWITCH, &sei.el_dx_boulderdash,"editor.el_dx_boulderdash"	},
   { TYPE_SWITCH, &sei.el_chars,		"editor.el_chars"		},
   { TYPE_SWITCH, &sei.el_steel_chars,	"editor.el_steel_chars"		},
   { TYPE_SWITCH, &sei.el_custom,	"editor.el_custom"		},
-  { TYPE_SWITCH, &not_used,		"editor.el_headlines"		},
+  { TYPE_SWITCH, &sei.el_headlines,	"editor.el_headlines"		},
   { TYPE_SWITCH, &sei.el_user_defined,	"editor.el_user_defined"	},
   { TYPE_SWITCH, &sei.el_dynamic,	"editor.el_dynamic"		},
   { TYPE_SWITCH, &sei.el_by_game,	"editor.el_by_game"		},
@@ -9257,7 +9256,7 @@ void LoadMusicInfo()
     if (music_already_used)
       continue;
 
-    if (!FileIsMusic(basename))
+    if (!FileIsMusic(dir_entry->filename))
       continue;
 
     if (!music_info_listed(music_file_info, basename))