diff options
| author | Christopher Schwarz <lakitu7@gmail.com> | 2009-10-15 22:38:40 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:51 +0000 |
| commit | 53d1ccdde68e4573b83d14d0cb319c1e265cf043 (patch) | |
| tree | 2eab2841ef2c4d8655d4c465aa11fd86ce85df5c /assets | |
| parent | b9dcd6e3440aaf7dd6d01efadfbb63fc25464f13 (diff) | |
* Restore loading of ui/tremulous_dialogs.menu so that dialogs while not on a team are actually displayed
* Update ui/tremulous_dialogs.menu to correctly use ITEM_TYPE_TEXT
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/ui/tremulous.txt | 1 | ||||
| -rw-r--r-- | assets/ui/tremulous_dialogs.menu | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/assets/ui/tremulous.txt b/assets/ui/tremulous.txt index e7732024..193fd043 100644 --- a/assets/ui/tremulous.txt +++ b/assets/ui/tremulous.txt @@ -10,6 +10,7 @@ loadMenu { "ui/tremulous_humanarmoury.menu" } + loadMenu { "ui/tremulous_dialogs.menu" } loadMenu { "ui/tremulous_humandialogs.menu" } loadMenu { "ui/tremulous_aliendialogs.menu" } diff --git a/assets/ui/tremulous_dialogs.menu b/assets/ui/tremulous_dialogs.menu index ca712d57..63109dc0 100644 --- a/assets/ui/tremulous_dialogs.menu +++ b/assets/ui/tremulous_dialogs.menu @@ -61,6 +61,7 @@ { name default_dialog textstyle ITEM_TEXTSTYLE_NORMAL + type ITEM_TYPE_TEXT style WINDOW_STYLE_EMPTY rect INFO_X INFO_Y INFO_W INFO_H cvar "ui_dialog" |