diff options
| author | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-08-14 16:34:34 +0000 |
|---|---|---|
| committer | Guillaume Melquiond <guillaume.melquiond@gmail.com> | 2007-08-14 16:34:34 +0000 |
| commit | 2fa455ff7870dc09d75bb89a897c7c1d26eb9020 (patch) | |
| tree | 8417c6fd49f862f00234683e3a06a8d50a4f281c /src/scripting/script.cpp | |
| parent | a88aa0a9af24962f8eea11e039fcf34dade66037 (diff) | |
| download | manaserv-2fa455ff7870dc09d75bb89a897c7c1d26eb9020.tar.gz manaserv-2fa455ff7870dc09d75bb89a897c7c1d26eb9020.tar.bz2 manaserv-2fa455ff7870dc09d75bb89a897c7c1d26eb9020.tar.xz manaserv-2fa455ff7870dc09d75bb89a897c7c1d26eb9020.zip | |
Made it possible to load scripts from strings instead of files.
Diffstat (limited to 'src/scripting/script.cpp')
| -rw-r--r-- | src/scripting/script.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/scripting/script.cpp b/src/scripting/script.cpp index 4d917273..12aa0d18 100644 --- a/src/scripting/script.cpp +++ b/src/scripting/script.cpp @@ -43,7 +43,7 @@ void Script::registerEngine(std::string const &name, Factory f) (*engines)[name] = f; } -Script *Script::create(std::string const &engine, std::string const &file) +Script *Script::create(std::string const &engine) { Engines::const_iterator i = engines->find(engine); if (i == engines->end()) @@ -51,12 +51,7 @@ Script *Script::create(std::string const &engine, std::string const &file) LOG_ERROR("No scripting engine named " << engine); return NULL; } - Script *s = i->second(file); - if (!s) - { - LOG_ERROR("Failure while loading script " << file); - } - return s; + return i->second(); } void Script::update() |