* Remove redundant type specifications in some menu files

* Ensure type is parsed before items that use it
* Multi items use cvar, not cvarFloat

8 files changed, 5 insertions, 10 deletions

diff --git a/assets/ui/createfavorite.menu b/assets/ui/createfavorite.menu
index 2c35a03e..c66ecff4 100644
--- a/assets/ui/createfavorite.menu
+++ b/assets/ui/createfavorite.menu
@@ -44,11 +44,11 @@
     itemDef
     {
       name nameEntry
+      type ITEM_TYPE_EDITFIELD
       style WINDOW_STYLE_EMPTY
       maxchars 40
       text "Name:"
       textscale .4
-      type ITEM_TYPE_EDITFIELD
       cvar "ui_favoriteName"
       rect BORDER BORDER (W-(2*BORDER)) INPUT_H
       textalign ALIGN_LEFT
@@ -60,11 +60,11 @@
     itemDef
     {
       name addressEntry
+      type ITEM_TYPE_EDITFIELD
       style WINDOW_STYLE_EMPTY
       maxchars 40
       text "Address:"
       textscale .4
-      type ITEM_TYPE_EDITFIELD
       cvar "ui_favoriteAddress"
       rect BORDER ((2*BORDER)+INPUT_H) (W-(2*BORDER)) INPUT_H
       textalign ALIGN_LEFT
diff --git a/assets/ui/createserver.menu b/assets/ui/createserver.menu
index ef8e62e2..f64ba1d5 100644
--- a/assets/ui/createserver.menu
+++ b/assets/ui/createserver.menu
@@ -476,7 +476,6 @@
       type ITEM_TYPE_BUTTON
       forecolor 1 1 1 1
       visible MENU_FALSE
-      type ITEM_TYPE_BUTTON
 
       text "Create"
       textalign ALIGN_RIGHT
diff --git a/assets/ui/download.menu b/assets/ui/download.menu
index 6bde3a67..7d117c13 100644
--- a/assets/ui/download.menu
+++ b/assets/ui/download.menu
@@ -149,7 +149,6 @@
       type ITEM_TYPE_BUTTON
       textscale .25
       group grpControlbutton
-      type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
       rect 60 295 200 15
       textalign ALIGN_CENTER
diff --git a/assets/ui/ingame_game.menu b/assets/ui/ingame_game.menu
index f392135c..0bd09131 100644
--- a/assets/ui/ingame_game.menu
+++ b/assets/ui/ingame_game.menu
@@ -750,7 +750,7 @@
       type ITEM_TYPE_MULTI
       style WINDOW_STYLE_EMPTY
       text "Friendly Fire:"
-      cvarFloat ui_serverinfo_ff 0 0 7
+      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
       textvalign VALIGN_CENTER
diff --git a/assets/ui/ingame_options.menu b/assets/ui/ingame_options.menu
index eeddea3a..141705d2 100644
--- a/assets/ui/ingame_options.menu
+++ b/assets/ui/ingame_options.menu
@@ -243,7 +243,7 @@
       group optionsGrp
       type ITEM_TYPE_MULTI
       text "Wallwalking Speed:"
-      cvarfloat "cg_wwSmoothTime" 300 0 1000
+      cvar "cg_wwSmoothTime"
       cvarFloatList { "Medium" 300 "Fast" 150 "Instant" 0 "Slow" 600 }
       rect CONTENT_X (CONTENT_Y+(5*ELEM_H)) CONTENT_W ELEM_H
       textalign ALIGN_RIGHT
diff --git a/assets/ui/joinserver.menu b/assets/ui/joinserver.menu
index 1ed54352..d9cd2f16 100644
--- a/assets/ui/joinserver.menu
+++ b/assets/ui/joinserver.menu
@@ -673,7 +673,6 @@
       type ITEM_TYPE_BUTTON
       forecolor 1 1 1 1
       visible MENU_FALSE
-      type ITEM_TYPE_BUTTON
 
       text "Join"
       textalign ALIGN_RIGHT
diff --git a/assets/ui/password.menu b/assets/ui/password.menu
index 54d642e8..d6ac4cd4 100644
--- a/assets/ui/password.menu
+++ b/assets/ui/password.menu
@@ -50,11 +50,11 @@
     itemDef
     {
       name passwordEntry
+      type ITEM_TYPE_EDITFIELD
       style WINDOW_STYLE_EMPTY
       text "Password:"
       maxChars 40
       textscale .4
-      type ITEM_TYPE_EDITFIELD
       cvar "password"
       rect BORDER BORDER (W-(2*BORDER)) INPUT_H
       textalign ALIGN_LEFT
diff --git a/assets/ui/serverinfo.menu b/assets/ui/serverinfo.menu
index 04547b4f..596712c7 100644
--- a/assets/ui/serverinfo.menu
+++ b/assets/ui/serverinfo.menu
@@ -75,7 +75,6 @@
       text "Refresh"
       type ITEM_TYPE_BUTTON
       textscale .25
-      type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
       rect (W-(2*BUTT_W)) (H-BUTT_H) BUTT_W BUTT_H
       textalign ALIGN_CENTER
@@ -95,7 +94,6 @@
       text "Close"
       type ITEM_TYPE_BUTTON
       textscale .25
-      type ITEM_TYPE_BUTTON
       style WINDOW_STYLE_EMPTY
       rect (W-BUTT_W) (H-BUTT_H) BUTT_W BUTT_H
       textalign ALIGN_CENTER