From 509f6ac2bff0343cf5a31c8082672a9650773f38 Mon Sep 17 00:00:00 2001 From: Foereaper Date: Tue, 6 Aug 2024 16:44:30 +0200 Subject: [PATCH] Replace method table loop and remove empty end of array entries --- ElunaTemplate.h | 22 ++++++++++++---------- methods/CMangos/AuraMethods.h | 4 +--- methods/CMangos/BattleGroundMethods.h | 4 +--- methods/CMangos/CorpseMethods.h | 4 +--- methods/CMangos/CreatureMethods.h | 4 +--- methods/CMangos/ElunaQueryMethods.h | 4 +--- methods/CMangos/GameObjectMethods.h | 4 +--- methods/CMangos/GlobalMethods.h | 4 +--- methods/CMangos/GroupMethods.h | 4 +--- methods/CMangos/GuildMethods.h | 4 +--- methods/CMangos/ItemMethods.h | 4 +--- methods/CMangos/MapMethods.h | 4 +--- methods/CMangos/ObjectMethods.h | 4 +--- methods/CMangos/PlayerMethods.h | 4 +--- methods/CMangos/QuestMethods.h | 4 +--- methods/CMangos/SpellMethods.h | 4 +--- methods/CMangos/UnitMethods.h | 4 +--- methods/CMangos/VehicleMethods.h | 4 +--- methods/CMangos/WorldObjectMethods.h | 4 +--- methods/CMangos/WorldPacketMethods.h | 4 +--- methods/Mangos/AuraMethods.h | 4 +--- methods/Mangos/BattleGroundMethods.h | 4 +--- methods/Mangos/CorpseMethods.h | 4 +--- methods/Mangos/CreatureMethods.h | 4 +--- methods/Mangos/ElunaQueryMethods.h | 4 +--- methods/Mangos/GameObjectMethods.h | 4 +--- methods/Mangos/GlobalMethods.h | 4 +--- methods/Mangos/GroupMethods.h | 4 +--- methods/Mangos/GuildMethods.h | 4 +--- methods/Mangos/ItemMethods.h | 4 +--- methods/Mangos/MapMethods.h | 4 +--- methods/Mangos/ObjectMethods.h | 4 +--- methods/Mangos/PlayerMethods.h | 4 +--- methods/Mangos/QuestMethods.h | 4 +--- methods/Mangos/SpellMethods.h | 4 +--- methods/Mangos/UnitMethods.h | 4 +--- methods/Mangos/VehicleMethods.h | 4 +--- methods/Mangos/WorldObjectMethods.h | 4 +--- methods/Mangos/WorldPacketMethods.h | 4 +--- methods/TrinityCore/AuraMethods.h | 4 +--- methods/TrinityCore/BattleGroundMethods.h | 4 +--- methods/TrinityCore/CorpseMethods.h | 4 +--- methods/TrinityCore/CreatureMethods.h | 4 +--- methods/TrinityCore/ElunaQueryMethods.h | 4 +--- methods/TrinityCore/GameObjectMethods.h | 4 +--- methods/TrinityCore/GlobalMethods.h | 4 +--- methods/TrinityCore/GroupMethods.h | 4 +--- methods/TrinityCore/GuildMethods.h | 4 +--- methods/TrinityCore/ItemMethods.h | 4 +--- methods/TrinityCore/MapMethods.h | 4 +--- methods/TrinityCore/ObjectMethods.h | 4 +--- methods/TrinityCore/PlayerMethods.h | 4 +--- methods/TrinityCore/QuestMethods.h | 4 +--- methods/TrinityCore/SpellMethods.h | 4 +--- methods/TrinityCore/UnitMethods.h | 4 +--- methods/TrinityCore/VehicleMethods.h | 4 +--- methods/TrinityCore/WorldObjectMethods.h | 4 +--- methods/TrinityCore/WorldPacketMethods.h | 4 +--- methods/VMangos/AuraMethods.h | 4 +--- methods/VMangos/BattleGroundMethods.h | 4 +--- methods/VMangos/CorpseMethods.h | 4 +--- methods/VMangos/CreatureMethods.h | 4 +--- methods/VMangos/ElunaQueryMethods.h | 4 +--- methods/VMangos/GameObjectMethods.h | 4 +--- methods/VMangos/GlobalMethods.h | 4 +--- methods/VMangos/GroupMethods.h | 6 ++---- methods/VMangos/GuildMethods.h | 4 +--- methods/VMangos/ItemMethods.h | 4 +--- methods/VMangos/MapMethods.h | 4 +--- methods/VMangos/ObjectMethods.h | 4 +--- methods/VMangos/PlayerMethods.h | 4 +--- methods/VMangos/QuestMethods.h | 4 +--- methods/VMangos/SpellMethods.h | 4 +--- methods/VMangos/UnitMethods.h | 4 +--- methods/VMangos/VehicleMethods.h | 4 +--- methods/VMangos/WorldObjectMethods.h | 4 +--- methods/VMangos/WorldPacketMethods.h | 4 +--- 77 files changed, 89 insertions(+), 239 deletions(-) diff --git a/ElunaTemplate.h b/ElunaTemplate.h index 0eb0d1fd67..7d49dfc387 100644 --- a/ElunaTemplate.h +++ b/ElunaTemplate.h @@ -168,7 +168,7 @@ struct ElunaRegister : name(name), mfunc(func), regState(state) {} // constructor for nullptr functions and METHOD_REG_NONE (unimplemented methods) - ElunaRegister(const char* name = nullptr, MethodRegisterState state = METHOD_REG_NONE) + ElunaRegister(const char* name, MethodRegisterState state = METHOD_REG_NONE) : name(name), mfunc(nullptr), regState(state) {} }; @@ -277,8 +277,8 @@ class ElunaTemplate lua_pop(E->L, 1); } - template - static void SetMethods(Eluna* E, ElunaRegister* methodTable) + template + static void SetMethods(Eluna* E, ElunaRegister const (&methodTable)[N]) { ASSERT(E); ASSERT(methodTable); @@ -301,13 +301,15 @@ class ElunaTemplate } // load all core-specific methods - for (; methodTable && methodTable->name; ++methodTable) + for (int i = 0; i < N; i++) { + const auto& method = methodTable + i; + // push the method name to the Lua stack - lua_pushstring(E->L, methodTable->name); + lua_pushstring(E->L, method->name); // if the method should not be registered, push a closure to error output function - if (methodTable->regState == METHOD_REG_NONE) + if (method->regState == METHOD_REG_NONE) { lua_pushcclosure(E->L, MethodUnimpl, 0); lua_rawset(E->L, -3); @@ -315,11 +317,11 @@ class ElunaTemplate } // if we're in multistate mode, we need to check whether a method is flagged as a world or a map specific method - if (!E->GetCompatibilityMode() && methodTable->regState != METHOD_REG_ALL) + if (!E->GetCompatibilityMode() && method->regState != METHOD_REG_ALL) { // if the method should not be registered, push a closure to error output function - if ((E->GetBoundMapId() == -1 && methodTable->regState == METHOD_REG_MAP) || - (E->GetBoundMapId() != -1 && methodTable->regState == METHOD_REG_WORLD)) + if ((E->GetBoundMapId() == -1 && method->regState == METHOD_REG_MAP) || + (E->GetBoundMapId() != -1 && method->regState == METHOD_REG_WORLD)) { lua_pushcclosure(E->L, MethodWrongState, 0); lua_rawset(E->L, -3); @@ -328,7 +330,7 @@ class ElunaTemplate } // push method table and Eluna object pointers as light user data - lua_pushlightuserdata(E->L, (void*)methodTable); + lua_pushlightuserdata(E->L, (void*)method); lua_pushlightuserdata(E->L, (void*)E); // push a closure to the thunk function with 2 upvalues (method table and Eluna object) diff --git a/methods/CMangos/AuraMethods.h b/methods/CMangos/AuraMethods.h index 9831732a77..c7ab629a29 100644 --- a/methods/CMangos/AuraMethods.h +++ b/methods/CMangos/AuraMethods.h @@ -198,9 +198,7 @@ namespace LuaAura { "SetStackAmount", &LuaAura::SetStackAmount }, // Other - { "Remove", &LuaAura::Remove }, - - { nullptr, METHOD_REG_NONE } + { "Remove", &LuaAura::Remove } }; }; #endif diff --git a/methods/CMangos/BattleGroundMethods.h b/methods/CMangos/BattleGroundMethods.h index 425a5b5919..42920985d3 100644 --- a/methods/CMangos/BattleGroundMethods.h +++ b/methods/CMangos/BattleGroundMethods.h @@ -245,9 +245,7 @@ namespace LuaBattleGround { "GetMaxPlayersPerTeam", &LuaBattleGround::GetMaxPlayersPerTeam }, { "GetMinPlayersPerTeam", &LuaBattleGround::GetMinPlayersPerTeam }, { "GetWinner", &LuaBattleGround::GetWinner }, - { "GetStatus", &LuaBattleGround::GetStatus }, - - { nullptr, METHOD_REG_NONE } + { "GetStatus", &LuaBattleGround::GetStatus } }; }; #endif diff --git a/methods/CMangos/CorpseMethods.h b/methods/CMangos/CorpseMethods.h index 61b86a93df..e263d04a0b 100644 --- a/methods/CMangos/CorpseMethods.h +++ b/methods/CMangos/CorpseMethods.h @@ -83,9 +83,7 @@ namespace LuaCorpse // Other { "ResetGhostTime", &LuaCorpse::ResetGhostTime }, - { "SaveToDB", &LuaCorpse::SaveToDB }, - - { nullptr, METHOD_REG_NONE } + { "SaveToDB", &LuaCorpse::SaveToDB } }; }; #endif diff --git a/methods/CMangos/CreatureMethods.h b/methods/CMangos/CreatureMethods.h index 46fbddcdfd..f96db232e5 100644 --- a/methods/CMangos/CreatureMethods.h +++ b/methods/CMangos/CreatureMethods.h @@ -1308,9 +1308,7 @@ namespace LuaCreature { "ClearThreat", METHOD_REG_NONE }, // TC/Acore { "ResetAllThreat", METHOD_REG_NONE }, // TC/Acore { "FixateTarget", METHOD_REG_NONE }, // TC/Acore - { "ClearFixate", METHOD_REG_NONE }, // TC/Acore - - { nullptr, METHOD_REG_NONE } + { "ClearFixate", METHOD_REG_NONE } // TC/Acore }; }; #endif diff --git a/methods/CMangos/ElunaQueryMethods.h b/methods/CMangos/ElunaQueryMethods.h index c3daad11a3..cdf30a43bb 100644 --- a/methods/CMangos/ElunaQueryMethods.h +++ b/methods/CMangos/ElunaQueryMethods.h @@ -333,9 +333,7 @@ namespace LuaQuery // Boolean { "NextRow", &LuaQuery::NextRow }, - { "IsNull", &LuaQuery::IsNull }, - - { nullptr, METHOD_REG_NONE } + { "IsNull", &LuaQuery::IsNull } }; }; #undef RESULT diff --git a/methods/CMangos/GameObjectMethods.h b/methods/CMangos/GameObjectMethods.h index 1d813e0af3..63e279d8f7 100644 --- a/methods/CMangos/GameObjectMethods.h +++ b/methods/CMangos/GameObjectMethods.h @@ -332,9 +332,7 @@ namespace LuaGameObject { "SaveToDB", &LuaGameObject::SaveToDB }, // Not implemented methods - { "IsDestructible", METHOD_REG_NONE }, // Not implemented - - { nullptr, METHOD_REG_NONE } + { "IsDestructible", METHOD_REG_NONE } // Not implemented }; }; #endif diff --git a/methods/CMangos/GlobalMethods.h b/methods/CMangos/GlobalMethods.h index 86d88c8d93..10785a1fb9 100644 --- a/methods/CMangos/GlobalMethods.h +++ b/methods/CMangos/GlobalMethods.h @@ -3295,9 +3295,7 @@ namespace LuaGlobalFunctions { "CreateInt64", &LuaGlobalFunctions::CreateLongLong }, { "CreateUint64", &LuaGlobalFunctions::CreateULongLong }, { "StartGameEvent", &LuaGlobalFunctions::StartGameEvent }, - { "StopGameEvent", &LuaGlobalFunctions::StopGameEvent }, - - { nullptr, METHOD_REG_NONE } + { "StopGameEvent", &LuaGlobalFunctions::StopGameEvent } }; } #endif diff --git a/methods/CMangos/GroupMethods.h b/methods/CMangos/GroupMethods.h index 3bb6ab50f3..088cf6ca92 100644 --- a/methods/CMangos/GroupMethods.h +++ b/methods/CMangos/GroupMethods.h @@ -416,9 +416,7 @@ namespace LuaGroup { "IsBFGroup", METHOD_REG_NONE }, // not implemented { "ConvertToLFG", METHOD_REG_NONE }, // not implemented { "GetMemberFlags", METHOD_REG_NONE }, // not implemented - { "SetMemberFlag", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "SetMemberFlag", METHOD_REG_NONE } // not implemented }; }; diff --git a/methods/CMangos/GuildMethods.h b/methods/CMangos/GuildMethods.h index fbfe804582..757ae5ca26 100644 --- a/methods/CMangos/GuildMethods.h +++ b/methods/CMangos/GuildMethods.h @@ -269,9 +269,7 @@ namespace LuaGuild { "SendPacketToRanked", &LuaGuild::SendPacketToRanked }, { "Disband", &LuaGuild::Disband, METHOD_REG_WORLD }, // World state method only in multistate { "AddMember", &LuaGuild::AddMember, METHOD_REG_WORLD }, // World state method only in multistate - { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD }, // World state method only in multistate - - { nullptr, METHOD_REG_NONE } + { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD } // World state method only in multistate }; }; #endif diff --git a/methods/CMangos/ItemMethods.h b/methods/CMangos/ItemMethods.h index 9bc61c2c05..1f771ac066 100644 --- a/methods/CMangos/ItemMethods.h +++ b/methods/CMangos/ItemMethods.h @@ -858,9 +858,7 @@ namespace LuaItem { "SaveToDB", &LuaItem::SaveToDB }, // Not implemented methods - { "IsRefundExpired", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "IsRefundExpired", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/CMangos/MapMethods.h b/methods/CMangos/MapMethods.h index 7504732783..1ab68e7a5a 100644 --- a/methods/CMangos/MapMethods.h +++ b/methods/CMangos/MapMethods.h @@ -363,9 +363,7 @@ namespace LuaMap // Other { "SaveInstanceData", &LuaMap::SaveInstanceData }, - { "Data", &LuaMap::Data }, - - { nullptr, METHOD_REG_NONE } + { "Data", &LuaMap::Data } }; }; #endif diff --git a/methods/CMangos/ObjectMethods.h b/methods/CMangos/ObjectMethods.h index 9996c45d52..b758d79825 100644 --- a/methods/CMangos/ObjectMethods.h +++ b/methods/CMangos/ObjectMethods.h @@ -490,9 +490,7 @@ namespace LuaObject { "ToCreature", &LuaObject::ToCreature }, { "ToPlayer", &LuaObject::ToPlayer }, { "ToCorpse", &LuaObject::ToCorpse }, - { "RemoveFlag", &LuaObject::RemoveFlag }, - - { nullptr, METHOD_REG_NONE } + { "RemoveFlag", &LuaObject::RemoveFlag } }; }; #endif diff --git a/methods/CMangos/PlayerMethods.h b/methods/CMangos/PlayerMethods.h index c964439070..602c424837 100644 --- a/methods/CMangos/PlayerMethods.h +++ b/methods/CMangos/PlayerMethods.h @@ -4059,9 +4059,7 @@ namespace LuaPlayer { "ResetHonor", METHOD_REG_NONE }, // classic only { "ClearHonorInfo", METHOD_REG_NONE }, // classic only { "GetXP", METHOD_REG_NONE }, // not implemented - { "GetXPForNextLevel", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "GetXPForNextLevel", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/CMangos/QuestMethods.h b/methods/CMangos/QuestMethods.h index 929484b40b..8977e2f64d 100644 --- a/methods/CMangos/QuestMethods.h +++ b/methods/CMangos/QuestMethods.h @@ -193,9 +193,7 @@ namespace LuaQuest { "IsRepeatable", &LuaQuest::IsRepeatable }, // Not implemented methods - { "GetMaxLevel", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "GetMaxLevel", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/CMangos/SpellMethods.h b/methods/CMangos/SpellMethods.h index 628de33d12..0f3e09a79c 100644 --- a/methods/CMangos/SpellMethods.h +++ b/methods/CMangos/SpellMethods.h @@ -186,9 +186,7 @@ namespace LuaSpell // Other { "Cancel", &LuaSpell::Cancel }, { "Cast", &LuaSpell::Cast }, - { "Finish", &LuaSpell::Finish }, - - { nullptr, METHOD_REG_NONE } + { "Finish", &LuaSpell::Finish } }; }; #endif diff --git a/methods/CMangos/UnitMethods.h b/methods/CMangos/UnitMethods.h index d0445dc9f9..68cab3fa85 100644 --- a/methods/CMangos/UnitMethods.h +++ b/methods/CMangos/UnitMethods.h @@ -2609,9 +2609,7 @@ namespace LuaUnit { "RemoveBindSightAuras", METHOD_REG_NONE }, // not implemented { "RemoveCharmAuras", METHOD_REG_NONE }, // not implemented { "DisableMelee", METHOD_REG_NONE }, // not implemented - { "SummonGuardian", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "SummonGuardian", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/CMangos/VehicleMethods.h b/methods/CMangos/VehicleMethods.h index 56e3f17c48..a615051400 100644 --- a/methods/CMangos/VehicleMethods.h +++ b/methods/CMangos/VehicleMethods.h @@ -104,9 +104,7 @@ namespace LuaVehicle // Other { "AddPassenger", &LuaVehicle::AddPassenger }, - { "RemovePassenger", &LuaVehicle::RemovePassenger }, - - { nullptr, METHOD_REG_NONE } + { "RemovePassenger", &LuaVehicle::RemovePassenger } }; } diff --git a/methods/CMangos/WorldObjectMethods.h b/methods/CMangos/WorldObjectMethods.h index 00f85139c2..d937dee798 100644 --- a/methods/CMangos/WorldObjectMethods.h +++ b/methods/CMangos/WorldObjectMethods.h @@ -1185,9 +1185,7 @@ namespace LuaWorldObject { "PlayMusic", &LuaWorldObject::PlayMusic }, { "PlayDirectSound", &LuaWorldObject::PlayDirectSound }, { "PlayDistanceSound", &LuaWorldObject::PlayDistanceSound }, - { "Data", &LuaWorldObject::Data }, - - { nullptr, METHOD_REG_NONE } + { "Data", &LuaWorldObject::Data } }; }; #endif diff --git a/methods/CMangos/WorldPacketMethods.h b/methods/CMangos/WorldPacketMethods.h index c7f4127eb2..3155f8a571 100644 --- a/methods/CMangos/WorldPacketMethods.h +++ b/methods/CMangos/WorldPacketMethods.h @@ -341,9 +341,7 @@ namespace LuaPacket { "WriteGUID", &LuaPacket::WriteGUID }, { "WriteString", &LuaPacket::WriteString }, { "WriteFloat", &LuaPacket::WriteFloat }, - { "WriteDouble", &LuaPacket::WriteDouble }, - - { nullptr, METHOD_REG_NONE } + { "WriteDouble", &LuaPacket::WriteDouble } }; }; diff --git a/methods/Mangos/AuraMethods.h b/methods/Mangos/AuraMethods.h index 1de9d57b48..467eb33adb 100644 --- a/methods/Mangos/AuraMethods.h +++ b/methods/Mangos/AuraMethods.h @@ -198,9 +198,7 @@ namespace LuaAura { "SetStackAmount", &LuaAura::SetStackAmount }, // Other - { "Remove", &LuaAura::Remove }, - - { nullptr, METHOD_REG_NONE } + { "Remove", &LuaAura::Remove } }; }; #endif diff --git a/methods/Mangos/BattleGroundMethods.h b/methods/Mangos/BattleGroundMethods.h index f6747157d5..5ca31c5a48 100644 --- a/methods/Mangos/BattleGroundMethods.h +++ b/methods/Mangos/BattleGroundMethods.h @@ -243,9 +243,7 @@ namespace LuaBattleGround { "GetMaxPlayersPerTeam", &LuaBattleGround::GetMaxPlayersPerTeam }, { "GetMinPlayersPerTeam", &LuaBattleGround::GetMinPlayersPerTeam }, { "GetWinner", &LuaBattleGround::GetWinner }, - { "GetStatus", &LuaBattleGround::GetStatus }, - - { nullptr, METHOD_REG_NONE } + { "GetStatus", &LuaBattleGround::GetStatus } }; }; #endif diff --git a/methods/Mangos/CorpseMethods.h b/methods/Mangos/CorpseMethods.h index 61b86a93df..e263d04a0b 100644 --- a/methods/Mangos/CorpseMethods.h +++ b/methods/Mangos/CorpseMethods.h @@ -83,9 +83,7 @@ namespace LuaCorpse // Other { "ResetGhostTime", &LuaCorpse::ResetGhostTime }, - { "SaveToDB", &LuaCorpse::SaveToDB }, - - { nullptr, METHOD_REG_NONE } + { "SaveToDB", &LuaCorpse::SaveToDB } }; }; #endif diff --git a/methods/Mangos/CreatureMethods.h b/methods/Mangos/CreatureMethods.h index 0b7b3aa884..16c122d75f 100644 --- a/methods/Mangos/CreatureMethods.h +++ b/methods/Mangos/CreatureMethods.h @@ -1206,9 +1206,7 @@ namespace LuaCreature { "ResetLootMode", METHOD_REG_NONE }, // not implemented { "RemoveLootMode", METHOD_REG_NONE }, // not implemented { "RemoveFromWorld", METHOD_REG_NONE }, // not implemented - { "GetRank", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "GetRank", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/Mangos/ElunaQueryMethods.h b/methods/Mangos/ElunaQueryMethods.h index 67e5c5802a..835e521a6c 100644 --- a/methods/Mangos/ElunaQueryMethods.h +++ b/methods/Mangos/ElunaQueryMethods.h @@ -335,9 +335,7 @@ namespace LuaQuery // Boolean { "NextRow", &LuaQuery::NextRow }, - { "IsNull", &LuaQuery::IsNull }, - - { nullptr, METHOD_REG_NONE } + { "IsNull", &LuaQuery::IsNull } }; }; #undef RESULT diff --git a/methods/Mangos/GameObjectMethods.h b/methods/Mangos/GameObjectMethods.h index 4c6396f19a..4d8f430635 100644 --- a/methods/Mangos/GameObjectMethods.h +++ b/methods/Mangos/GameObjectMethods.h @@ -337,9 +337,7 @@ namespace LuaGameObject { "SaveToDB", &LuaGameObject::SaveToDB }, // Not implemented methods - { "IsDestructible", METHOD_REG_NONE }, // Not implemented - - { nullptr, METHOD_REG_NONE } + { "IsDestructible", METHOD_REG_NONE } // Not implemented }; }; #endif diff --git a/methods/Mangos/GlobalMethods.h b/methods/Mangos/GlobalMethods.h index 5040219888..61b5e52501 100644 --- a/methods/Mangos/GlobalMethods.h +++ b/methods/Mangos/GlobalMethods.h @@ -3039,9 +3039,7 @@ namespace LuaGlobalFunctions // unimplemented { "WorldDBQueryAsync", METHOD_REG_NONE }, { "CharDBQueryAsync", METHOD_REG_NONE }, - { "AuthDBQueryAsync", METHOD_REG_NONE }, - - { nullptr, METHOD_REG_NONE } + { "AuthDBQueryAsync", METHOD_REG_NONE } }; } #endif diff --git a/methods/Mangos/GroupMethods.h b/methods/Mangos/GroupMethods.h index 7b56708629..9b9037fe19 100644 --- a/methods/Mangos/GroupMethods.h +++ b/methods/Mangos/GroupMethods.h @@ -411,9 +411,7 @@ namespace LuaGroup { "IsBFGroup", METHOD_REG_NONE }, // not implemented { "ConvertToLFG", METHOD_REG_NONE }, // not implemented { "GetMemberFlags", METHOD_REG_NONE }, // not implemented - { "SetMemberFlag", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "SetMemberFlag", METHOD_REG_NONE } // not implemented }; }; diff --git a/methods/Mangos/GuildMethods.h b/methods/Mangos/GuildMethods.h index 7203931ddc..84cd1f60a9 100644 --- a/methods/Mangos/GuildMethods.h +++ b/methods/Mangos/GuildMethods.h @@ -259,9 +259,7 @@ namespace LuaGuild { "SendPacketToRanked", &LuaGuild::SendPacketToRanked }, { "Disband", &LuaGuild::Disband, METHOD_REG_WORLD }, // World state method only in multistate { "AddMember", &LuaGuild::AddMember, METHOD_REG_WORLD }, // World state method only in multistate - { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD }, // World state method only in multistate - - { nullptr, METHOD_REG_NONE } + { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD } // World state method only in multistate }; }; #endif diff --git a/methods/Mangos/ItemMethods.h b/methods/Mangos/ItemMethods.h index 50deb635a2..14ed2fa581 100644 --- a/methods/Mangos/ItemMethods.h +++ b/methods/Mangos/ItemMethods.h @@ -867,9 +867,7 @@ namespace LuaItem { "SaveToDB", &LuaItem::SaveToDB }, // Not implemented methods - { "IsRefundExpired", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "IsRefundExpired", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/Mangos/MapMethods.h b/methods/Mangos/MapMethods.h index 33e2ecce06..5bef07e290 100644 --- a/methods/Mangos/MapMethods.h +++ b/methods/Mangos/MapMethods.h @@ -364,9 +364,7 @@ namespace LuaMap #endif // Other { "SaveInstanceData", &LuaMap::SaveInstanceData }, - { "Data", &LuaMap::Data }, - - { nullptr, METHOD_REG_NONE } + { "Data", &LuaMap::Data } }; }; #endif diff --git a/methods/Mangos/ObjectMethods.h b/methods/Mangos/ObjectMethods.h index 9996c45d52..b758d79825 100644 --- a/methods/Mangos/ObjectMethods.h +++ b/methods/Mangos/ObjectMethods.h @@ -490,9 +490,7 @@ namespace LuaObject { "ToCreature", &LuaObject::ToCreature }, { "ToPlayer", &LuaObject::ToPlayer }, { "ToCorpse", &LuaObject::ToCorpse }, - { "RemoveFlag", &LuaObject::RemoveFlag }, - - { nullptr, METHOD_REG_NONE } + { "RemoveFlag", &LuaObject::RemoveFlag } }; }; #endif diff --git a/methods/Mangos/PlayerMethods.h b/methods/Mangos/PlayerMethods.h index bd16089691..09a12f9499 100644 --- a/methods/Mangos/PlayerMethods.h +++ b/methods/Mangos/PlayerMethods.h @@ -3976,9 +3976,7 @@ namespace LuaPlayer { "GetXP", METHOD_REG_NONE }, // not implemented { "GetXPForNextLevel", METHOD_REG_NONE }, // not implemented { "CanCompleteRepeatableQuest", METHOD_REG_NONE }, // not implemented - { "CanRewardQuest", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "CanRewardQuest", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/Mangos/QuestMethods.h b/methods/Mangos/QuestMethods.h index 1a10c85c07..d257a8c081 100644 --- a/methods/Mangos/QuestMethods.h +++ b/methods/Mangos/QuestMethods.h @@ -193,9 +193,7 @@ namespace LuaQuest #endif // Not implemented methods - { "GetMaxLevel", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "GetMaxLevel", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/Mangos/SpellMethods.h b/methods/Mangos/SpellMethods.h index ce3a4d9dfd..e6f9809c6f 100644 --- a/methods/Mangos/SpellMethods.h +++ b/methods/Mangos/SpellMethods.h @@ -188,9 +188,7 @@ namespace LuaSpell // Other { "Cancel", &LuaSpell::Cancel }, { "Cast", &LuaSpell::Cast }, - { "Finish", &LuaSpell::Finish }, - - { nullptr, METHOD_REG_NONE } + { "Finish", &LuaSpell::Finish } }; }; #endif diff --git a/methods/Mangos/UnitMethods.h b/methods/Mangos/UnitMethods.h index a62959f3f6..5e2cb18a3c 100644 --- a/methods/Mangos/UnitMethods.h +++ b/methods/Mangos/UnitMethods.h @@ -2616,9 +2616,7 @@ namespace LuaUnit { "RemoveCharmAuras", METHOD_REG_NONE }, // not implemented { "DisableMelee", METHOD_REG_NONE }, // not implemented { "SummonGuardian", METHOD_REG_NONE }, // not implemented - { "SetImmuneTo", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "SetImmuneTo", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/Mangos/VehicleMethods.h b/methods/Mangos/VehicleMethods.h index e74278083c..93356fc2ea 100644 --- a/methods/Mangos/VehicleMethods.h +++ b/methods/Mangos/VehicleMethods.h @@ -105,9 +105,7 @@ namespace LuaVehicle // Other { "AddPassenger", &LuaVehicle::AddPassenger }, - { "RemovePassenger", &LuaVehicle::RemovePassenger }, - - { nullptr, METHOD_REG_NONE } + { "RemovePassenger", &LuaVehicle::RemovePassenger } }; } diff --git a/methods/Mangos/WorldObjectMethods.h b/methods/Mangos/WorldObjectMethods.h index 782ede857d..b3a4987318 100644 --- a/methods/Mangos/WorldObjectMethods.h +++ b/methods/Mangos/WorldObjectMethods.h @@ -1183,9 +1183,7 @@ namespace LuaWorldObject { "PlayMusic", &LuaWorldObject::PlayMusic }, { "PlayDirectSound", &LuaWorldObject::PlayDirectSound }, { "PlayDistanceSound", &LuaWorldObject::PlayDistanceSound }, - { "Data", &LuaWorldObject::Data }, - - { nullptr, METHOD_REG_NONE } + { "Data", &LuaWorldObject::Data } }; }; #endif diff --git a/methods/Mangos/WorldPacketMethods.h b/methods/Mangos/WorldPacketMethods.h index 755576ad28..52b1a223fe 100644 --- a/methods/Mangos/WorldPacketMethods.h +++ b/methods/Mangos/WorldPacketMethods.h @@ -338,9 +338,7 @@ namespace LuaPacket { "WriteGUID", &LuaPacket::WriteGUID }, { "WriteString", &LuaPacket::WriteString }, { "WriteFloat", &LuaPacket::WriteFloat }, - { "WriteDouble", &LuaPacket::WriteDouble }, - - { nullptr, METHOD_REG_NONE } + { "WriteDouble", &LuaPacket::WriteDouble } }; }; diff --git a/methods/TrinityCore/AuraMethods.h b/methods/TrinityCore/AuraMethods.h index cd1468c10c..b60a1d9f69 100644 --- a/methods/TrinityCore/AuraMethods.h +++ b/methods/TrinityCore/AuraMethods.h @@ -186,9 +186,7 @@ namespace LuaAura { "SetStackAmount", &LuaAura::SetStackAmount }, // Other - { "Remove", &LuaAura::Remove }, - - { nullptr, METHOD_REG_NONE } + { "Remove", &LuaAura::Remove } }; }; #endif diff --git a/methods/TrinityCore/BattleGroundMethods.h b/methods/TrinityCore/BattleGroundMethods.h index 517acf2c3f..c2de74d00f 100644 --- a/methods/TrinityCore/BattleGroundMethods.h +++ b/methods/TrinityCore/BattleGroundMethods.h @@ -241,9 +241,7 @@ namespace LuaBattleGround { "GetMaxPlayersPerTeam", &LuaBattleGround::GetMaxPlayersPerTeam }, { "GetMinPlayersPerTeam", &LuaBattleGround::GetMinPlayersPerTeam }, { "GetWinner", &LuaBattleGround::GetWinner }, - { "GetStatus", &LuaBattleGround::GetStatus }, - - { nullptr, METHOD_REG_NONE } + { "GetStatus", &LuaBattleGround::GetStatus } }; }; #endif diff --git a/methods/TrinityCore/CorpseMethods.h b/methods/TrinityCore/CorpseMethods.h index 16f55b492a..d55b5b7e6b 100644 --- a/methods/TrinityCore/CorpseMethods.h +++ b/methods/TrinityCore/CorpseMethods.h @@ -83,9 +83,7 @@ namespace LuaCorpse // Other { "ResetGhostTime", &LuaCorpse::ResetGhostTime }, - { "SaveToDB", &LuaCorpse::SaveToDB }, - - { nullptr, METHOD_REG_NONE } + { "SaveToDB", &LuaCorpse::SaveToDB } }; }; #endif diff --git a/methods/TrinityCore/CreatureMethods.h b/methods/TrinityCore/CreatureMethods.h index 81d0dd81ce..004601e1fc 100644 --- a/methods/TrinityCore/CreatureMethods.h +++ b/methods/TrinityCore/CreatureMethods.h @@ -1509,9 +1509,7 @@ namespace LuaCreature { "ResetAllThreat", &LuaCreature::ResetAllThreat }, { "FixateTarget", &LuaCreature::FixateTarget }, { "ClearFixate", &LuaCreature::ClearFixate }, - { "RemoveFromWorld", &LuaCreature::RemoveFromWorld }, - - { nullptr, METHOD_REG_NONE } + { "RemoveFromWorld", &LuaCreature::RemoveFromWorld } }; }; #endif diff --git a/methods/TrinityCore/ElunaQueryMethods.h b/methods/TrinityCore/ElunaQueryMethods.h index 6248543312..f27ceb3af7 100644 --- a/methods/TrinityCore/ElunaQueryMethods.h +++ b/methods/TrinityCore/ElunaQueryMethods.h @@ -350,9 +350,7 @@ namespace LuaQuery // Boolean { "NextRow", &LuaQuery::NextRow }, - { "IsNull", &LuaQuery::IsNull }, - - { nullptr, METHOD_REG_NONE } + { "IsNull", &LuaQuery::IsNull } }; }; #undef RESULT diff --git a/methods/TrinityCore/GameObjectMethods.h b/methods/TrinityCore/GameObjectMethods.h index 6ec3f2412f..ceb1313deb 100644 --- a/methods/TrinityCore/GameObjectMethods.h +++ b/methods/TrinityCore/GameObjectMethods.h @@ -337,9 +337,7 @@ namespace LuaGameObject { "UseDoorOrButton", &LuaGameObject::UseDoorOrButton }, { "Despawn", &LuaGameObject::Despawn }, { "Respawn", &LuaGameObject::Respawn }, - { "SaveToDB", &LuaGameObject::SaveToDB }, - - { nullptr, METHOD_REG_NONE } + { "SaveToDB", &LuaGameObject::SaveToDB } }; }; #endif diff --git a/methods/TrinityCore/GlobalMethods.h b/methods/TrinityCore/GlobalMethods.h index dd36d288f8..73a315eefe 100644 --- a/methods/TrinityCore/GlobalMethods.h +++ b/methods/TrinityCore/GlobalMethods.h @@ -3224,9 +3224,7 @@ namespace LuaGlobalFunctions { "CreateInt64", &LuaGlobalFunctions::CreateLongLong }, { "CreateUint64", &LuaGlobalFunctions::CreateULongLong }, { "StartGameEvent", &LuaGlobalFunctions::StartGameEvent }, - { "StopGameEvent", &LuaGlobalFunctions::StopGameEvent }, - - { nullptr, METHOD_REG_NONE } + { "StopGameEvent", &LuaGlobalFunctions::StopGameEvent } }; } #endif diff --git a/methods/TrinityCore/GroupMethods.h b/methods/TrinityCore/GroupMethods.h index 1f1a756c78..0e7bd9a6d6 100644 --- a/methods/TrinityCore/GroupMethods.h +++ b/methods/TrinityCore/GroupMethods.h @@ -485,9 +485,7 @@ namespace LuaGroup // Other { "SendPacket", &LuaGroup::SendPacket }, { "ConvertToLFG", &LuaGroup::ConvertToLFG, METHOD_REG_WORLD }, // World state method only in multistate - { "ConvertToRaid", &LuaGroup::ConvertToRaid, METHOD_REG_WORLD }, // World state method only in multistate - - { nullptr, METHOD_REG_NONE } + { "ConvertToRaid", &LuaGroup::ConvertToRaid, METHOD_REG_WORLD } // World state method only in multistate }; }; diff --git a/methods/TrinityCore/GuildMethods.h b/methods/TrinityCore/GuildMethods.h index 65ab6397db..ef7ed1f77e 100644 --- a/methods/TrinityCore/GuildMethods.h +++ b/methods/TrinityCore/GuildMethods.h @@ -279,9 +279,7 @@ namespace LuaGuild { "SendPacketToRanked", &LuaGuild::SendPacketToRanked }, { "Disband", &LuaGuild::Disband, METHOD_REG_WORLD }, // World state method only in multistate { "AddMember", &LuaGuild::AddMember, METHOD_REG_WORLD }, // World state method only in multistate - { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD }, // World state method only in multistate - - { nullptr, METHOD_REG_NONE } + { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD } // World state method only in multistate }; }; #endif diff --git a/methods/TrinityCore/ItemMethods.h b/methods/TrinityCore/ItemMethods.h index 77a2084232..2f25630f34 100644 --- a/methods/TrinityCore/ItemMethods.h +++ b/methods/TrinityCore/ItemMethods.h @@ -840,9 +840,7 @@ namespace LuaItem { "ClearEnchantment", &LuaItem::ClearEnchantment }, // Other - { "SaveToDB", &LuaItem::SaveToDB }, - - { nullptr, METHOD_REG_NONE } + { "SaveToDB", &LuaItem::SaveToDB } }; }; #endif diff --git a/methods/TrinityCore/MapMethods.h b/methods/TrinityCore/MapMethods.h index e99ee63755..f94994a399 100644 --- a/methods/TrinityCore/MapMethods.h +++ b/methods/TrinityCore/MapMethods.h @@ -380,9 +380,7 @@ namespace LuaMap // Other { "SaveInstanceData", &LuaMap::SaveInstanceData }, - { "Data", &LuaMap::Data }, - - { nullptr, METHOD_REG_NONE } + { "Data", &LuaMap::Data } }; }; #endif diff --git a/methods/TrinityCore/ObjectMethods.h b/methods/TrinityCore/ObjectMethods.h index ef9e0b56ac..629a0e736b 100644 --- a/methods/TrinityCore/ObjectMethods.h +++ b/methods/TrinityCore/ObjectMethods.h @@ -490,9 +490,7 @@ namespace LuaObject { "ToCreature", &LuaObject::ToCreature }, { "ToPlayer", &LuaObject::ToPlayer }, { "ToCorpse", &LuaObject::ToCorpse }, - { "RemoveFlag", &LuaObject::RemoveFlag }, - - { nullptr, METHOD_REG_NONE } + { "RemoveFlag", &LuaObject::RemoveFlag } }; }; #endif diff --git a/methods/TrinityCore/PlayerMethods.h b/methods/TrinityCore/PlayerMethods.h index 8f083c8cd2..9e4cb5d5ba 100644 --- a/methods/TrinityCore/PlayerMethods.h +++ b/methods/TrinityCore/PlayerMethods.h @@ -3986,9 +3986,7 @@ namespace LuaPlayer { "UpdateHonor", METHOD_REG_NONE }, // classic only { "ResetHonor", METHOD_REG_NONE }, // classic only { "ClearHonorInfo", METHOD_REG_NONE }, // classic only - { "GainSpellComboPoints", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "GainSpellComboPoints", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/TrinityCore/QuestMethods.h b/methods/TrinityCore/QuestMethods.h index 4912cc24ac..135acc42a5 100644 --- a/methods/TrinityCore/QuestMethods.h +++ b/methods/TrinityCore/QuestMethods.h @@ -196,9 +196,7 @@ namespace LuaQuest // Boolean { "HasFlag", &LuaQuest::HasFlag }, { "IsDaily", &LuaQuest::IsDaily }, - { "IsRepeatable", &LuaQuest::IsRepeatable }, - - { nullptr, METHOD_REG_NONE } + { "IsRepeatable", &LuaQuest::IsRepeatable } }; }; #endif diff --git a/methods/TrinityCore/SpellMethods.h b/methods/TrinityCore/SpellMethods.h index 803c8ba43e..f868d88adb 100644 --- a/methods/TrinityCore/SpellMethods.h +++ b/methods/TrinityCore/SpellMethods.h @@ -190,9 +190,7 @@ namespace LuaSpell // Other { "Cancel", &LuaSpell::Cancel }, { "Cast", &LuaSpell::Cast }, - { "Finish", &LuaSpell::Finish }, - - { nullptr, METHOD_REG_NONE } + { "Finish", &LuaSpell::Finish } }; }; #endif diff --git a/methods/TrinityCore/UnitMethods.h b/methods/TrinityCore/UnitMethods.h index 0079fec7a6..379887a9d6 100644 --- a/methods/TrinityCore/UnitMethods.h +++ b/methods/TrinityCore/UnitMethods.h @@ -2719,9 +2719,7 @@ namespace LuaUnit { "DealHeal", &LuaUnit::DealHeal }, // Not implemented methods - { "SummonGuardian", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "SummonGuardian", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/TrinityCore/VehicleMethods.h b/methods/TrinityCore/VehicleMethods.h index 6353f8bdbc..7b8ab0cc62 100644 --- a/methods/TrinityCore/VehicleMethods.h +++ b/methods/TrinityCore/VehicleMethods.h @@ -101,9 +101,7 @@ namespace LuaVehicle // Other { "AddPassenger", &LuaVehicle::AddPassenger }, - { "RemovePassenger", &LuaVehicle::RemovePassenger }, - - { nullptr, METHOD_REG_NONE } + { "RemovePassenger", &LuaVehicle::RemovePassenger } }; } diff --git a/methods/TrinityCore/WorldObjectMethods.h b/methods/TrinityCore/WorldObjectMethods.h index 13c53db9ab..885dd1e447 100644 --- a/methods/TrinityCore/WorldObjectMethods.h +++ b/methods/TrinityCore/WorldObjectMethods.h @@ -1185,9 +1185,7 @@ namespace LuaWorldObject { "PlayMusic", &LuaWorldObject::PlayMusic }, { "PlayDirectSound", &LuaWorldObject::PlayDirectSound }, { "PlayDistanceSound", &LuaWorldObject::PlayDistanceSound }, - { "Data", &LuaWorldObject::Data }, - - { nullptr, METHOD_REG_NONE } + { "Data", &LuaWorldObject::Data } }; }; #endif diff --git a/methods/TrinityCore/WorldPacketMethods.h b/methods/TrinityCore/WorldPacketMethods.h index 755576ad28..52b1a223fe 100644 --- a/methods/TrinityCore/WorldPacketMethods.h +++ b/methods/TrinityCore/WorldPacketMethods.h @@ -338,9 +338,7 @@ namespace LuaPacket { "WriteGUID", &LuaPacket::WriteGUID }, { "WriteString", &LuaPacket::WriteString }, { "WriteFloat", &LuaPacket::WriteFloat }, - { "WriteDouble", &LuaPacket::WriteDouble }, - - { nullptr, METHOD_REG_NONE } + { "WriteDouble", &LuaPacket::WriteDouble } }; }; diff --git a/methods/VMangos/AuraMethods.h b/methods/VMangos/AuraMethods.h index b8efca2fa4..df2569eef9 100644 --- a/methods/VMangos/AuraMethods.h +++ b/methods/VMangos/AuraMethods.h @@ -186,9 +186,7 @@ namespace LuaAura { "SetStackAmount", &LuaAura::SetStackAmount }, // Other - { "Remove", &LuaAura::Remove }, - - { nullptr, METHOD_REG_NONE } + { "Remove", &LuaAura::Remove } }; }; #endif diff --git a/methods/VMangos/BattleGroundMethods.h b/methods/VMangos/BattleGroundMethods.h index 09dc82198f..9442fc277a 100644 --- a/methods/VMangos/BattleGroundMethods.h +++ b/methods/VMangos/BattleGroundMethods.h @@ -241,9 +241,7 @@ namespace LuaBattleGround { "GetMaxPlayersPerTeam", &LuaBattleGround::GetMaxPlayersPerTeam }, { "GetMinPlayersPerTeam", &LuaBattleGround::GetMinPlayersPerTeam }, { "GetWinner", &LuaBattleGround::GetWinner }, - { "GetStatus", &LuaBattleGround::GetStatus }, - - { nullptr, METHOD_REG_NONE } + { "GetStatus", &LuaBattleGround::GetStatus } }; }; #endif diff --git a/methods/VMangos/CorpseMethods.h b/methods/VMangos/CorpseMethods.h index 61b86a93df..e263d04a0b 100644 --- a/methods/VMangos/CorpseMethods.h +++ b/methods/VMangos/CorpseMethods.h @@ -83,9 +83,7 @@ namespace LuaCorpse // Other { "ResetGhostTime", &LuaCorpse::ResetGhostTime }, - { "SaveToDB", &LuaCorpse::SaveToDB }, - - { nullptr, METHOD_REG_NONE } + { "SaveToDB", &LuaCorpse::SaveToDB } }; }; #endif diff --git a/methods/VMangos/CreatureMethods.h b/methods/VMangos/CreatureMethods.h index c08c29851e..ee2fc6d70e 100644 --- a/methods/VMangos/CreatureMethods.h +++ b/methods/VMangos/CreatureMethods.h @@ -1214,9 +1214,7 @@ namespace LuaCreature { "AddLootMode", METHOD_REG_NONE }, // not implemented { "ResetLootMode", METHOD_REG_NONE }, // not implemented { "RemoveLootMode", METHOD_REG_NONE }, // not implemented - { "RemoveFromWorld", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "RemoveFromWorld", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/VMangos/ElunaQueryMethods.h b/methods/VMangos/ElunaQueryMethods.h index c3daad11a3..cdf30a43bb 100644 --- a/methods/VMangos/ElunaQueryMethods.h +++ b/methods/VMangos/ElunaQueryMethods.h @@ -333,9 +333,7 @@ namespace LuaQuery // Boolean { "NextRow", &LuaQuery::NextRow }, - { "IsNull", &LuaQuery::IsNull }, - - { nullptr, METHOD_REG_NONE } + { "IsNull", &LuaQuery::IsNull } }; }; #undef RESULT diff --git a/methods/VMangos/GameObjectMethods.h b/methods/VMangos/GameObjectMethods.h index 99f581d032..7c95c068d3 100644 --- a/methods/VMangos/GameObjectMethods.h +++ b/methods/VMangos/GameObjectMethods.h @@ -330,9 +330,7 @@ namespace LuaGameObject { "SaveToDB", &LuaGameObject::SaveToDB }, // Not implemented methods - { "IsDestructible", METHOD_REG_NONE }, // Not implemented - - { nullptr, METHOD_REG_NONE } + { "IsDestructible", METHOD_REG_NONE } // Not implemented }; }; #endif diff --git a/methods/VMangos/GlobalMethods.h b/methods/VMangos/GlobalMethods.h index 1420a8bc73..365e7833f9 100644 --- a/methods/VMangos/GlobalMethods.h +++ b/methods/VMangos/GlobalMethods.h @@ -2980,9 +2980,7 @@ namespace LuaGlobalFunctions { "CreateInt64", &LuaGlobalFunctions::CreateLongLong }, { "CreateUint64", &LuaGlobalFunctions::CreateULongLong }, { "StartGameEvent", &LuaGlobalFunctions::StartGameEvent }, - { "StopGameEvent", &LuaGlobalFunctions::StopGameEvent }, - - { nullptr, METHOD_REG_NONE } + { "StopGameEvent", &LuaGlobalFunctions::StopGameEvent } }; } #endif diff --git a/methods/VMangos/GroupMethods.h b/methods/VMangos/GroupMethods.h index 2c9ddd8a95..b3b6baaa66 100644 --- a/methods/VMangos/GroupMethods.h +++ b/methods/VMangos/GroupMethods.h @@ -383,13 +383,11 @@ namespace LuaGroup { "ConvertToRaid", &LuaGroup::ConvertToRaid, METHOD_REG_WORLD }, // World state method only in multistate // Not implemented methods - { "IsLFGGroup", METHOD_REG_NONE }, // not implemented + { "IsLFGGroup", METHOD_REG_NONE }, // not implemented { "IsBFGroup", METHOD_REG_NONE }, // not implemented { "ConvertToLFG", METHOD_REG_NONE }, // not implemented { "GetMemberFlags", METHOD_REG_NONE }, // not implemented - { "SetMemberFlag", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "SetMemberFlag", METHOD_REG_NONE } // not implemented }; }; diff --git a/methods/VMangos/GuildMethods.h b/methods/VMangos/GuildMethods.h index 792c951bd1..72124b1d5d 100644 --- a/methods/VMangos/GuildMethods.h +++ b/methods/VMangos/GuildMethods.h @@ -244,9 +244,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 - { "SetBankTabText", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "SetBankTabText", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/VMangos/ItemMethods.h b/methods/VMangos/ItemMethods.h index fde3a4353b..4b2b76d986 100644 --- a/methods/VMangos/ItemMethods.h +++ b/methods/VMangos/ItemMethods.h @@ -721,9 +721,7 @@ namespace LuaItem { "IsCurrencyToken", METHOD_REG_NONE }, // not implemented { "IsBoundAccountWide", METHOD_REG_NONE }, // not implemented { "IsWeaponVellum", METHOD_REG_NONE }, // not implemented - { "IsArmorVellum", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "IsArmorVellum", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/VMangos/MapMethods.h b/methods/VMangos/MapMethods.h index 78242c621b..d88a00ced3 100644 --- a/methods/VMangos/MapMethods.h +++ b/methods/VMangos/MapMethods.h @@ -324,9 +324,7 @@ namespace LuaMap { "SaveInstanceData", &LuaMap::SaveInstanceData }, { "IsArena", METHOD_REG_NONE }, - { "IsHeroic", METHOD_REG_NONE }, - - { nullptr, METHOD_REG_NONE } + { "IsHeroic", METHOD_REG_NONE } }; }; #endif diff --git a/methods/VMangos/ObjectMethods.h b/methods/VMangos/ObjectMethods.h index f390b49a79..0c66249232 100644 --- a/methods/VMangos/ObjectMethods.h +++ b/methods/VMangos/ObjectMethods.h @@ -490,9 +490,7 @@ namespace LuaObject { "ToCreature", &LuaObject::ToCreature }, { "ToPlayer", &LuaObject::ToPlayer }, { "ToCorpse", &LuaObject::ToCorpse }, - { "RemoveFlag", &LuaObject::RemoveFlag }, - - { nullptr, METHOD_REG_NONE } + { "RemoveFlag", &LuaObject::RemoveFlag } }; }; #endif diff --git a/methods/VMangos/PlayerMethods.h b/methods/VMangos/PlayerMethods.h index dcd7622a8b..98fab50fac 100644 --- a/methods/VMangos/PlayerMethods.h +++ b/methods/VMangos/PlayerMethods.h @@ -4394,9 +4394,7 @@ namespace LuaPlayer { "GetXP", METHOD_REG_NONE }, // not implemented { "GetXPForNextLevel", METHOD_REG_NONE }, // not implemented { "CanCompleteRepeatableQuest", METHOD_REG_NONE }, // not implemented - { "CanRewardQuest", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "CanRewardQuest", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/VMangos/QuestMethods.h b/methods/VMangos/QuestMethods.h index e73445c57e..c55d9d9afe 100644 --- a/methods/VMangos/QuestMethods.h +++ b/methods/VMangos/QuestMethods.h @@ -204,9 +204,7 @@ namespace LuaQuest #endif // Not implemented methods - { "GetMaxLevel", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "GetMaxLevel", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/VMangos/SpellMethods.h b/methods/VMangos/SpellMethods.h index e85846c79c..1178816103 100644 --- a/methods/VMangos/SpellMethods.h +++ b/methods/VMangos/SpellMethods.h @@ -210,9 +210,7 @@ namespace LuaSpell // Other { "Cancel", &LuaSpell::Cancel }, { "Cast", &LuaSpell::Cast }, - { "Finish", &LuaSpell::Finish }, - - { nullptr, METHOD_REG_NONE } + { "Finish", &LuaSpell::Finish } }; }; #endif diff --git a/methods/VMangos/UnitMethods.h b/methods/VMangos/UnitMethods.h index 61fb234206..feffa1f650 100644 --- a/methods/VMangos/UnitMethods.h +++ b/methods/VMangos/UnitMethods.h @@ -3158,9 +3158,7 @@ namespace LuaUnit { "RemoveCharmAuras", METHOD_REG_NONE }, // not implemented { "DisableMelee", METHOD_REG_NONE }, // not implemented { "SummonGuardian", METHOD_REG_NONE }, // not implemented - { "SetImmuneTo", METHOD_REG_NONE }, // not implemented - - { nullptr, METHOD_REG_NONE } + { "SetImmuneTo", METHOD_REG_NONE } // not implemented }; }; #endif diff --git a/methods/VMangos/VehicleMethods.h b/methods/VMangos/VehicleMethods.h index 5c6015a76a..9751c06496 100644 --- a/methods/VMangos/VehicleMethods.h +++ b/methods/VMangos/VehicleMethods.h @@ -117,9 +117,7 @@ namespace LuaVehicle // Other { "AddPassenger", &LuaVehicle::AddPassenger }, - { "RemovePassenger", &LuaVehicle::RemovePassenger }, - - { nullptr, METHOD_REG_NONE } + { "RemovePassenger", &LuaVehicle::RemovePassenger } }; } diff --git a/methods/VMangos/WorldObjectMethods.h b/methods/VMangos/WorldObjectMethods.h index bdebc05c01..1617c9d453 100644 --- a/methods/VMangos/WorldObjectMethods.h +++ b/methods/VMangos/WorldObjectMethods.h @@ -1223,9 +1223,7 @@ namespace LuaWorldObject { "RemoveEvents", &LuaWorldObject::RemoveEvents }, { "PlayMusic", &LuaWorldObject::PlayMusic }, { "PlayDirectSound", &LuaWorldObject::PlayDirectSound }, - { "PlayDistanceSound", &LuaWorldObject::PlayDistanceSound }, - - { nullptr, METHOD_REG_NONE } + { "PlayDistanceSound", &LuaWorldObject::PlayDistanceSound } }; }; #endif diff --git a/methods/VMangos/WorldPacketMethods.h b/methods/VMangos/WorldPacketMethods.h index b609a77904..c0c009a460 100644 --- a/methods/VMangos/WorldPacketMethods.h +++ b/methods/VMangos/WorldPacketMethods.h @@ -337,9 +337,7 @@ namespace LuaPacket { "WriteGUID", &LuaPacket::WriteGUID }, { "WriteString", &LuaPacket::WriteString }, { "WriteFloat", &LuaPacket::WriteFloat }, - { "WriteDouble", &LuaPacket::WriteDouble }, - - { nullptr, METHOD_REG_NONE } + { "WriteDouble", &LuaPacket::WriteDouble } }; };