summaryrefslogtreecommitdiff
path: root/src/script
diff options
context:
space:
mode:
authorRubidium <rubidium@openttd.org>2021-06-16 21:10:41 +0200
committerrubidium42 <rubidium42@users.noreply.github.com>2021-06-17 16:18:30 +0200
commit3237e97b3592d4f3920dab556d551da65a465b8d (patch)
tree2080483e02f2af2241881d83d0bab8f21be61f91 /src/script
parent930bb224168145f942a426dc8404f02f20fa2be0 (diff)
downloadopenttd-3237e97b3592d4f3920dab556d551da65a465b8d.tar.xz
Cleanup: [Script] Use nullptr instead of 0 or NULL
Diffstat (limited to 'src/script')
-rw-r--r--src/script/api/script_text.cpp2
-rw-r--r--src/script/squirrel.cpp2
-rw-r--r--src/script/squirrel.hpp2
-rw-r--r--src/script/squirrel_helper.hpp12
4 files changed, 9 insertions, 9 deletions
diff --git a/src/script/api/script_text.cpp b/src/script/api/script_text.cpp
index eeb7b2221..62980326c 100644
--- a/src/script/api/script_text.cpp
+++ b/src/script/api/script_text.cpp
@@ -109,7 +109,7 @@ SQInteger ScriptText::_SetParam(int parameter, HSQUIRRELVM vm)
sq_pop(vm, 3);
/* Get the 'real' instance of this class */
- sq_getinstanceup(vm, -1, &real_instance, 0);
+ sq_getinstanceup(vm, -1, &real_instance, nullptr);
if (real_instance == nullptr) return SQ_ERROR;
ScriptText *value = static_cast<ScriptText *>(real_instance);
diff --git a/src/script/squirrel.cpp b/src/script/squirrel.cpp
index 995776408..6489c8737 100644
--- a/src/script/squirrel.cpp
+++ b/src/script/squirrel.cpp
@@ -256,7 +256,7 @@ void Squirrel::RunError(HSQUIRRELVM vm, const SQChar *error)
SQInteger Squirrel::_RunError(HSQUIRRELVM vm)
{
- const SQChar *sErr = 0;
+ const SQChar *sErr = nullptr;
if (sq_gettop(vm) >= 1) {
if (SQ_SUCCEEDED(sq_getstring(vm, -1, &sErr))) {
diff --git a/src/script/squirrel.hpp b/src/script/squirrel.hpp
index 412011ccc..c1fdc7511 100644
--- a/src/script/squirrel.hpp
+++ b/src/script/squirrel.hpp
@@ -190,7 +190,7 @@ public:
* @note This will only work just after a function-call from within Squirrel
* to your C++ function.
*/
- static bool GetRealInstance(HSQUIRRELVM vm, SQUserPointer *ptr) { return SQ_SUCCEEDED(sq_getinstanceup(vm, 1, ptr, 0)); }
+ static bool GetRealInstance(HSQUIRRELVM vm, SQUserPointer *ptr) { return SQ_SUCCEEDED(sq_getinstanceup(vm, 1, ptr, nullptr)); }
/**
* Get the Squirrel-instance pointer.
diff --git a/src/script/squirrel_helper.hpp b/src/script/squirrel_helper.hpp
index ff25a5d58..6a3ba6125 100644
--- a/src/script/squirrel_helper.hpp
+++ b/src/script/squirrel_helper.hpp
@@ -754,9 +754,9 @@ namespace SQConvert {
sq_pop(vm, 3);
/* Get the 'real' instance of this class */
- sq_getinstanceup(vm, 1, &real_instance, 0);
+ sq_getinstanceup(vm, 1, &real_instance, nullptr);
/* Get the real function pointer */
- sq_getuserdata(vm, nparam, &ptr, 0);
+ sq_getuserdata(vm, nparam, &ptr, nullptr);
if (real_instance == nullptr) return sq_throwerror(vm, "couldn't detect real instance of class for non-static call");
/* Remove the userdata from the stack */
sq_pop(vm, 1);
@@ -796,9 +796,9 @@ namespace SQConvert {
sq_pop(vm, 3);
/* Get the 'real' instance of this class */
- sq_getinstanceup(vm, 1, &real_instance, 0);
+ sq_getinstanceup(vm, 1, &real_instance, nullptr);
/* Get the real function pointer */
- sq_getuserdata(vm, nparam, &ptr, 0);
+ sq_getuserdata(vm, nparam, &ptr, nullptr);
if (real_instance == nullptr) return sq_throwerror(vm, "couldn't detect real instance of class for non-static call");
/* Remove the userdata from the stack */
sq_pop(vm, 1);
@@ -820,7 +820,7 @@ namespace SQConvert {
SQUserPointer ptr = nullptr;
/* Get the real function pointer */
- sq_getuserdata(vm, nparam, &ptr, 0);
+ sq_getuserdata(vm, nparam, &ptr, nullptr);
try {
/* Delegate it to a template that can handle this specific function */
@@ -844,7 +844,7 @@ namespace SQConvert {
SQUserPointer ptr = nullptr;
/* Get the real function pointer */
- sq_getuserdata(vm, nparam, &ptr, 0);
+ sq_getuserdata(vm, nparam, &ptr, nullptr);
/* Remove the userdata from the stack */
sq_pop(vm, 1);