summaryrefslogtreecommitdiff
path: root/src/scripting/script.cpp
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-04-27 21:42:58 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-04-27 21:42:58 +0200
commitd4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50 (patch)
tree474ec7369f0d367d7780f73901d38d1daec4d2eb /src/scripting/script.cpp
parent2c14cd30ecbacbd5a808cb2641d40f6d568ec294 (diff)
downloadmanaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.tar.gz
manaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.tar.bz2
manaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.tar.xz
manaserv-d4f3105d9a879f27baad6e43b8b3cb6fe2f0ef50.zip
Use nullptr instead of NULL everywhere
Diffstat (limited to 'src/scripting/script.cpp')
-rw-r--r--src/scripting/script.cpp4
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()