summaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2009-10-08 16:36:52 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:16:42 +0000
commitfba8dc5e4e5bd5a7d77c5be7d82b8cabab76afaa (patch)
treeb5350d7c14f9d88adea7d8e81312c2424697735a /assets
parent030f30383f37f5f4e52be312b23579eeb20f1f5e (diff)
* (bug 3391) FF Cvar cleanup
- Remove g_humanFriendlyFire and g_alienFriendlyFire - Remove the cvar "ff" and just use g_friendlyFire and g_friendlyBuildableFire
Diffstat (limited to 'assets')
-rw-r--r--assets/ui/ingame_game.menu23
1 files changed, 20 insertions, 3 deletions
diff --git a/assets/ui/ingame_game.menu b/assets/ui/ingame_game.menu
index 0bd09131..a9ab5a70 100644
--- a/assets/ui/ingame_game.menu
+++ b/assets/ui/ingame_game.menu
@@ -747,12 +747,11 @@
name info
group gameGrp
rect 0 (INFO_Y+(6*INFOELEM_H)) W INFOELEM_H
- type ITEM_TYPE_MULTI
+ type ITEM_TYPE_YESNO
style WINDOW_STYLE_EMPTY
text "Friendly Fire:"
- cvar ui_serverinfo_ff
- cvarFloatList { "Off" 0 "Humans Only" 1 "Aliens Only" 2 "Both Teams" 3 "Buildables Only" 4 "Humans and Buildables" 5 "Aliens and Buildables" 6 "Both Teams and Buildables" 7 }
textalign ALIGN_RIGHT
+ cvar ui_serverinfo_friendlyFire
textvalign VALIGN_CENTER
textalignx INFO_OFF
textscale .25
@@ -766,6 +765,24 @@
name info
group gameGrp
rect 0 (INFO_Y+(7*INFOELEM_H)) W INFOELEM_H
+ type ITEM_TYPE_YESNO
+ style WINDOW_STYLE_EMPTY
+ text "Buildable Friendly Fire:"
+ cvar ui_serverinfo_friendlyBuildableFire
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
+ textalignx INFO_OFF
+ textscale .25
+ forecolor 1 1 1 1
+ visible MENU_FALSE
+ decoration
+ }
+
+ itemDef
+ {
+ name info
+ group gameGrp
+ rect 0 (INFO_Y+(8*INFOELEM_H)) W INFOELEM_H
type ITEM_TYPE_EDITFIELD
style WINDOW_STYLE_EMPTY
text "Version:"