re-enabled editor palette element options in setup configuration file

diff --git a/ChangeLog b/ChangeLog
index 2fd5e2333a3502b831fdcdb1486a7ac9e41ab327..4c89b17e26f231be4fc5159e0a14b049dace7d2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-01-19
+       * re-enabled editor palette element options in setup configuration file
+

 2014-12-13
        * fixed loading custom PCX image files with default artwork file names
          (like "RocksDoor.pcx") which are not redefined in artwork config file
 2014-12-13
        * fixed loading custom PCX image files with default artwork file names
          (like "RocksDoor.pcx") which are not redefined in artwork config file

diff --git a/src/files.c b/src/files.c
index 793151ca109bd972eabbfb996811111871b4854a..9d1c35ac393fe7c5372dcc4bec9515631543201f 100644 (file)
--- 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"    },
 };
 
   { TYPE_INTEGER,&si.touch.drop_distance,     "touch.drop_distance"    },
 };
 

-static boolean not_used = FALSE;

 static struct TokenInfo editor_setup_tokens[] =
 {
 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, &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"             },
   { 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"             },