diff --git a/apps/openmw/mwmechanics/security.cpp b/apps/openmw/mwmechanics/security.cpp index 054a0924f..82905ee4a 100644 --- a/apps/openmw/mwmechanics/security.cpp +++ b/apps/openmw/mwmechanics/security.cpp @@ -69,7 +69,7 @@ namespace MWMechanics mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_UNLOCK)->Send(event); delete event; - event = nullptr; + event = NULL; lock.getClass().unlock(lock); resultMessage = "#{sLockSuccess}"; diff --git a/apps/openmw/mwscript/animationextensions.cpp b/apps/openmw/mwscript/animationextensions.cpp index 4aa6a66ea..08463f479 100644 --- a/apps/openmw/mwscript/animationextensions.cpp +++ b/apps/openmw/mwscript/animationextensions.cpp @@ -78,7 +78,7 @@ namespace MWScript mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_ANIM_PLAY)->Send(event); delete event; - event = nullptr; + event = NULL; } MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, std::numeric_limits::max(), true); diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp index 016d131ed..4dce7a0ac 100644 --- a/apps/openmw/mwscript/interpretercontext.cpp +++ b/apps/openmw/mwscript/interpretercontext.cpp @@ -209,7 +209,7 @@ namespace MWScript worldObject.shortVal); delete event; - event = nullptr; + event = NULL; } } @@ -253,7 +253,7 @@ namespace MWScript worldObject.floatVal); delete event; - event = nullptr; + event = NULL; } } @@ -315,7 +315,7 @@ namespace MWScript worldObject.shortVal); delete event; - event = nullptr; + event = NULL; } MWBase::Environment::get().getWorld()->setGlobalInt (name, value); @@ -657,7 +657,7 @@ namespace MWScript worldObject.shortVal); delete event; - event = nullptr; + event = NULL; } } diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp index f0ae17efb..e9bb1d254 100644 --- a/apps/openmw/mwscript/miscextensions.cpp +++ b/apps/openmw/mwscript/miscextensions.cpp @@ -99,7 +99,7 @@ namespace MWScript mwmp::Main::get().getNetworking()->getWorldPacket(ID_VIDEO_PLAY)->Send(event); delete event; - event = nullptr; + event = NULL; MWBase::Environment::get().getWindowManager()->playVideo (name, allowSkipping); } @@ -211,7 +211,7 @@ namespace MWScript mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_LOCK)->Send(event); delete event; - event = nullptr; + event = NULL; ptr.getClass().lock (ptr, lockLevel); @@ -250,7 +250,7 @@ namespace MWScript mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_UNLOCK)->Send(event); delete event; - event = nullptr; + event = NULL; ptr.getClass().unlock (ptr); } @@ -723,7 +723,7 @@ namespace MWScript mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_DELETE)->Send(event); delete event; - event = nullptr; + event = NULL; MWBase::Environment::get().getWorld()->deleteObject(ptr); } diff --git a/apps/openmw/mwscript/soundextensions.cpp b/apps/openmw/mwscript/soundextensions.cpp index 0c22d477c..01711730e 100644 --- a/apps/openmw/mwscript/soundextensions.cpp +++ b/apps/openmw/mwscript/soundextensions.cpp @@ -79,7 +79,7 @@ namespace MWScript mwmp::Main::get().getNetworking()->getWorldPacket(ID_MUSIC_PLAY)->Send(event); delete event; - event = nullptr; + event = NULL; MWBase::Environment::get().getSoundManager()->streamMusic (sound); } diff --git a/apps/openmw/mwscript/transformationextensions.cpp b/apps/openmw/mwscript/transformationextensions.cpp index 6d6d9ec1f..f315e01ff 100644 --- a/apps/openmw/mwscript/transformationextensions.cpp +++ b/apps/openmw/mwscript/transformationextensions.cpp @@ -58,7 +58,7 @@ namespace MWScript mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_SCALE)->Send(event); delete event; - event = nullptr; + event = NULL; MWBase::Environment::get().getWorld()->scaleObject(ptr,scale); } @@ -574,7 +574,7 @@ namespace MWScript worldObject.count); delete event; - event = nullptr; + event = NULL; } } }; diff --git a/apps/openmw/mwworld/actiontake.cpp b/apps/openmw/mwworld/actiontake.cpp index 5bd8a9829..b91fbad55 100644 --- a/apps/openmw/mwworld/actiontake.cpp +++ b/apps/openmw/mwworld/actiontake.cpp @@ -42,7 +42,7 @@ namespace MWWorld event->cell.getDescription().c_str()); delete event; - event = nullptr; + event = NULL; // LocalPlayer's inventory has changed, so send a packet with it mwmp::Main::get().getLocalPlayer()->sendInventory(); diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp index 83844a9b1..4bfebca48 100644 --- a/apps/openmw/mwworld/worldimp.cpp +++ b/apps/openmw/mwworld/worldimp.cpp @@ -2284,7 +2284,7 @@ namespace MWWorld worldObject.state ? "true" : "false"); delete event; - event = nullptr; + event = NULL; door.getClass().setDoorState(door, state); mDoorStates[door] = state; @@ -2311,7 +2311,7 @@ namespace MWWorld worldObject.state ? "true" : "false"); delete event; - event = nullptr; + event = NULL; door.getClass().setDoorState(door, state); mDoorStates[door] = state;