diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:07:56 +0100 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-11-01 04:07:56 +0100 |
| commit | 22142fd2cc8dd262ca1202ffeb5f4ef714870c4c (patch) | |
| tree | ca0a1eaeb781baec2c4e5b22cf9df60fa89f2982 /src/game-server/monster.cpp | |
| parent | 5bd0ddb6e2d1b002372541f911a2764ed2e54e6c (diff) | |
| parent | a5895b1655be3e81f451844a911eab8b798fa7ab (diff) | |
| download | manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.gz manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.bz2 manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.tar.xz manaserv-22142fd2cc8dd262ca1202ffeb5f4ef714870c4c.zip | |
Merge github.com:mana/manaserv
Conflicts:
src/game-server/character.cpp
src/scripting/lua.cpp
Diffstat (limited to 'src/game-server/monster.cpp')
| -rw-r--r-- | src/game-server/monster.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp index 0f387917..a976b81c 100644 --- a/src/game-server/monster.cpp +++ b/src/game-server/monster.cpp @@ -335,7 +335,9 @@ void Monster::loadScript(const std::string &scriptName) if (ResourceManager::exists(filename.str())) { LOG_INFO("Loading monster script: " << filename.str()); - mScript = Script::create("lua"); + std::string engineName = + Script::determineEngineByFilename(filename.str()); + mScript = Script::create(engineName); mScript->loadFile(filename.str()); } else |