diff options
| author | Henry Wilson <m3henry@googlemail.com> | 2019-04-10 22:07:06 +0100 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2019-04-10 23:22:20 +0200 |
| commit | 7c8e7c6b6e16d4a26259a676db32d8776b99817e (patch) | |
| tree | 99f134b7e66367cf11e10bc5061896eab4a3264f /src/script/api/script_event.cpp | |
| parent | 3b4f224c0bc50e7248050d4bcbb6d83fd510c1cc (diff) | |
| download | openttd-7c8e7c6b6e16d4a26259a676db32d8776b99817e.tar.xz | |
Codechange: Use null pointer literal instead of the NULL macro
Diffstat (limited to 'src/script/api/script_event.cpp')
| -rw-r--r-- | src/script/api/script_event.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/script/api/script_event.cpp b/src/script/api/script_event.cpp index 0e711ca41..2d364e8d2 100644 --- a/src/script/api/script_event.cpp +++ b/src/script/api/script_event.cpp @@ -23,7 +23,7 @@ struct ScriptEventData { /* static */ void ScriptEventController::CreateEventPointer() { - assert(ScriptObject::GetEventPointer() == NULL); + assert(ScriptObject::GetEventPointer() == nullptr); ScriptObject::GetEventPointer() = new ScriptEventData(); } @@ -45,7 +45,7 @@ struct ScriptEventData { /* static */ bool ScriptEventController::IsEventWaiting() { - if (ScriptObject::GetEventPointer() == NULL) ScriptEventController::CreateEventPointer(); + if (ScriptObject::GetEventPointer() == nullptr) ScriptEventController::CreateEventPointer(); ScriptEventData *data = (ScriptEventData *)ScriptObject::GetEventPointer(); return !data->stack.empty(); @@ -53,10 +53,10 @@ struct ScriptEventData { /* static */ ScriptEvent *ScriptEventController::GetNextEvent() { - if (ScriptObject::GetEventPointer() == NULL) ScriptEventController::CreateEventPointer(); + if (ScriptObject::GetEventPointer() == nullptr) ScriptEventController::CreateEventPointer(); ScriptEventData *data = (ScriptEventData *)ScriptObject::GetEventPointer(); - if (data->stack.empty()) return NULL; + if (data->stack.empty()) return nullptr; ScriptEvent *e = data->stack.front(); data->stack.pop(); @@ -65,7 +65,7 @@ struct ScriptEventData { /* static */ void ScriptEventController::InsertEvent(ScriptEvent *event) { - if (ScriptObject::GetEventPointer() == NULL) ScriptEventController::CreateEventPointer(); + if (ScriptObject::GetEventPointer() == nullptr) ScriptEventController::CreateEventPointer(); ScriptEventData *data = (ScriptEventData *)ScriptObject::GetEventPointer(); event->AddRef(); |