* Added BG_FindUsableForUpgrade

* Added BG_UpgradeClassAvailable
* Added generalised BG_*IsAllowed functions
* Added some binding traps to cgame
* Added tutorial mode (cg_tutorial)

6 files changed, 96 insertions, 7 deletions

diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index 99f4074c..eda5020c 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -143,7 +143,7 @@
       type ITEM_TYPE_YESNO
       text "Auto Download:"
       cvar "cl_allowDownload"
-      rect 90 120 192 15
+      rect 90 115 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 128
       textaligny 12
@@ -163,7 +163,7 @@
       type ITEM_TYPE_YESNO
       text "Taunts Off:"
       cvar "cg_noTaunt"
-      rect 90 135 192 15
+      rect 90 130 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 128
       textaligny 12
@@ -183,7 +183,7 @@
       type ITEM_TYPE_YESNO
       text "Team Chats Only:"
       cvar "cg_teamChatsOnly"
-      rect 90 150 192 15
+      rect 90 145 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 128
       textaligny 12
@@ -203,7 +203,7 @@
       type ITEM_TYPE_YESNO
       text "Auto Wallwalk Pitching:"
       cvar "cg_wwFollow"
-      rect 90 165 192 15
+      rect 90 160 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 128
       textaligny 12
@@ -224,7 +224,7 @@
       text "Wallwalking Speed:"
       cvarfloat "cg_wwSmoothTime" 300 0 1000
       cvarFloatList { "Medium" 300 "Fast" 150 "Instant" 0 "Slow" 600 }
-      rect 90 180 192 15
+      rect 90 175 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 128 
       textaligny 12
@@ -244,7 +244,7 @@
       type ITEM_TYPE_YESNO
       text "Wallwalk Control Toggles:"
       cvar "cg_wwToggle"
-      rect 90 195 192 15
+      rect 90 190 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 128
       textaligny 12
@@ -264,7 +264,27 @@
       type ITEM_TYPE_YESNO
       text "Disable Warning Dialogs:"
       cvar "cg_disableWarningDialogs"
-      rect 90 210 192 15
+      rect 90 205 192 15
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 128 
+      textaligny 12
+      textscale .25         
+      forecolor 1 1 1 1
+      visible 0 
+      action
+      {
+        play "sound/misc/menu1.wav"; 
+      }
+    }
+
+    itemDef
+    {
+      name game
+      group optionsGrp
+      type ITEM_TYPE_YESNO
+      text "Tutorial Mode:"
+      cvar "cg_tutorial"
+      rect 90 220 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 128 
       textaligny 12
diff --git a/ui/menudef.h b/ui/menudef.h
index d69957fe..dbd5b193 100644
--- a/ui/menudef.h
+++ b/ui/menudef.h
@@ -257,6 +257,7 @@
 #define CG_DEMO_RECORDING         118
 
 #define CG_CONSOLE                91
+#define CG_TUTORIAL               119
 
 
 
diff --git a/ui/tremulous_alien_builder_hud.menu b/ui/tremulous_alien_builder_hud.menu
index f30ba0bd..cd177266 100644
--- a/ui/tremulous_alien_builder_hud.menu
+++ b/ui/tremulous_alien_builder_hud.menu
@@ -29,6 +29,23 @@
       ownerdraw CG_CONSOLE
     }   
 
+    //TUTORIAL
+    itemDef
+    {
+      name "tutorial"
+      rect 8 250 640 180
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 1 1 0.35
+      align ITEM_ALIGN_LEFT
+      textalignx 0
+      textaligny 18
+      textscale 0.3
+      textstyle ITEM_TEXTSTYLE_NORMAL
+      ownerdraw CG_TUTORIAL
+    }   
+
     //LAGOMETER
     itemDef
     {
diff --git a/ui/tremulous_alien_general_hud.menu b/ui/tremulous_alien_general_hud.menu
index 5ecc0181..6ed8721f 100644
--- a/ui/tremulous_alien_general_hud.menu
+++ b/ui/tremulous_alien_general_hud.menu
@@ -29,6 +29,23 @@
       ownerdraw CG_CONSOLE
     }   
 
+    //TUTORIAL
+    itemDef
+    {
+      name "tutorial"
+      rect 8 250 640 180
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 1 1 0.35
+      align ITEM_ALIGN_LEFT
+      textalignx 0
+      textaligny 18
+      textscale 0.3
+      textstyle ITEM_TEXTSTYLE_NORMAL
+      ownerdraw CG_TUTORIAL
+    }   
+
     //LAGOMETER
     itemDef
     {
diff --git a/ui/tremulous_default_hud.menu b/ui/tremulous_default_hud.menu
index 5940b22e..b8385c53 100644
--- a/ui/tremulous_default_hud.menu
+++ b/ui/tremulous_default_hud.menu
@@ -25,6 +25,23 @@
       ownerdraw CG_CONSOLE
     }   
 
+    //TUTORIAL
+    itemDef
+    {
+      name "tutorial"
+      rect 8 250 640 180
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 1 1 0.35
+      align ITEM_ALIGN_LEFT
+      textalignx 0
+      textaligny 18
+      textscale 0.3
+      textstyle ITEM_TEXTSTYLE_NORMAL
+      ownerdraw CG_TUTORIAL
+    }   
+
     //FPS
     itemDef
     {
diff --git a/ui/tremulous_human_hud.menu b/ui/tremulous_human_hud.menu
index 715e9a57..d362fc6a 100644
--- a/ui/tremulous_human_hud.menu
+++ b/ui/tremulous_human_hud.menu
@@ -29,6 +29,23 @@
       ownerdraw CG_CONSOLE
     }   
 
+    //TUTORIAL
+    itemDef
+    {
+      name "tutorial"
+      rect 8 250 640 180
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 1 1 0.35
+      align ITEM_ALIGN_LEFT
+      textalignx 0
+      textaligny 18
+      textscale 0.3
+      textstyle ITEM_TEXTSTYLE_NORMAL
+      ownerdraw CG_TUTORIAL
+    }   
+
     //LAGOMETER
     itemDef
     {