[Client] Use "NULL" instead "nullptr"

nullptr keyword introduced in C++11
coverity_scan^2
Koncord 8 years ago
parent 9f8f62b765
commit f78c749981

@ -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}";

@ -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<int>::max(), true);

@ -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;
}
}

@ -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);
}

@ -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);
}

@ -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;
}
}
};

@ -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();

@ -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;

Loading…
Cancel
Save