diff --git a/config/menus.cfg b/config/menus.cfg index 8b95ea5f..a5022047 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -32,10 +32,10 @@ genmapitems = [ newmenu maps // Add maps to the below list to include them in the normal map menu (also for botmaps). // Don't add ac_depot_classic to the maps list. -alias defaultmaps "ac_aqueous ac_arabian ac_arctic ac_arid ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_sunset ac_toxic ac_urban ac_werk" +alias defaultmaps "ac_aqueous ac_arabian ac_arctic ac_arid ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_elevation ac_gothic ac_iceroad ac_ingress ac_keller ac_mines ac_outpost ac_power ac_rattrap ac_scaffold ac_shine ac_snow ac_sunset ac_toxic ac_urban ac_werk" genmapitems $defaultmaps menuitem "" -1 -// the following seems to be of the old-style thoughts of MP - flowtron: 2010may23 says: the different MPs should somehow list themselves though, yes. +// the following seems to be of the old-style thoughts of MP - flowtron: 2010may23 says: the different MPs should somehow list themselves thouh, yes. // possibly a not defined internal script-file or we just generate from the know listing, which is well defined, the CGZ files and show them by code. if (&& $mappack_version (listlen $mappack_maps)) [menuitem (concatword "Map-pack (version " $mappack_version ") maps...") [showmenu "mappack maps"]]; menuitem "Show all maps..." [ showmenu "all maps" ] @@ -46,7 +46,7 @@ menudirlist "packages/maps" "cgz" "map $arg1" newmenu maps_flags // Add maps to the below list to include them in the CTF, KTF & TKTF map menu. Maps should contain flags here. -alias ctfmaps "ac_aqueous ac_arabian ac_arid ac_depot ac_desert3 ac_douze ac_edifice ac_elevation ac_gothic ac_iceroad ac_industrial ac_ingress ac_keller ac_mines ac_outpost ac_power ac_shine ac_sunset ac_urban ac_werk" +alias ctfmaps "ac_aqueous ac_arabian ac_arid ac_depot ac_desert3 ac_douze ac_elevation ac_gothic ac_iceroad ac_ingress ac_keller ac_mines ac_outpost ac_power ac_shine ac_sunset ac_urban ac_werk" genmapitems $ctfmaps menuitem "" -1 if (&& $mappack_version (listlen $mappack_flagmaps)) [menuitem (concatword "Map-pack (version " $mappack_version ") maps...") [showmenu "mappack flag maps"]]; diff --git a/config/menus_settings.cfg b/config/menus_settings.cfg index 5e0304db..bfd1c3f1 100644 --- a/config/menus_settings.cfg +++ b/config/menus_settings.cfg @@ -53,7 +53,7 @@ menuitemslider "Graphics detail: " 1 6 "$gfxqualityalias" 1 [ Horrible Low Mediu menuitemslider "Sound detail: " 1 3 "$soundqualityalias" 1 "Low Medium High" "new_sound_quality $arg1" menuitemslider "Field of view: " 75 120 "$fov" 2 "" "fov $arg1" menuitem "" -1 -menuitem " 0 [ OK; View Tutorial ]" [ closemenu "Quick setup"; resetgl; showmenu "Confirm tutorial"] +menuitem " 0 [ OK; View Tutorial ]" [ closemenu "QUICK setup"; resetgl; showmenu "Confirm tutorial"; ] menuitem " 2 [ OK ]" [ closemenu "QUICK setup"; resetgl ] newmenu "Confirm tutorial" diff --git a/config/tutorial.cfg b/config/tutorial.cfg index 53d2e9bf..fdb17b64 100644 --- a/config/tutorial.cfg +++ b/config/tutorial.cfg @@ -1,3 +1,4 @@ +watchingtutorial = 0 bind ESCAPE [ if $connected [ ingamemenu ] [if (= (watchingtutorial) 1) [ showmenu "Tutorial Menu" ] [ if (watchingdemo) [ showmenu "Watching demo" ] [ showmenu main ] ] ] ] tutstart = [ if (= $arg1 1) [ @@ -14,6 +15,7 @@ bind ESCAPE [ if $connected [ ingamemenu ] [if (= (watchingtutorial) 1) [ showme hidespecthud 1 hideteam 1 hidehudequipment 1 + //begin watchingtutorial = [1] demo "tutorial_demo" ] []]