summaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2009-10-12 19:17:00 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:16:48 +0000
commitcf8d239dbe92720a24e8968c0b00ec2d4eec060f (patch)
treef587fcdfcd80f8e6e9e3342dde57d2172f4c7ec6 /assets
parent244808767a99cc237a477262420c43c126732088 (diff)
* (bug 4295) Add an option to view Tremulous news to the main menu
Diffstat (limited to 'assets')
-rw-r--r--assets/ui/main.menu26
-rw-r--r--assets/ui/menudef.h1
-rw-r--r--assets/ui/menus.txt1
3 files changed, 25 insertions, 3 deletions
diff --git a/assets/ui/main.menu b/assets/ui/main.menu
index 5c84d87c..b2a241c4 100644
--- a/assets/ui/main.menu
+++ b/assets/ui/main.menu
@@ -75,12 +75,32 @@
itemDef
{
name mainmenu
+ text "News"
+ type ITEM_TYPE_BUTTON
+ style WINDOW_STYLE_EMPTY
+ textstyle ITEM_TEXTSTYLE_NORMAL
+ textscale .416
+ rect X (Y+(1*ELEM_H)) W ELEM_H
+ textalign ALIGN_RIGHT
+ backcolor 0 0 0 0
+ forecolor 1 1 1 1
+ visible MENU_TRUE
+ action
+ {
+ play "sound/misc/menu1.wav";
+ open news_menu
+ }
+ }
+
+ itemDef
+ {
+ name mainmenu
text "Options"
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
textstyle ITEM_TEXTSTYLE_NORMAL
textscale .416
- rect X (Y+ELEM_H) W ELEM_H
+ rect X (Y+(2*ELEM_H)) W ELEM_H
textalign ALIGN_RIGHT
backcolor 0 0 0 0
forecolor 1 1 1 1
@@ -100,7 +120,7 @@
style WINDOW_STYLE_EMPTY
textstyle ITEM_TEXTSTYLE_NORMAL
textscale .416
- rect X (Y+(2*ELEM_H)) W ELEM_H
+ rect X (Y+(3*ELEM_H)) W ELEM_H
textalign ALIGN_RIGHT
backcolor 0 0 0 0
forecolor 1 1 1 1
@@ -119,7 +139,7 @@
type ITEM_TYPE_BUTTON
style WINDOW_STYLE_EMPTY
textstyle ITEM_TEXTSTYLE_NORMAL
- rect X (Y+(3*ELEM_H)) W ELEM_H
+ rect X (Y+(4*ELEM_H)) W ELEM_H
textscale .416
textalign ALIGN_RIGHT
forecolor 1 1 1 1
diff --git a/assets/ui/menudef.h b/assets/ui/menudef.h
index 41412225..0ec235ab 100644
--- a/assets/ui/menudef.h
+++ b/assets/ui/menudef.h
@@ -93,6 +93,7 @@ enum
FEEDER_HUMANTEAM_LIST, // human team members
FEEDER_TEAM_LIST, // team members for team voting
FEEDER_PLAYER_LIST, // players
+ FEEDER_NEWS, // news
FEEDER_MODS, // list of available mods
FEEDER_DEMOS, // list of available demo files
FEEDER_SERVERSTATUS, // server status
diff --git a/assets/ui/menus.txt b/assets/ui/menus.txt
index 294d9953..e9f51093 100644
--- a/assets/ui/menus.txt
+++ b/assets/ui/menus.txt
@@ -2,6 +2,7 @@
//
{
loadMenu { "ui/main.menu" }
+ loadMenu { "ui/news.menu" }
loadMenu { "ui/joinserver.menu" }
loadMenu { "ui/options.menu" }
loadMenu { "ui/createserver.menu" }