1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 16:19:41 +00:00

[Client] Use "NULL" instead "nullptr"

nullptr keyword introduced in C++11
This commit is contained in:
Koncord 2017-02-01 15:58:12 +08:00
parent 9f8f62b765
commit f78c749981
8 changed files with 16 additions and 16 deletions

View file

@ -69,7 +69,7 @@ namespace MWMechanics
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_UNLOCK)->Send(event); mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_UNLOCK)->Send(event);
delete event; delete event;
event = nullptr; event = NULL;
lock.getClass().unlock(lock); lock.getClass().unlock(lock);
resultMessage = "#{sLockSuccess}"; resultMessage = "#{sLockSuccess}";

View file

@ -78,7 +78,7 @@ namespace MWScript
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_ANIM_PLAY)->Send(event); mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_ANIM_PLAY)->Send(event);
delete event; delete event;
event = nullptr; event = NULL;
} }
MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, std::numeric_limits<int>::max(), true); MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, std::numeric_limits<int>::max(), true);

View file

@ -209,7 +209,7 @@ namespace MWScript
worldObject.shortVal); worldObject.shortVal);
delete event; delete event;
event = nullptr; event = NULL;
} }
} }
@ -253,7 +253,7 @@ namespace MWScript
worldObject.floatVal); worldObject.floatVal);
delete event; delete event;
event = nullptr; event = NULL;
} }
} }
@ -315,7 +315,7 @@ namespace MWScript
worldObject.shortVal); worldObject.shortVal);
delete event; delete event;
event = nullptr; event = NULL;
} }
MWBase::Environment::get().getWorld()->setGlobalInt (name, value); MWBase::Environment::get().getWorld()->setGlobalInt (name, value);
@ -657,7 +657,7 @@ namespace MWScript
worldObject.shortVal); worldObject.shortVal);
delete event; delete event;
event = nullptr; event = NULL;
} }
} }

View file

@ -99,7 +99,7 @@ namespace MWScript
mwmp::Main::get().getNetworking()->getWorldPacket(ID_VIDEO_PLAY)->Send(event); mwmp::Main::get().getNetworking()->getWorldPacket(ID_VIDEO_PLAY)->Send(event);
delete event; delete event;
event = nullptr; event = NULL;
MWBase::Environment::get().getWindowManager()->playVideo (name, allowSkipping); MWBase::Environment::get().getWindowManager()->playVideo (name, allowSkipping);
} }
@ -211,7 +211,7 @@ namespace MWScript
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_LOCK)->Send(event); mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_LOCK)->Send(event);
delete event; delete event;
event = nullptr; event = NULL;
ptr.getClass().lock (ptr, lockLevel); ptr.getClass().lock (ptr, lockLevel);
@ -250,7 +250,7 @@ namespace MWScript
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_UNLOCK)->Send(event); mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_UNLOCK)->Send(event);
delete event; delete event;
event = nullptr; event = NULL;
ptr.getClass().unlock (ptr); ptr.getClass().unlock (ptr);
} }
@ -723,7 +723,7 @@ namespace MWScript
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_DELETE)->Send(event); mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_DELETE)->Send(event);
delete event; delete event;
event = nullptr; event = NULL;
MWBase::Environment::get().getWorld()->deleteObject(ptr); MWBase::Environment::get().getWorld()->deleteObject(ptr);
} }

View file

@ -79,7 +79,7 @@ namespace MWScript
mwmp::Main::get().getNetworking()->getWorldPacket(ID_MUSIC_PLAY)->Send(event); mwmp::Main::get().getNetworking()->getWorldPacket(ID_MUSIC_PLAY)->Send(event);
delete event; delete event;
event = nullptr; event = NULL;
MWBase::Environment::get().getSoundManager()->streamMusic (sound); MWBase::Environment::get().getSoundManager()->streamMusic (sound);
} }

View file

@ -58,7 +58,7 @@ namespace MWScript
mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_SCALE)->Send(event); mwmp::Main::get().getNetworking()->getWorldPacket(ID_OBJECT_SCALE)->Send(event);
delete event; delete event;
event = nullptr; event = NULL;
MWBase::Environment::get().getWorld()->scaleObject(ptr,scale); MWBase::Environment::get().getWorld()->scaleObject(ptr,scale);
} }
@ -574,7 +574,7 @@ namespace MWScript
worldObject.count); worldObject.count);
delete event; delete event;
event = nullptr; event = NULL;
} }
} }
}; };

View file

@ -42,7 +42,7 @@ namespace MWWorld
event->cell.getDescription().c_str()); event->cell.getDescription().c_str());
delete event; delete event;
event = nullptr; event = NULL;
// LocalPlayer's inventory has changed, so send a packet with it // LocalPlayer's inventory has changed, so send a packet with it
mwmp::Main::get().getLocalPlayer()->sendInventory(); mwmp::Main::get().getLocalPlayer()->sendInventory();

View file

@ -2284,7 +2284,7 @@ namespace MWWorld
worldObject.state ? "true" : "false"); worldObject.state ? "true" : "false");
delete event; delete event;
event = nullptr; event = NULL;
door.getClass().setDoorState(door, state); door.getClass().setDoorState(door, state);
mDoorStates[door] = state; mDoorStates[door] = state;
@ -2311,7 +2311,7 @@ namespace MWWorld
worldObject.state ? "true" : "false"); worldObject.state ? "true" : "false");
delete event; delete event;
event = nullptr; event = NULL;
door.getClass().setDoorState(door, state); door.getClass().setDoorState(door, state);
mDoorStates[door] = state; mDoorStates[door] = state;