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-10-18 14:44:13 +0000
committerStijn Buys <ingar@osirion.org>2008-10-18 14:44:13 +0000
commitdb287e4a5133125bb6f25ba21ea97c47b19ac67f (patch)
treec977e4da6203344362a186010d017463d88def6e /src/core/application.cc
parentade4627e7fe0f89d9fdb2e27f01444ad0aa2d41d (diff)
minor module updates
Diffstat (limited to 'src/core/application.cc')
-rw-r--r--src/core/application.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/application.cc b/src/core/application.cc
index 837f294..0d52b76 100644
--- a/src/core/application.cc
+++ b/src/core/application.cc
@@ -309,9 +309,9 @@ void Application::quit(int status)
}
-Module *Application::load(std::string const &module_name)
+Module *Application::load(std::string const &module_label)
{
- if (game()) {
+ if (game() && Module::current()->interactive()) {
con_warn << "Connected. Disconnect first.\n";
return 0;
}
@@ -319,7 +319,7 @@ Module *Application::load(std::string const &module_name)
if (Module::current() && Module::current()->interactive()) {
module_interactive = Module::current();
}
- return Module::load(module_name.c_str());
+ return Module::load(module_label.c_str());
}
void Application::connect(std::string const &host)