From 36f13fb8df2cd82b2320bb1c0c5c1dad8f50790b Mon Sep 17 00:00:00 2001 From: Foereaper Date: Mon, 5 Aug 2024 18:36:39 +0200 Subject: [PATCH] Clean up the remaining method headers --- methods/CMangos/AuraMethods.h | 2 +- methods/CMangos/BattleGroundMethods.h | 2 +- methods/CMangos/CorpseMethods.h | 2 +- methods/CMangos/CreatureMethods.h | 2 +- methods/CMangos/ElunaQueryMethods.h | 2 +- methods/CMangos/GameObjectMethods.h | 2 +- methods/CMangos/GlobalMethods.h | 4 ++-- methods/CMangos/GroupMethods.h | 2 +- methods/CMangos/GuildMethods.h | 2 +- methods/CMangos/ItemMethods.h | 2 +- methods/CMangos/MapMethods.h | 2 +- methods/CMangos/ObjectMethods.h | 2 +- methods/CMangos/PlayerMethods.h | 2 +- methods/CMangos/QuestMethods.h | 2 +- methods/CMangos/SpellMethods.h | 2 +- methods/CMangos/UnitMethods.h | 2 +- methods/CMangos/VehicleMethods.h | 2 +- methods/CMangos/WorldObjectMethods.h | 2 +- methods/CMangos/WorldPacketMethods.h | 2 +- methods/Mangos/AuraMethods.h | 2 +- methods/Mangos/BattleGroundMethods.h | 2 +- methods/Mangos/CorpseMethods.h | 2 +- methods/Mangos/CreatureMethods.h | 2 +- methods/Mangos/ElunaQueryMethods.h | 2 +- methods/Mangos/GameObjectMethods.h | 2 +- methods/Mangos/GlobalMethods.h | 4 ++-- methods/Mangos/GroupMethods.h | 2 +- methods/Mangos/GuildMethods.h | 2 +- methods/Mangos/ItemMethods.h | 2 +- methods/Mangos/MapMethods.h | 2 +- methods/Mangos/ObjectMethods.h | 2 +- methods/Mangos/PlayerMethods.h | 2 +- methods/Mangos/QuestMethods.h | 2 +- methods/Mangos/SpellMethods.h | 2 +- methods/Mangos/UnitMethods.h | 2 +- methods/Mangos/VehicleMethods.h | 2 +- methods/Mangos/WorldObjectMethods.h | 2 +- methods/Mangos/WorldPacketMethods.h | 2 +- methods/VMangos/AuraMethods.h | 2 +- methods/VMangos/BattleGroundMethods.h | 2 +- methods/VMangos/CorpseMethods.h | 2 +- methods/VMangos/CreatureMethods.h | 2 +- methods/VMangos/ElunaQueryMethods.h | 2 +- methods/VMangos/GameObjectMethods.h | 2 +- methods/VMangos/GlobalMethods.h | 4 ++-- methods/VMangos/GroupMethods.h | 2 +- methods/VMangos/GuildMethods.h | 2 +- methods/VMangos/ItemMethods.h | 2 +- methods/VMangos/MapMethods.h | 2 +- methods/VMangos/ObjectMethods.h | 2 +- methods/VMangos/PlayerMethods.h | 2 +- methods/VMangos/QuestMethods.h | 2 +- methods/VMangos/SpellMethods.h | 2 +- methods/VMangos/UnitMethods.h | 2 +- methods/VMangos/VehicleMethods.h | 2 +- methods/VMangos/WorldObjectMethods.h | 2 +- methods/VMangos/WorldPacketMethods.h | 2 +- 57 files changed, 60 insertions(+), 60 deletions(-) diff --git a/methods/CMangos/AuraMethods.h b/methods/CMangos/AuraMethods.h index e3a289e4d3..9831732a77 100644 --- a/methods/CMangos/AuraMethods.h +++ b/methods/CMangos/AuraMethods.h @@ -200,7 +200,7 @@ namespace LuaAura // Other { "Remove", &LuaAura::Remove }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/BattleGroundMethods.h b/methods/CMangos/BattleGroundMethods.h index a4373d5441..425a5b5919 100644 --- a/methods/CMangos/BattleGroundMethods.h +++ b/methods/CMangos/BattleGroundMethods.h @@ -247,7 +247,7 @@ namespace LuaBattleGround { "GetWinner", &LuaBattleGround::GetWinner }, { "GetStatus", &LuaBattleGround::GetStatus }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/CorpseMethods.h b/methods/CMangos/CorpseMethods.h index b4f4a94793..61b86a93df 100644 --- a/methods/CMangos/CorpseMethods.h +++ b/methods/CMangos/CorpseMethods.h @@ -85,7 +85,7 @@ namespace LuaCorpse { "ResetGhostTime", &LuaCorpse::ResetGhostTime }, { "SaveToDB", &LuaCorpse::SaveToDB }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/CreatureMethods.h b/methods/CMangos/CreatureMethods.h index 4f4d4dcf4b..f572b5825f 100644 --- a/methods/CMangos/CreatureMethods.h +++ b/methods/CMangos/CreatureMethods.h @@ -1310,7 +1310,7 @@ namespace LuaCreature { "FixateTarget", nullptr, METHOD_REG_NONE }, // TC/Acore { "ClearFixate", nullptr, METHOD_REG_NONE }, // TC/Acore - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/ElunaQueryMethods.h b/methods/CMangos/ElunaQueryMethods.h index 3ab85a70ec..c3daad11a3 100644 --- a/methods/CMangos/ElunaQueryMethods.h +++ b/methods/CMangos/ElunaQueryMethods.h @@ -335,7 +335,7 @@ namespace LuaQuery { "NextRow", &LuaQuery::NextRow }, { "IsNull", &LuaQuery::IsNull }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #undef RESULT diff --git a/methods/CMangos/GameObjectMethods.h b/methods/CMangos/GameObjectMethods.h index 201f28d73d..4fbcabb56f 100644 --- a/methods/CMangos/GameObjectMethods.h +++ b/methods/CMangos/GameObjectMethods.h @@ -334,7 +334,7 @@ namespace LuaGameObject // Not implemented methods { "IsDestructible", nullptr, METHOD_REG_NONE }, // Not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/GlobalMethods.h b/methods/CMangos/GlobalMethods.h index 9f3974a07b..86d88c8d93 100644 --- a/methods/CMangos/GlobalMethods.h +++ b/methods/CMangos/GlobalMethods.h @@ -3180,7 +3180,7 @@ namespace LuaGlobalFunctions return 0; } - ElunaGlobal::ElunaRegister GlobalMethods[] = + ElunaRegister<> GlobalMethods[] = { // Hooks { "RegisterPacketEvent", &LuaGlobalFunctions::RegisterPacketEvent }, @@ -3297,7 +3297,7 @@ namespace LuaGlobalFunctions { "StartGameEvent", &LuaGlobalFunctions::StartGameEvent }, { "StopGameEvent", &LuaGlobalFunctions::StopGameEvent }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; } #endif diff --git a/methods/CMangos/GroupMethods.h b/methods/CMangos/GroupMethods.h index c0b5df41a3..ce1b7be68e 100644 --- a/methods/CMangos/GroupMethods.h +++ b/methods/CMangos/GroupMethods.h @@ -418,7 +418,7 @@ namespace LuaGroup { "GetMemberFlags", nullptr, METHOD_REG_NONE }, // not implemented { "SetMemberFlag", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; diff --git a/methods/CMangos/GuildMethods.h b/methods/CMangos/GuildMethods.h index 2338cc1735..58a022e030 100644 --- a/methods/CMangos/GuildMethods.h +++ b/methods/CMangos/GuildMethods.h @@ -271,7 +271,7 @@ namespace LuaGuild { "AddMember", &LuaGuild::AddMember, METHOD_REG_WORLD }, // World state method only in multistate { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD }, // World state method only in multistate - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/ItemMethods.h b/methods/CMangos/ItemMethods.h index 3e94d1e3c8..085a7f7234 100644 --- a/methods/CMangos/ItemMethods.h +++ b/methods/CMangos/ItemMethods.h @@ -860,7 +860,7 @@ namespace LuaItem // Not implemented methods { "IsRefundExpired", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/MapMethods.h b/methods/CMangos/MapMethods.h index a24049db54..7b0261ce3d 100644 --- a/methods/CMangos/MapMethods.h +++ b/methods/CMangos/MapMethods.h @@ -365,7 +365,7 @@ namespace LuaMap { "SaveInstanceData", &LuaMap::SaveInstanceData }, { "Data", &LuaMap::Data }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/ObjectMethods.h b/methods/CMangos/ObjectMethods.h index 7dec65cc78..9996c45d52 100644 --- a/methods/CMangos/ObjectMethods.h +++ b/methods/CMangos/ObjectMethods.h @@ -492,7 +492,7 @@ namespace LuaObject { "ToCorpse", &LuaObject::ToCorpse }, { "RemoveFlag", &LuaObject::RemoveFlag }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/PlayerMethods.h b/methods/CMangos/PlayerMethods.h index eec0344685..56ad9bf3b9 100644 --- a/methods/CMangos/PlayerMethods.h +++ b/methods/CMangos/PlayerMethods.h @@ -4061,7 +4061,7 @@ namespace LuaPlayer { "GetXP", nullptr, METHOD_REG_NONE }, // not implemented { "GetXPForNextLevel", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/QuestMethods.h b/methods/CMangos/QuestMethods.h index 4f2d2cc7e1..339b532cc0 100644 --- a/methods/CMangos/QuestMethods.h +++ b/methods/CMangos/QuestMethods.h @@ -195,7 +195,7 @@ namespace LuaQuest // Not implemented methods { "GetMaxLevel", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/SpellMethods.h b/methods/CMangos/SpellMethods.h index 25eb87f8a0..628de33d12 100644 --- a/methods/CMangos/SpellMethods.h +++ b/methods/CMangos/SpellMethods.h @@ -188,7 +188,7 @@ namespace LuaSpell { "Cast", &LuaSpell::Cast }, { "Finish", &LuaSpell::Finish }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/UnitMethods.h b/methods/CMangos/UnitMethods.h index c6ee6bddaa..a9d41bdbef 100644 --- a/methods/CMangos/UnitMethods.h +++ b/methods/CMangos/UnitMethods.h @@ -2611,7 +2611,7 @@ namespace LuaUnit { "DisableMelee", nullptr, METHOD_REG_NONE }, // not implemented { "SummonGuardian", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/VehicleMethods.h b/methods/CMangos/VehicleMethods.h index d82756e6ce..56e3f17c48 100644 --- a/methods/CMangos/VehicleMethods.h +++ b/methods/CMangos/VehicleMethods.h @@ -106,7 +106,7 @@ namespace LuaVehicle { "AddPassenger", &LuaVehicle::AddPassenger }, { "RemovePassenger", &LuaVehicle::RemovePassenger }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; } diff --git a/methods/CMangos/WorldObjectMethods.h b/methods/CMangos/WorldObjectMethods.h index b62491ee4a..07394f245c 100644 --- a/methods/CMangos/WorldObjectMethods.h +++ b/methods/CMangos/WorldObjectMethods.h @@ -1187,7 +1187,7 @@ namespace LuaWorldObject { "PlayDistanceSound", &LuaWorldObject::PlayDistanceSound }, { "Data", &LuaWorldObject::Data }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/CMangos/WorldPacketMethods.h b/methods/CMangos/WorldPacketMethods.h index 803c3f1f29..c7f4127eb2 100644 --- a/methods/CMangos/WorldPacketMethods.h +++ b/methods/CMangos/WorldPacketMethods.h @@ -343,7 +343,7 @@ namespace LuaPacket { "WriteFloat", &LuaPacket::WriteFloat }, { "WriteDouble", &LuaPacket::WriteDouble }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; diff --git a/methods/Mangos/AuraMethods.h b/methods/Mangos/AuraMethods.h index 6e45a0e473..1de9d57b48 100644 --- a/methods/Mangos/AuraMethods.h +++ b/methods/Mangos/AuraMethods.h @@ -200,7 +200,7 @@ namespace LuaAura // Other { "Remove", &LuaAura::Remove }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/BattleGroundMethods.h b/methods/Mangos/BattleGroundMethods.h index d1bc8c049f..f6747157d5 100644 --- a/methods/Mangos/BattleGroundMethods.h +++ b/methods/Mangos/BattleGroundMethods.h @@ -245,7 +245,7 @@ namespace LuaBattleGround { "GetWinner", &LuaBattleGround::GetWinner }, { "GetStatus", &LuaBattleGround::GetStatus }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/CorpseMethods.h b/methods/Mangos/CorpseMethods.h index b4f4a94793..61b86a93df 100644 --- a/methods/Mangos/CorpseMethods.h +++ b/methods/Mangos/CorpseMethods.h @@ -85,7 +85,7 @@ namespace LuaCorpse { "ResetGhostTime", &LuaCorpse::ResetGhostTime }, { "SaveToDB", &LuaCorpse::SaveToDB }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/CreatureMethods.h b/methods/Mangos/CreatureMethods.h index 56c2973a4c..beb844328a 100644 --- a/methods/Mangos/CreatureMethods.h +++ b/methods/Mangos/CreatureMethods.h @@ -1208,7 +1208,7 @@ namespace LuaCreature { "RemoveFromWorld", nullptr, METHOD_REG_NONE }, // not implemented { "GetRank", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/ElunaQueryMethods.h b/methods/Mangos/ElunaQueryMethods.h index 87ae0e5119..67e5c5802a 100644 --- a/methods/Mangos/ElunaQueryMethods.h +++ b/methods/Mangos/ElunaQueryMethods.h @@ -337,7 +337,7 @@ namespace LuaQuery { "NextRow", &LuaQuery::NextRow }, { "IsNull", &LuaQuery::IsNull }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #undef RESULT diff --git a/methods/Mangos/GameObjectMethods.h b/methods/Mangos/GameObjectMethods.h index 503095a113..b2ba53b09e 100644 --- a/methods/Mangos/GameObjectMethods.h +++ b/methods/Mangos/GameObjectMethods.h @@ -339,7 +339,7 @@ namespace LuaGameObject // Not implemented methods { "IsDestructible", nullptr, METHOD_REG_NONE }, // Not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/GlobalMethods.h b/methods/Mangos/GlobalMethods.h index 6271b66ba3..13a92696e5 100644 --- a/methods/Mangos/GlobalMethods.h +++ b/methods/Mangos/GlobalMethods.h @@ -2923,7 +2923,7 @@ namespace LuaGlobalFunctions return 0; } - ElunaGlobal::ElunaRegister GlobalMethods[] = + ElunaRegister<> GlobalMethods[] = { // Hooks { "RegisterPacketEvent", &LuaGlobalFunctions::RegisterPacketEvent }, @@ -3041,7 +3041,7 @@ namespace LuaGlobalFunctions { "CharDBQueryAsync", nullptr, METHOD_REG_NONE }, { "AuthDBQueryAsync", nullptr, METHOD_REG_NONE }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; } #endif diff --git a/methods/Mangos/GroupMethods.h b/methods/Mangos/GroupMethods.h index 86e25d0f94..d945427ff0 100644 --- a/methods/Mangos/GroupMethods.h +++ b/methods/Mangos/GroupMethods.h @@ -413,7 +413,7 @@ namespace LuaGroup { "GetMemberFlags", nullptr, METHOD_REG_NONE }, // not implemented { "SetMemberFlag", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; diff --git a/methods/Mangos/GuildMethods.h b/methods/Mangos/GuildMethods.h index 39c0421d83..7203931ddc 100644 --- a/methods/Mangos/GuildMethods.h +++ b/methods/Mangos/GuildMethods.h @@ -261,7 +261,7 @@ namespace LuaGuild { "AddMember", &LuaGuild::AddMember, METHOD_REG_WORLD }, // World state method only in multistate { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD }, // World state method only in multistate - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/ItemMethods.h b/methods/Mangos/ItemMethods.h index 5ec717d948..d844a4a9c2 100644 --- a/methods/Mangos/ItemMethods.h +++ b/methods/Mangos/ItemMethods.h @@ -869,7 +869,7 @@ namespace LuaItem // Not implemented methods { "IsRefundExpired", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/MapMethods.h b/methods/Mangos/MapMethods.h index b463e32a18..7ee65cf724 100644 --- a/methods/Mangos/MapMethods.h +++ b/methods/Mangos/MapMethods.h @@ -366,7 +366,7 @@ namespace LuaMap { "SaveInstanceData", &LuaMap::SaveInstanceData }, { "Data", &LuaMap::Data }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/ObjectMethods.h b/methods/Mangos/ObjectMethods.h index 7dec65cc78..9996c45d52 100644 --- a/methods/Mangos/ObjectMethods.h +++ b/methods/Mangos/ObjectMethods.h @@ -492,7 +492,7 @@ namespace LuaObject { "ToCorpse", &LuaObject::ToCorpse }, { "RemoveFlag", &LuaObject::RemoveFlag }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/PlayerMethods.h b/methods/Mangos/PlayerMethods.h index 2280baaebe..c4de25d825 100644 --- a/methods/Mangos/PlayerMethods.h +++ b/methods/Mangos/PlayerMethods.h @@ -3978,7 +3978,7 @@ namespace LuaPlayer { "CanCompleteRepeatableQuest", nullptr, METHOD_REG_NONE }, // not implemented { "CanRewardQuest", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/QuestMethods.h b/methods/Mangos/QuestMethods.h index 3fa05cae67..34ebcb4668 100644 --- a/methods/Mangos/QuestMethods.h +++ b/methods/Mangos/QuestMethods.h @@ -195,7 +195,7 @@ namespace LuaQuest // Not implemented methods { "GetMaxLevel", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/SpellMethods.h b/methods/Mangos/SpellMethods.h index d6c1983d9a..ce3a4d9dfd 100644 --- a/methods/Mangos/SpellMethods.h +++ b/methods/Mangos/SpellMethods.h @@ -190,7 +190,7 @@ namespace LuaSpell { "Cast", &LuaSpell::Cast }, { "Finish", &LuaSpell::Finish }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/UnitMethods.h b/methods/Mangos/UnitMethods.h index 2485d17bb7..3c058ecebf 100644 --- a/methods/Mangos/UnitMethods.h +++ b/methods/Mangos/UnitMethods.h @@ -2618,7 +2618,7 @@ namespace LuaUnit { "SummonGuardian", nullptr, METHOD_REG_NONE }, // not implemented { "SetImmuneTo", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/VehicleMethods.h b/methods/Mangos/VehicleMethods.h index b630ceac2a..e74278083c 100644 --- a/methods/Mangos/VehicleMethods.h +++ b/methods/Mangos/VehicleMethods.h @@ -107,7 +107,7 @@ namespace LuaVehicle { "AddPassenger", &LuaVehicle::AddPassenger }, { "RemovePassenger", &LuaVehicle::RemovePassenger }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; } diff --git a/methods/Mangos/WorldObjectMethods.h b/methods/Mangos/WorldObjectMethods.h index 935340a885..848ce7536c 100644 --- a/methods/Mangos/WorldObjectMethods.h +++ b/methods/Mangos/WorldObjectMethods.h @@ -1185,7 +1185,7 @@ namespace LuaWorldObject { "PlayDistanceSound", &LuaWorldObject::PlayDistanceSound }, { "Data", &LuaWorldObject::Data }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/Mangos/WorldPacketMethods.h b/methods/Mangos/WorldPacketMethods.h index 1468a04cf4..755576ad28 100644 --- a/methods/Mangos/WorldPacketMethods.h +++ b/methods/Mangos/WorldPacketMethods.h @@ -340,7 +340,7 @@ namespace LuaPacket { "WriteFloat", &LuaPacket::WriteFloat }, { "WriteDouble", &LuaPacket::WriteDouble }, - { NULL, NULL } + { nullptr, METHOD_REG_NONE } }; }; diff --git a/methods/VMangos/AuraMethods.h b/methods/VMangos/AuraMethods.h index a25b085112..b8efca2fa4 100644 --- a/methods/VMangos/AuraMethods.h +++ b/methods/VMangos/AuraMethods.h @@ -188,7 +188,7 @@ namespace LuaAura // Other { "Remove", &LuaAura::Remove }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/BattleGroundMethods.h b/methods/VMangos/BattleGroundMethods.h index 0a459e2b70..09dc82198f 100644 --- a/methods/VMangos/BattleGroundMethods.h +++ b/methods/VMangos/BattleGroundMethods.h @@ -243,7 +243,7 @@ namespace LuaBattleGround { "GetWinner", &LuaBattleGround::GetWinner }, { "GetStatus", &LuaBattleGround::GetStatus }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/CorpseMethods.h b/methods/VMangos/CorpseMethods.h index b4f4a94793..61b86a93df 100644 --- a/methods/VMangos/CorpseMethods.h +++ b/methods/VMangos/CorpseMethods.h @@ -85,7 +85,7 @@ namespace LuaCorpse { "ResetGhostTime", &LuaCorpse::ResetGhostTime }, { "SaveToDB", &LuaCorpse::SaveToDB }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/CreatureMethods.h b/methods/VMangos/CreatureMethods.h index 62967637f4..c6c5d910a7 100644 --- a/methods/VMangos/CreatureMethods.h +++ b/methods/VMangos/CreatureMethods.h @@ -1216,7 +1216,7 @@ namespace LuaCreature { "RemoveLootMode", nullptr, METHOD_REG_NONE }, // not implemented { "RemoveFromWorld", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/ElunaQueryMethods.h b/methods/VMangos/ElunaQueryMethods.h index 3ab85a70ec..c3daad11a3 100644 --- a/methods/VMangos/ElunaQueryMethods.h +++ b/methods/VMangos/ElunaQueryMethods.h @@ -335,7 +335,7 @@ namespace LuaQuery { "NextRow", &LuaQuery::NextRow }, { "IsNull", &LuaQuery::IsNull }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #undef RESULT diff --git a/methods/VMangos/GameObjectMethods.h b/methods/VMangos/GameObjectMethods.h index f4d58e42c2..2c88d2567a 100644 --- a/methods/VMangos/GameObjectMethods.h +++ b/methods/VMangos/GameObjectMethods.h @@ -332,7 +332,7 @@ namespace LuaGameObject // Not implemented methods { "IsDestructible", nullptr, METHOD_REG_NONE }, // Not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/GlobalMethods.h b/methods/VMangos/GlobalMethods.h index a575aeb696..1420a8bc73 100644 --- a/methods/VMangos/GlobalMethods.h +++ b/methods/VMangos/GlobalMethods.h @@ -2872,7 +2872,7 @@ namespace LuaGlobalFunctions return 0; } - ElunaGlobal::ElunaRegister GlobalMethods[] = + ElunaRegister<> GlobalMethods[] = { // Hooks { "RegisterPacketEvent", &LuaGlobalFunctions::RegisterPacketEvent }, @@ -2982,7 +2982,7 @@ namespace LuaGlobalFunctions { "StartGameEvent", &LuaGlobalFunctions::StartGameEvent }, { "StopGameEvent", &LuaGlobalFunctions::StopGameEvent }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; } #endif diff --git a/methods/VMangos/GroupMethods.h b/methods/VMangos/GroupMethods.h index 4ed139f551..7c7560aa6f 100644 --- a/methods/VMangos/GroupMethods.h +++ b/methods/VMangos/GroupMethods.h @@ -389,7 +389,7 @@ namespace LuaGroup { "GetMemberFlags", nullptr, METHOD_REG_NONE }, // not implemented { "SetMemberFlag", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; diff --git a/methods/VMangos/GuildMethods.h b/methods/VMangos/GuildMethods.h index 05cd108931..44a35cb380 100644 --- a/methods/VMangos/GuildMethods.h +++ b/methods/VMangos/GuildMethods.h @@ -246,7 +246,7 @@ namespace LuaGuild { "SetBankTabText", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/ItemMethods.h b/methods/VMangos/ItemMethods.h index b4b6ad71a1..d8acb82c7c 100644 --- a/methods/VMangos/ItemMethods.h +++ b/methods/VMangos/ItemMethods.h @@ -723,7 +723,7 @@ namespace LuaItem { "IsWeaponVellum", nullptr, METHOD_REG_NONE }, // not implemented { "IsArmorVellum", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/MapMethods.h b/methods/VMangos/MapMethods.h index d1d54822fd..5788149578 100644 --- a/methods/VMangos/MapMethods.h +++ b/methods/VMangos/MapMethods.h @@ -326,7 +326,7 @@ namespace LuaMap { "IsArena", nullptr, METHOD_REG_NONE }, { "IsHeroic", nullptr, METHOD_REG_NONE }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/ObjectMethods.h b/methods/VMangos/ObjectMethods.h index 6dd0f54c2b..f390b49a79 100644 --- a/methods/VMangos/ObjectMethods.h +++ b/methods/VMangos/ObjectMethods.h @@ -492,7 +492,7 @@ namespace LuaObject { "ToCorpse", &LuaObject::ToCorpse }, { "RemoveFlag", &LuaObject::RemoveFlag }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/PlayerMethods.h b/methods/VMangos/PlayerMethods.h index 7b0c08b9bf..c261de4898 100644 --- a/methods/VMangos/PlayerMethods.h +++ b/methods/VMangos/PlayerMethods.h @@ -4396,7 +4396,7 @@ namespace LuaPlayer { "CanCompleteRepeatableQuest", nullptr, METHOD_REG_NONE }, // not implemented { "CanRewardQuest", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/QuestMethods.h b/methods/VMangos/QuestMethods.h index a71c9f6713..007b33f4f4 100644 --- a/methods/VMangos/QuestMethods.h +++ b/methods/VMangos/QuestMethods.h @@ -206,7 +206,7 @@ namespace LuaQuest // Not implemented methods { "GetMaxLevel", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/SpellMethods.h b/methods/VMangos/SpellMethods.h index c709ebfa29..e85846c79c 100644 --- a/methods/VMangos/SpellMethods.h +++ b/methods/VMangos/SpellMethods.h @@ -212,7 +212,7 @@ namespace LuaSpell { "Cast", &LuaSpell::Cast }, { "Finish", &LuaSpell::Finish }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/UnitMethods.h b/methods/VMangos/UnitMethods.h index 1c30786d05..6ee3cf2490 100644 --- a/methods/VMangos/UnitMethods.h +++ b/methods/VMangos/UnitMethods.h @@ -3160,7 +3160,7 @@ namespace LuaUnit { "SummonGuardian", nullptr, METHOD_REG_NONE }, // not implemented { "SetImmuneTo", nullptr, METHOD_REG_NONE }, // not implemented - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/VehicleMethods.h b/methods/VMangos/VehicleMethods.h index 55870b283f..5c6015a76a 100644 --- a/methods/VMangos/VehicleMethods.h +++ b/methods/VMangos/VehicleMethods.h @@ -119,7 +119,7 @@ namespace LuaVehicle { "AddPassenger", &LuaVehicle::AddPassenger }, { "RemovePassenger", &LuaVehicle::RemovePassenger }, - { NULL, NULL } + { nullptr, METHOD_REG_NONE } }; } diff --git a/methods/VMangos/WorldObjectMethods.h b/methods/VMangos/WorldObjectMethods.h index 2a503a6d3f..bdebc05c01 100644 --- a/methods/VMangos/WorldObjectMethods.h +++ b/methods/VMangos/WorldObjectMethods.h @@ -1225,7 +1225,7 @@ namespace LuaWorldObject { "PlayDirectSound", &LuaWorldObject::PlayDirectSound }, { "PlayDistanceSound", &LuaWorldObject::PlayDistanceSound }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/WorldPacketMethods.h b/methods/VMangos/WorldPacketMethods.h index 50b2e4a9f7..b609a77904 100644 --- a/methods/VMangos/WorldPacketMethods.h +++ b/methods/VMangos/WorldPacketMethods.h @@ -339,7 +339,7 @@ namespace LuaPacket { "WriteFloat", &LuaPacket::WriteFloat }, { "WriteDouble", &LuaPacket::WriteDouble }, - { NULL, NULL, METHOD_REG_NONE } + { nullptr, METHOD_REG_NONE } }; };