mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-31 13:16:39 +00:00
NULL to nullptr
This commit is contained in:
+13
-13
@@ -15,14 +15,14 @@
|
||||
namespace Client62 {
|
||||
|
||||
static const char *name = "6.2";
|
||||
static OpcodeManager *opcodes = NULL;
|
||||
static OpcodeManager *opcodes = nullptr;
|
||||
static Strategy struct_strategy;
|
||||
|
||||
char *SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 depth);
|
||||
|
||||
void Register(EQStreamIdentifier &into) {
|
||||
//create our opcode manager if we havent already
|
||||
if(opcodes == NULL) {
|
||||
if(opcodes == nullptr) {
|
||||
//TODO: get this file name from the config file
|
||||
string opfile = "patch_";
|
||||
opfile += name;
|
||||
@@ -64,7 +64,7 @@ void Reload() {
|
||||
//opcode managers because we need to change the manager pointer, which means
|
||||
//we need to go to every stream and replace it's manager.
|
||||
|
||||
if(opcodes != NULL) {
|
||||
if(opcodes != nullptr) {
|
||||
//TODO: get this file name from the config file
|
||||
string opfile = "patch_";
|
||||
opfile += name;
|
||||
@@ -372,7 +372,7 @@ ENCODE(OP_Track)
|
||||
{
|
||||
|
||||
EQApplicationPacket *in = *p;
|
||||
*p = NULL;
|
||||
*p = nullptr;
|
||||
|
||||
unsigned char *__emu_buffer = in->pBuffer;
|
||||
Track_Struct *emu = (Track_Struct *) __emu_buffer;
|
||||
@@ -407,7 +407,7 @@ ENCODE(OP_ZoneEntry){ ENCODE_FORWARD(OP_ZoneSpawns); }
|
||||
ENCODE(OP_ZoneSpawns) {
|
||||
//consume the packet
|
||||
EQApplicationPacket *in = *p;
|
||||
*p = NULL;
|
||||
*p = nullptr;
|
||||
|
||||
//store away the emu struct
|
||||
unsigned char *__emu_buffer = in->pBuffer;
|
||||
@@ -502,7 +502,7 @@ ENCODE(OP_ItemLinkResponse) { ENCODE_FORWARD(OP_ItemPacket); }
|
||||
ENCODE(OP_ItemPacket) {
|
||||
//consume the packet
|
||||
EQApplicationPacket *in = *p;
|
||||
*p = NULL;
|
||||
*p = nullptr;
|
||||
|
||||
//store away the emu struct
|
||||
unsigned char *__emu_buffer = in->pBuffer;
|
||||
@@ -531,7 +531,7 @@ ENCODE(OP_ItemPacket) {
|
||||
ENCODE(OP_CharInventory) {
|
||||
//consume the packet
|
||||
EQApplicationPacket *in = *p;
|
||||
*p = NULL;
|
||||
*p = nullptr;
|
||||
|
||||
//store away the emu struct
|
||||
unsigned char *__emu_buffer = in->pBuffer;
|
||||
@@ -570,7 +570,7 @@ ENCODE(OP_CharInventory) {
|
||||
ENCODE(OP_GuildMemberList) {
|
||||
//consume the packet
|
||||
EQApplicationPacket *in = *p;
|
||||
*p = NULL;
|
||||
*p = nullptr;
|
||||
|
||||
//store away the emu struct
|
||||
unsigned char *__emu_buffer = in->pBuffer;
|
||||
@@ -660,7 +660,7 @@ ENCODE(OP_GuildMemberList) {
|
||||
ENCODE(OP_ReadBook) {
|
||||
|
||||
EQApplicationPacket *in = *p;
|
||||
*p = NULL;
|
||||
*p = nullptr;
|
||||
|
||||
unsigned char *__emu_buffer = in->pBuffer;
|
||||
|
||||
@@ -709,7 +709,7 @@ ENCODE(OP_Illusion) {
|
||||
ENCODE(OP_BazaarSearch)
|
||||
{
|
||||
EQApplicationPacket *in = *p;
|
||||
*p = NULL;
|
||||
*p = nullptr;
|
||||
|
||||
char *Buffer = (char *)in->pBuffer;
|
||||
|
||||
@@ -949,10 +949,10 @@ DECODE(OP_FaceChange) {
|
||||
}
|
||||
|
||||
char *SerializeItem(const ItemInst *inst, int16 slot_id, uint32 *length, uint8 depth) {
|
||||
char *serialization = NULL;
|
||||
char *instance = NULL;
|
||||
char *serialization = nullptr;
|
||||
char *instance = nullptr;
|
||||
const char *protection=(const char *)"\\\\\\\\\\";
|
||||
char *sub_items[10] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
|
||||
char *sub_items[10] = { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr };
|
||||
bool stackable=inst->IsStackable();
|
||||
uint32 merchant_slot=inst->GetMerchantSlot();
|
||||
int16 charges=inst->GetCharges();
|
||||
|
||||
Reference in New Issue
Block a user