From 4138d9d0fbaeefd8d5c3fd9bd9a7109e876163a5 Mon Sep 17 00:00:00 2001 From: RandumKiwi Date: Thu, 26 Feb 2009 00:04:12 +0000 Subject: [PATCH] configuration files to allow the map-pack git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4196 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/defaults.cfg | 2 ++ config/menus.cfg | 16 ++++++++++++---- config/menus_bot.cfg | 2 +- config/menus_mappack.cfg | 2 ++ config/menus_multiplayer.cfg | 24 ++++++++++++------------ 5 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 config/menus_mappack.cfg diff --git a/config/defaults.cfg b/config/defaults.cfg index ce1e7eb9..2ac898fe 100644 --- a/config/defaults.cfg +++ b/config/defaults.cfg @@ -31,3 +31,5 @@ alias scopesens [ *f $sensitivity $scopesensscale ] //bind lalt "melee" alias askquit 1 +alias mappackinstalled 0 // By default, map-pack is not installed. This alias is here so that AC doesn't complain. + // When mappack is installed, this changes to 1. diff --git a/config/menus.cfg b/config/menus.cfg index e1ff0708..c40a056c 100755 --- a/config/menus.cfg +++ b/config/menus.cfg @@ -8,7 +8,7 @@ menuitem "Settings" "showmenu settings" menuitem "Demo" [ showmenu "Play demo" ] menuitem "Editing" "showmenu editing" menuitem "Help" "showmenu help" -menuitem "About" "showmenu about" +menuitem "About" "menu_about" menuitem "Quit" "savequit" @@ -28,7 +28,7 @@ alias 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_arctic ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_elevation ac_gothic ac_keller ac_mines ac_power ac_scaffold ac_shine ac_snow ac_sunset ac_toxic ac_urban ac_wasteland" +alias defaultmaps "ac_arctic ac_complex ac_depot ac_desert ac_desert2 ac_desert3 ac_douze ac_elevation ac_gothic ac_keller ac_mines ac_power ac_scaffold ac_shine ac_snow ac_sunset ac_toxic ac_urban" genmapitems $defaultmaps menuitem "" -1 menuitem "Show all maps..." [ showmenu "all maps" ] @@ -120,8 +120,8 @@ menuitem "Nieb Map: ac_desert2, ac_desert3, plus mapmodels, 2D-art and hostin menuitem "Archangel Map: ac_urban." -1 menuitem "Mr.Floppy Map: ac_keller, plus textures." -1 menuitem "DogDancing Map: ac_shine, ac_scaffold, textures." -1 -menuitem "R4zor Map: ac_sunset, ac_wasteland, ac_gothic." -1 -menuitem "Halo Map: ac_arctic, ac_wasteland." -1 +menuitem "R4zor Map: ac_sunset, ac_gothic." -1 +menuitem "Halo Map: ac_arctic." -1 menuitem "" -1 menuitem "Special thanks" -1 menuitem "----------------" -1 @@ -182,3 +182,11 @@ exec config/menus_bot.cfg exec config/menus_edit.cfg exec config/menus_settings.cfg exec config/menus_multiplayer.cfg + +// Menu-specific stuff for the map-pack. +exec config/menus_mappack.cfg +alias menu_about [ if (= $mappackinstalled 0) [ showmenu about ] [ showmenu "Map-pack: About" ] ] +alias menu_maps [ if (= $mappackinstalled 0) [ showmenu maps ] [ showmenu "Map-pack: Maps" ] ] +alias menu_maps_flags [ if (= $mappackinstalled 0) [ showmenu maps_flags ] [ showmenu "Map-pack: Flag maps" ] ] + + diff --git a/config/menus_bot.cfg b/config/menus_bot.cfg index 8c7ffe31..7cedff51 100644 --- a/config/menus_bot.cfg +++ b/config/menus_bot.cfg @@ -64,7 +64,7 @@ alias startbotmap [ alias emptymap [ afterdisconnect [ mode 0 - showmenu maps + menu_maps ] ] diff --git a/config/menus_mappack.cfg b/config/menus_mappack.cfg new file mode 100644 index 00000000..77226fcc --- /dev/null +++ b/config/menus_mappack.cfg @@ -0,0 +1,2 @@ +// This file is for the AssaultCube map-pack. +// It is blank because the AssaultCube map-pack is not installed. diff --git a/config/menus_multiplayer.cfg b/config/menus_multiplayer.cfg index 5fcdf104..2ad737a2 100644 --- a/config/menus_multiplayer.cfg +++ b/config/menus_multiplayer.cfg @@ -93,18 +93,18 @@ menuitem "Initiate autoteam" "showmenu Auto-team" newmenu Gamemode -menuitem "Team Deathmatch" "mode 0; showmenu maps" -menuitem "Deathmatch" "mode 2; showmenu maps" -menuitem "Team Survivor" "mode 4; showmenu maps" -menuitem "Survivor" "mode 3; showmenu maps" -menuitem "Capture the Flag" "mode 5; showmenu maps_flags" -menuitem "Hunt the Flag" "mode 13; showmenu maps" -menuitem "Keep the Flag" "mode 15; showmenu maps_flags" -menuitem "Team Keep the Flag" "mode 14; showmenu maps_flags" -menuitem "Pistol Frenzy" "mode 6; showmenu maps" -menuitem "Last Swiss Standing" "mode 9; showmenu maps" -menuitem "One Shot, One Kill" "mode 10; showmenu maps" -menuitem "Team One Shot, One Kill" "mode 11; showmenu maps" +menuitem "Team Deathmatch" "mode 0; menu_maps" +menuitem "Deathmatch" "mode 2; menu_maps" +menuitem "Team Survivor" "mode 4; menu_maps" +menuitem "Survivor" "mode 3; menu_maps" +menuitem "Capture the Flag" "mode 5; menu_maps_flags" +menuitem "Hunt the Flag" "mode 13; menu_maps" +menuitem "Keep the Flag" "mode 15; menu_maps_flags" +menuitem "Team Keep the Flag" "mode 14; menu_maps_flags" +menuitem "Pistol Frenzy" "mode 6; menu_maps" +menuitem "Last Swiss Standing" "mode 9; menu_maps" +menuitem "One Shot, One Kill" "mode 10; menu_maps" +menuitem "Team One Shot, One Kill" "mode 11; menu_maps" newmenu Mastermode