diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-27 23:30:18 +0200 |
| commit | 5bfc376d1cee0f941657a771b87a3ee030d31c56 (patch) | |
| tree | de739c3845aa3f5bb9cb4bb79236551d5f3fc8b5 /src/scripting/script.cpp | |
| parent | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (diff) | |
| parent | d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (diff) | |
| download | manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.gz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.bz2 manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.tar.xz manaserv-5bfc376d1cee0f941657a771b87a3ee030d31c56.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'src/scripting/script.cpp')
| -rw-r--r-- | src/scripting/script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/scripting/script.cpp b/src/scripting/script.cpp index 72943d43..715a7991 100644 --- a/src/scripting/script.cpp +++ b/src/scripting/script.cpp @@ -33,7 +33,7 @@ typedef std::map< std::string, Script::Factory > Engines; -static Engines *engines = NULL; +static Engines *engines = nullptr; Script::Ref Script::mCreateNpcDelayedCallback; Script::Ref Script::mUpdateCallback; @@ -73,7 +73,7 @@ Script *Script::create(const std::string &engine) } } LOG_ERROR("No scripting engine named " << engine); - return NULL; + return nullptr; } void Script::update() |