From ab10f6bcdb19e93273d028c959841deb95aab589 Mon Sep 17 00:00:00 2001 From: ac-stef Date: Wed, 29 Apr 2015 00:24:25 +0200 Subject: [PATCH] avoid some error messages when building mapmodel menus without edit mode To fully build (and use) mapmodel menus, edit mode is required. This change builds parts of the menus only in edit mode, to avoid errors. When edit mode is entered, the menus are rebuilt fully. --- config/menus_edit.cfg | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg index fc87c56a..75fe7036 100644 --- a/config/menus_edit.cfg +++ b/config/menus_edit.cfg @@ -356,25 +356,27 @@ tempalias __rebuildmapmodelmenus [ push __mm_sorted "" looplist $__mapmodelcategories [key menu] [if (>= (findlist $__mm_menus $menu) 0) [concatuniq __mm_sorted $menu]] // create list of non-empty menus in order of list above looplist $__mm_sorted m [menuitem $m (concat showmenu $m)] // only create non-empty menus - delmenu [Delete unused mapmodel slot] - newmenu [Delete unused mapmodel slot] - loop i 256 [ - mpath = (mapmodelslotname $i) - if (strlen $mpath) [ - if (strcmp "" (mapmodelslotusage $i)) [ - menuitem (concatword "delete slot #" $i ": " (editmapmodelslot $i)) (concat deletemapmodelslot $i) (__mm_showmodel [Delete unused mapmodel slot] $mpath) + if $editing [ + delmenu [Delete unused mapmodel slot] + newmenu [Delete unused mapmodel slot] + loop i 256 [ + mpath = (mapmodelslotname $i) + if (strlen $mpath) [ + if (strcmp "" (mapmodelslotusage $i)) [ + menuitem (concatword "delete slot #" $i ": " (editmapmodelslot $i)) (concat deletemapmodelslot $i) (__mm_showmodel [Delete unused mapmodel slot] $mpath) + ] ] ] - ] - delmenu [Edit mapmodel slots] - newmenu [Edit mapmodel slots] - loop i 256 [ - mpath = (mapmodelslotname $i) - if (strlen $mpath) [ - menuitem (concatword "edit slot #" $i ": " (editmapmodelslot $i)) (concat alias __mmslot $i ";" showmenu (escape "Edit mapmodel slot")) + delmenu [Edit mapmodel slots] + newmenu [Edit mapmodel slots] + loop i 256 [ + mpath = (mapmodelslotname $i) + if (strlen $mpath) [ + menuitem (concatword "edit slot #" $i ": " (editmapmodelslot $i)) (concat alias __mmslot $i ";" showmenu (escape "Edit mapmodel slot")) + ] ] + mapmodelchanged 0 ] - mapmodelchanged 0 pop menu __mm_menus __mm_sorted __mm_done __mm_unsorted idxs mpath ] ]