Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-11-08 10:59:47 +0000
committerStijn Buys <ingar@osirion.org>2008-11-08 10:59:47 +0000
commit2182933986afd7e17cf9072d8f2e3333fa110cd4 (patch)
treea278558fa48c6948ba07c1d61338dd2bc560631f /src/client/client.cc
parent4cad4a27677b0490d3ba0018bc3404961f925ed5 (diff)
docking, join menu
Diffstat (limited to 'src/client/client.cc')
-rw-r--r--src/client/client.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/client.cc b/src/client/client.cc
index 4f6b878..823a384 100644
--- a/src/client/client.cc
+++ b/src/client/client.cc
@@ -212,6 +212,10 @@ void Client::frame(unsigned long timestamp)
if (!core::game()->interactive() && !ui::root()->active()) {
ui::root()->show_menu("main");
}
+
+ if (core::game()->interactive() && !ui::root()->active() && !core::localcontrol()) {
+ ui::root()->show_menu("join");
+ }
}
video::frame((float)(timestamp - previous_timestamp) / 1000.0f);