From f62a4f3de4a7d2e62a307662335926f283e903af Mon Sep 17 00:00:00 2001 From: Pirulax Date: Thu, 21 May 2020 00:24:25 +0200 Subject: [PATCH 1/3] Change std::map<> to std::pair<>[] in all ::LoadFunctions() --- Client/mods/deathmatch/logic/lua/CLuaManager.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp | 2 +- Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp | 2 +- Server/mods/deathmatch/logic/lua/CLuaManager.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp | 2 +- Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp | 2 +- Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp | 2 +- Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp | 2 +- Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp | 2 +- Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp | 2 +- Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp | 2 +- Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp | 2 +- 57 files changed, 57 insertions(+), 57 deletions(-) diff --git a/Client/mods/deathmatch/logic/lua/CLuaManager.cpp b/Client/mods/deathmatch/logic/lua/CLuaManager.cpp index bba8af3686f..d28d295b161 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaManager.cpp +++ b/Client/mods/deathmatch/logic/lua/CLuaManager.cpp @@ -151,7 +151,7 @@ CLuaMain* CLuaManager::GetVirtualMachine(lua_State* luaVM) void CLuaManager::LoadCFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // ** BACKWARDS COMPATIBILITY FUNCS. SHOULD BE REMOVED BEFORE FINAL RELEASE! ** {"getPlayerRotation", CLuaPedDefs::GetPedRotation}, {"canPlayerBeKnockedOffBike", CLuaPedDefs::CanPedBeKnockedOffBike}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp index 4ded68ab3b2..d2e4cb82417 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp @@ -13,7 +13,7 @@ void CLuaAudioDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Audio funcs {"playSoundFrontEnd", PlaySoundFrontEnd}, {"setAmbientSoundEnabled", SetAmbientSoundEnabled}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp index 5e329a54fea..4f2919403f1 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp @@ -13,7 +13,7 @@ void CLuaBlipDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createBlip", CreateBlip}, {"createBlipAttachedTo", CreateBlipAttachedTo}, {"getBlipIcon", GetBlipIcon}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp index 999d0b85cf8..31575e49fbf 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp @@ -14,7 +14,7 @@ void CLuaBrowserDefs::LoadFunctions() { // Define browser functions - std::map functions{ + constexpr static const std::pair functions[]{ {"createBrowser", CreateBrowser}, {"requestBrowserDomains", RequestBrowserDomains}, {"loadBrowserURL", LoadBrowserURL}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp index 4cd3e836a37..e6a8fc9e032 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp @@ -14,7 +14,7 @@ void CLuaCameraDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Cam get funcs {"getCamera", GetCamera}, {"getCameraViewMode", GetCameraViewMode}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp index 92f9f2719d9..4631198a3fe 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp @@ -13,7 +13,7 @@ void CLuaColShapeDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createColCircle", CreateColCircle}, {"createColCuboid", CreateColCuboid}, {"createColSphere", CreateColSphere}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp index 456dd1af540..5cdc8100d04 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp @@ -15,7 +15,7 @@ extern bool g_bAllowAspectRatioAdjustment; void CLuaDrawingDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"dxDrawLine", DxDrawLine}, {"dxDrawMaterialLine3D", DxDrawMaterialLine3D}, {"dxDrawMaterialSectionLine3D", DxDrawMaterialSectionLine3D}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp index 1fae44c3efd..9babe62a430 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp @@ -13,7 +13,7 @@ void CLuaEffectDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"fxAddBlood", fxAddBlood}, {"fxAddWood", fxAddWood}, {"fxAddSparks", fxAddSparks}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index 8bb7ccaeb55..77f21e365d1 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -16,7 +16,7 @@ using std::list; void CLuaElementDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Element get funcs {"getRootElement", GetRootElement}, {"isElement", IsElement}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp index 13f078aaebc..1c1f87218cd 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp @@ -13,7 +13,7 @@ void CLuaEngineDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"engineFreeModel", EngineFreeModel}, {"engineLoadTXD", EngineLoadTXD}, {"engineLoadCOL", EngineLoadCOL}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp index f9372154c90..92731b3b9b4 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp @@ -12,7 +12,7 @@ void CLuaFireDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createFire", CreateFire}, {"extinguishFire", ExtinguishFire}, }; diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp index e38f9b3b82d..49ea7e2b25a 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp @@ -36,7 +36,7 @@ static const SFixedArray g_chatboxLayoutC void CLuaGUIDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"guiGetInputEnabled", GUIGetInputEnabled}, {"guiSetInputEnabled", GUISetInputEnabled}, {"guiGetInputMode", GUIGetInputMode}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp index 620698cb247..f1b59e5ddbc 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp @@ -13,7 +13,7 @@ void CLuaMarkerDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createMarker", CreateMarker}, {"getMarkerCount", GetMarkerCount}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp index 5e51ab06a77..c89b3cee9cf 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp @@ -13,7 +13,7 @@ void CLuaObjectDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Object create/destroy funcs {"createObject", CreateObject}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp index 7060d7f44f8..eb069ca9cca 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp @@ -15,7 +15,7 @@ void CLuaPedDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createPed", CreatePed}, {"detonateSatchels", DetonateSatchels}, {"killPed", KillPed}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp index 6d51620360f..cd97a4fbd13 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp @@ -13,7 +13,7 @@ void CLuaPickupDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createPickup", CreatePickup}, {"getPickupType", GetPickupType}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp index 2fccd289943..21278167ed2 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp @@ -13,7 +13,7 @@ void CLuaPlayerDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Player get funcs {"getLocalPlayer", GetLocalPlayer}, {"getPlayerName", GetPlayerName}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp index d44e5bd0821..62bb7af8f79 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp @@ -13,7 +13,7 @@ void CLuaPointLightDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createLight", CreateLight}, {"getLightType", GetLightType}, {"getLightRadius", GetLightRadius}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp index 5359762ee12..cf361484650 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp @@ -13,7 +13,7 @@ void CLuaProjectileDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createProjectile", CreateProjectile}, {"getProjectileType", GetProjectileType}, {"getProjectileTarget", GetProjectileTarget}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp index 27711e59aa0..dac3a767d94 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp @@ -14,7 +14,7 @@ void CLuaRadarAreaDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createRadarArea", CreateRadarArea}, {"getRadarAreaColor", GetRadarAreaColor}, {"getRadarAreaSize", GetRadarAreaSize}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp index db96a7b175f..3d971fa0756 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp @@ -14,7 +14,7 @@ using std::list; void CLuaResourceDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"call", Call}, {"getThisResource", GetThisResource}, {"getResourceConfig", GetResourceConfig}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp index 29bb8647e91..e84f1390d0f 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp @@ -13,7 +13,7 @@ void CLuaSearchLightDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createSearchLight", CreateSearchLight}, {"getSearchLightStartPosition", GetSearchLightStartPosition}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp index dbb900892e0..a92c51ca621 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp @@ -14,7 +14,7 @@ using std::list; void CLuaTeamDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"getTeamFromName", GetTeamFromName}, {"getTeamName", GetTeamName}, {"getTeamColor", GetTeamColor}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp index 55fb7e4a815..21d2640b2c4 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp @@ -13,7 +13,7 @@ void CLuaTimerDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"setTimer", SetTimer}, {"killTimer", KillTimer}, {"resetTimer", ResetTimer}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index b5135424f73..84d97a9c9ba 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -14,7 +14,7 @@ void CLuaVehicleDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Vehicle get funcs {"getVehicleType", GetVehicleType}, {"getVehicleModelFromName", GetVehicleModelFromName}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp index 8248ba8f101..8eaa82d6cf4 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp @@ -13,7 +13,7 @@ void CLuaWaterDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createWater", CreateWater}, {"testLineAgainstWater", TestLineAgainstWater}, {"resetWaterColor", ResetWaterColor}, diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp index bd3d00e0a2d..bd1c08f2f37 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp @@ -15,7 +15,7 @@ void CLuaWeaponDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"getWeaponNameFromID", GetWeaponNameFromID}, {"getWeaponIDFromName", GetWeaponIDFromName}, {"getSlotFromWeapon", GetSlotFromWeapon}, diff --git a/Server/mods/deathmatch/logic/lua/CLuaManager.cpp b/Server/mods/deathmatch/logic/lua/CLuaManager.cpp index 305daffc015..3cc6b7e7b8f 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaManager.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaManager.cpp @@ -155,7 +155,7 @@ CResource* CLuaManager::GetVirtualMachineResource(lua_State* luaVM) void CLuaManager::LoadCFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"addEvent", CLuaFunctionDefs::AddEvent}, {"addEventHandler", CLuaFunctionDefs::AddEventHandler}, {"removeEventHandler", CLuaFunctionDefs::RemoveEventHandler}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp index 1ec5f0087b8..60996c8fcd6 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp @@ -20,7 +20,7 @@ static const char* GetResourceName(lua_State* luaVM) void CLuaACLDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"aclReload", aclReload}, {"aclSave", aclSave}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp index fe38ae655bb..c6a119ada87 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp @@ -13,7 +13,7 @@ void CLuaAccountDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Log in/out funcs {"logIn", LogIn}, {"logOut", LogOut}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp index a4c681abdf5..33a50206871 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp @@ -13,7 +13,7 @@ void CLuaBanDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"addBan", AddBan}, {"removeBan", RemoveBan}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp index f3b41ffebb0..60feef250c7 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp @@ -13,7 +13,7 @@ void CLuaBlipDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Blip create/destroy funcs {"createBlip", CreateBlip}, {"createBlipAttachedTo", CreateBlipAttachedTo}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp index e58dabf1d67..12b81ff0b4d 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp @@ -13,7 +13,7 @@ void CLuaCameraDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Get functions {"getCameraMatrix", getCameraMatrix}, {"getCameraTarget", getCameraTarget}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp index e615bbdbbaa..8d8c6a6ff81 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp @@ -13,7 +13,7 @@ void CLuaColShapeDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createColCircle", CreateColCircle}, {"createColCuboid", CreateColCuboid}, {"createColSphere", CreateColSphere}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp index 4caac84f54a..45e1e64acb1 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp @@ -13,7 +13,7 @@ void CLuaDatabaseDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"dbConnect", DbConnect}, {"dbExec", DbExec}, {"dbQuery", DbQuery}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index a410c23f8a4..65b4625ce5f 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -13,7 +13,7 @@ void CLuaElementDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Create/destroy {"createElement", createElement}, {"destroyElement", destroyElement}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp index 36e9c7c52ff..26f766a4f49 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp @@ -13,7 +13,7 @@ void CLuaHandlingDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Set {"setVehicleHandling", SetVehicleHandling}, {"setModelHandling", SetModelHandling}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp index 59bc3b4be3c..369fc113451 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp @@ -12,7 +12,7 @@ void CLuaMarkerDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Marker functions {"createMarker", CreateMarker}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp index bff8a1e84f8..4f1514b6db3 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp @@ -13,7 +13,7 @@ void CLuaObjectDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Object create/destroy funcs {"createObject", CreateObject}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp index 3c41c9650cf..5a554838a5b 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp @@ -13,7 +13,7 @@ void CLuaPedDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Ped funcs {"createPed", CreatePed}, {"getValidPedModels", GetValidPedModels}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp index 2e8efcfb634..42772451040 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp @@ -13,7 +13,7 @@ void CLuaPickupDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Create/destroy {"createPickup", createPickup}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp index 7a079e4084a..0727e6fcad8 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp @@ -13,7 +13,7 @@ void CLuaPlayerDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Player get funcs {"getPlayerCount", GetPlayerCount}, {"getPlayerFromNick", GetPlayerFromName}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp index 9008928102c..f88c2fe49ad 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp @@ -13,7 +13,7 @@ void CLuaRadarAreaDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Radar area create/destroy funcs {"createRadarArea", CreateRadarArea}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp index e4fbbee5afa..113c18690ca 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp @@ -16,7 +16,7 @@ extern CNetServer* g_pRealNetServer; void CLuaResourceDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Create/edit functions {"createResource", createResource}, {"copyResource", copyResource}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp index e5c277a7fd6..c9e247779b0 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp @@ -13,7 +13,7 @@ void CLuaTeamDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Team create/destroy functions {"createTeam", CreateTeam}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp index 4cad3318972..2d4e9dccde3 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp @@ -13,7 +13,7 @@ void CLuaTextDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"textCreateDisplay", textCreateDisplay}, {"textDestroyDisplay", textDestroyDisplay}, {"textCreateTextItem", textCreateTextItem}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp index 097d3be2b2d..eb479b6e398 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp @@ -13,7 +13,7 @@ void CLuaTimerDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"setTimer", SetTimer}, {"killTimer", KillTimer}, {"resetTimer", ResetTimer}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index b072876178d..5bb57de106f 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -13,7 +13,7 @@ void CLuaVehicleDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Vehicle create/destroy funcs {"createVehicle", CreateVehicle}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp index 9f62b742eb7..a20c3206d53 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp @@ -13,7 +13,7 @@ void CLuaVoiceDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"isVoiceEnabled", IsVoiceEnabled}, {"setPlayerVoiceBroadcastTo", SetPlayerVoiceBroadcastTo}, {"setPlayerVoiceIgnoreFrom", setPlayerVoiceIgnoreFrom}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp index c9ba13d519d..6d29574a854 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp @@ -13,7 +13,7 @@ void CLuaWaterDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"createWater", CreateWater}, {"setWaterLevel", SetWaterLevel}, {"resetWaterLevel", ResetWaterLevel}, diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp index 73b7156b11c..49e33f2a737 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp @@ -13,7 +13,7 @@ void CLuaWorldDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Get {"getTime", getTime}, {"getWeather", getWeather}, diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp index 36d927a01e8..310485c3f2a 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp @@ -14,7 +14,7 @@ void CLuaBitDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"bitAnd", bitAnd}, {"bitNot", bitNot}, {"bitOr", bitOr}, diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp index 96a87258deb..33ee09d074b 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp @@ -13,7 +13,7 @@ void CLuaCryptDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"md5", ArgumentParserWarn}, {"sha256", ArgumentParserWarn}, {"hash", ArgumentParserWarn}, diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp index ddeb9367641..bf8f8d04e66 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp @@ -14,7 +14,7 @@ void CLuaFileDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"fileOpen", fileOpen}, {"fileCreate", fileCreate}, {"fileExists", fileExists}, diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp index adcb79c023f..184fe620b2a 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp @@ -12,7 +12,7 @@ void CLuaUTFDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"utfLen", UtfLen}, {"utfSeek", UtfSeek}, {"utfSub", UtfSub}, diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp index 566d027cf6b..7d5c5900beb 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp @@ -12,7 +12,7 @@ void CLuaUtilDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ // Util functions to make scripting easier for the end user // Some of these are based on standard mIRC script funcs as a lot of people will be used to them {"deref", Dereference}, diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp index 398ea11f005..10c44bcfccc 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp @@ -12,7 +12,7 @@ void CLuaXMLDefs::LoadFunctions() { - std::map functions{ + constexpr static const std::pair functions[]{ {"xmlCreateFile", xmlCreateFile}, {"xmlLoadFile", xmlLoadFile}, {"xmlLoadString", xmlLoadString}, From 1379880376548f8cb29a3173d5d3982f1b186fa2 Mon Sep 17 00:00:00 2001 From: Pirulax Date: Thu, 21 May 2020 23:14:19 +0200 Subject: [PATCH 2/3] replace const auto& pair to const auto& [k, v] in LoadFunctions for loops --- Client/mods/deathmatch/logic/lua/CLuaManager.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp | 6 ++---- .../mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp | 6 ++---- Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/lua/CLuaManager.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp | 6 ++---- Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp | 6 ++---- Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp | 6 ++---- Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp | 6 ++---- Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp | 6 ++---- Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp | 6 ++---- Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp | 6 ++---- Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp | 6 ++---- 57 files changed, 114 insertions(+), 228 deletions(-) diff --git a/Client/mods/deathmatch/logic/lua/CLuaManager.cpp b/Client/mods/deathmatch/logic/lua/CLuaManager.cpp index d28d295b161..1c5b9f85e01 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaManager.cpp +++ b/Client/mods/deathmatch/logic/lua/CLuaManager.cpp @@ -405,10 +405,8 @@ void CLuaManager::LoadCFunctions() }; // Add all functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); // Luadef definitions CLuaAudioDefs::LoadFunctions(); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp index d2e4cb82417..dad74a686d9 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp @@ -65,10 +65,8 @@ void CLuaAudioDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaAudioDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp index 4f2919403f1..8e4eb50673c 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp @@ -30,10 +30,8 @@ void CLuaBlipDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaBlipDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp index 31575e49fbf..b5d137562a7 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp @@ -49,10 +49,8 @@ void CLuaBrowserDefs::LoadFunctions() }; // Add browser functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaBrowserDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp index e6a8fc9e032..72fc08e4ce7 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp @@ -39,10 +39,8 @@ void CLuaCameraDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaCameraDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp index 4631198a3fe..d0e5c800134 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp @@ -36,10 +36,8 @@ void CLuaColShapeDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaColShapeDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp index 5cdc8100d04..aaed045dcae 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp @@ -61,10 +61,8 @@ void CLuaDrawingDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaDrawingDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp index 9babe62a430..71500fe868f 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp @@ -36,10 +36,8 @@ void CLuaEffectDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaEffectDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index 77f21e365d1..2bd7fae66ee 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -98,10 +98,8 @@ void CLuaElementDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaElementDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp index 1c1f87218cd..129ac2cfc66 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp @@ -59,10 +59,8 @@ void CLuaEngineDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaEngineDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp index 92731b3b9b4..beaff8cdffb 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp @@ -18,10 +18,8 @@ void CLuaFireDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } int CLuaFireDefs::CreateFire(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp index 49ea7e2b25a..6d699319f45 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp @@ -195,10 +195,8 @@ void CLuaGUIDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaGUIDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp index f1b59e5ddbc..8d924008725 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp @@ -31,10 +31,8 @@ void CLuaMarkerDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaMarkerDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp index c89b3cee9cf..4046e1d5a95 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp @@ -38,10 +38,8 @@ void CLuaObjectDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaObjectDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp index eb069ca9cca..cc5b427eded 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp @@ -92,10 +92,8 @@ void CLuaPedDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaPedDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp index cd97a4fbd13..f37f66875ef 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp @@ -25,10 +25,8 @@ void CLuaPickupDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaPickupDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp index 21278167ed2..121c821327d 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp @@ -50,10 +50,8 @@ void CLuaPlayerDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaPlayerDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp index 62bb7af8f79..64522aaa663 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp @@ -25,10 +25,8 @@ void CLuaPointLightDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaPointLightDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp index cf361484650..b965a51a070 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp @@ -24,10 +24,8 @@ void CLuaProjectileDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaProjectileDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp index dac3a767d94..c2779c549b2 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp @@ -26,10 +26,8 @@ void CLuaRadarAreaDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaRadarAreaDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp index 3d971fa0756..67b47fe3c4f 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp @@ -30,10 +30,8 @@ void CLuaResourceDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaResourceDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp index e84f1390d0f..dc0e6612518 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp @@ -28,10 +28,8 @@ void CLuaSearchLightDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaSearchLightDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp index a92c51ca621..f3c6a5e79f2 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp @@ -24,10 +24,8 @@ void CLuaTeamDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaTeamDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp index 21d2640b2c4..7805d5dc20d 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp @@ -23,10 +23,8 @@ void CLuaTimerDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaTimerDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index 84d97a9c9ba..c36a59ac86e 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -142,10 +142,8 @@ void CLuaVehicleDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaVehicleDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp index 8eaa82d6cf4..105e32465da 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp @@ -31,10 +31,8 @@ void CLuaWaterDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaWaterDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp index bd1c08f2f37..32c5c6bc8bf 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp @@ -42,10 +42,8 @@ void CLuaWeaponDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaWeaponDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/lua/CLuaManager.cpp b/Server/mods/deathmatch/logic/lua/CLuaManager.cpp index 3cc6b7e7b8f..d7739294dc4 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaManager.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaManager.cpp @@ -357,10 +357,8 @@ void CLuaManager::LoadCFunctions() }; // Add all functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); // Restricted functions CLuaCFunctions::AddFunction("setServerConfigSetting", CLuaFunctionDefs::SetServerConfigSetting, true); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp index 60996c8fcd6..2006cda933a 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp @@ -56,10 +56,8 @@ void CLuaACLDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaACLDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp index c6a119ada87..9b28f0713a9 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp @@ -44,10 +44,8 @@ void CLuaAccountDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaAccountDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp index 33a50206871..e20c38cee78 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp @@ -37,10 +37,8 @@ void CLuaBanDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaBanDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp index 60feef250c7..1efdfde1f8a 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp @@ -34,10 +34,8 @@ void CLuaBlipDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaBlipDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp index 12b81ff0b4d..937ac827ae8 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp @@ -27,10 +27,8 @@ void CLuaCameraDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } int CLuaCameraDefs::getCameraMatrix(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp index 8d8c6a6ff81..b8c19ccdcdb 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp @@ -36,10 +36,8 @@ void CLuaColShapeDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaColShapeDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp index 45e1e64acb1..f6004ef94ad 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp @@ -32,10 +32,8 @@ void CLuaDatabaseDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaDatabaseDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index 65b4625ce5f..67d08ff2d3e 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -100,10 +100,8 @@ void CLuaElementDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } // TODO: specials diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp index 26f766a4f49..9392b442983 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp @@ -25,10 +25,8 @@ void CLuaHandlingDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } int CLuaHandlingDefs::SetVehicleHandling(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp index 369fc113451..47b97cb4108 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp @@ -33,10 +33,8 @@ void CLuaMarkerDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaMarkerDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp index 4f1514b6db3..7f6076514b2 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp @@ -29,10 +29,8 @@ void CLuaObjectDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaObjectDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp index 5a554838a5b..11797d42761 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp @@ -78,10 +78,8 @@ void CLuaPedDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } // TODO: specials diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp index 42772451040..7989f8f247a 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp @@ -32,10 +32,8 @@ void CLuaPickupDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaPickupDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp index 0727e6fcad8..f64924b772a 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp @@ -102,10 +102,8 @@ void CLuaPlayerDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaPlayerDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp index f88c2fe49ad..9b15ad92ef0 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp @@ -30,10 +30,8 @@ void CLuaRadarAreaDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaRadarAreaDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp index 113c18690ca..f2eb156a36a 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp @@ -68,10 +68,8 @@ void CLuaResourceDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); CLuaCFunctions::AddFunction("updateResourceACLRequest", updateResourceACLRequest, true); } diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp index c9e247779b0..df13bc0c192 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp @@ -33,10 +33,8 @@ void CLuaTeamDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaTeamDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp index 2d4e9dccde3..e5a9fdc4f34 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp @@ -39,10 +39,8 @@ void CLuaTextDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaTextDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp index eb479b6e398..bea8f0c73e9 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp @@ -23,10 +23,8 @@ void CLuaTimerDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaTimerDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index 5bb57de106f..be88f32096b 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -120,10 +120,8 @@ void CLuaVehicleDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaVehicleDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp index a20c3206d53..b05df232a3f 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp @@ -20,10 +20,8 @@ void CLuaVoiceDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } int CLuaVoiceDefs::IsVoiceEnabled(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp index 6d29574a854..6fb06ac6c31 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp @@ -25,10 +25,8 @@ void CLuaWaterDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaWaterDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp index 49e33f2a737..2a11cc5de49 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp @@ -90,10 +90,8 @@ void CLuaWorldDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } int CLuaWorldDefs::getTime(lua_State* luaVM) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp index 310485c3f2a..7b69a6f0e26 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp @@ -32,10 +32,8 @@ void CLuaBitDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } int CLuaBitDefs::bitAnd(lua_State* luaVM) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp index 33ee09d074b..2dc85c3f83e 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp @@ -28,10 +28,8 @@ void CLuaCryptDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } std::string CLuaCryptDefs::Md5(std::string strMd5) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp index bf8f8d04e66..c162f860234 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp @@ -36,10 +36,8 @@ void CLuaFileDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaFileDefs::AddClass(lua_State* luaVM) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp index 184fe620b2a..dc5d82a77dd 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp @@ -21,10 +21,8 @@ void CLuaUTFDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } int CLuaUTFDefs::UtfLen(lua_State* luaVM) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp index 7d5c5900beb..c1e49d5463d 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp @@ -49,10 +49,8 @@ void CLuaUtilDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } int CLuaUtilDefs::DisabledFunction(lua_State* luaVM) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp index 10c44bcfccc..c06149b10d5 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp @@ -36,10 +36,8 @@ void CLuaXMLDefs::LoadFunctions() }; // Add functions - for (const auto& pair : functions) - { - CLuaCFunctions::AddFunction(pair.first, pair.second); - } + for (const auto& [k, v] : functions) + CLuaCFunctions::AddFunction(k, v); } void CLuaXMLDefs::AddClass(lua_State* luaVM) From ed9817b1d42b7f0c3b4d9623cd7494e7f6ec9a6c Mon Sep 17 00:00:00 2001 From: Pirulax Date: Thu, 21 May 2020 23:15:57 +0200 Subject: [PATCH 3/3] Rename [k, v] to [name, func] from the pervious commit --- Client/mods/deathmatch/logic/lua/CLuaManager.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp | 4 ++-- Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/lua/CLuaManager.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp | 4 ++-- Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp | 4 ++-- Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp | 4 ++-- Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp | 4 ++-- Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp | 4 ++-- Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp | 4 ++-- Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp | 4 ++-- Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp | 4 ++-- 57 files changed, 114 insertions(+), 114 deletions(-) diff --git a/Client/mods/deathmatch/logic/lua/CLuaManager.cpp b/Client/mods/deathmatch/logic/lua/CLuaManager.cpp index 1c5b9f85e01..78e7dc20a8e 100644 --- a/Client/mods/deathmatch/logic/lua/CLuaManager.cpp +++ b/Client/mods/deathmatch/logic/lua/CLuaManager.cpp @@ -405,8 +405,8 @@ void CLuaManager::LoadCFunctions() }; // Add all functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); // Luadef definitions CLuaAudioDefs::LoadFunctions(); diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp index dad74a686d9..6236312640e 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaAudioDefs.cpp @@ -65,8 +65,8 @@ void CLuaAudioDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaAudioDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp index 8e4eb50673c..a70b1a07e4d 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp @@ -30,8 +30,8 @@ void CLuaBlipDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaBlipDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp index b5d137562a7..5d640763513 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaBrowserDefs.cpp @@ -49,8 +49,8 @@ void CLuaBrowserDefs::LoadFunctions() }; // Add browser functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaBrowserDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp index 72fc08e4ce7..283e58fb45b 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp @@ -39,8 +39,8 @@ void CLuaCameraDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaCameraDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp index d0e5c800134..169469c7a58 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp @@ -36,8 +36,8 @@ void CLuaColShapeDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaColShapeDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp index aaed045dcae..86f438b481c 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp @@ -61,8 +61,8 @@ void CLuaDrawingDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaDrawingDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp index 71500fe868f..5b9940a01a2 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaEffectDefs.cpp @@ -36,8 +36,8 @@ void CLuaEffectDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaEffectDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index 2bd7fae66ee..7a11bc85fd1 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -98,8 +98,8 @@ void CLuaElementDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaElementDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp index 129ac2cfc66..d132750c903 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaEngineDefs.cpp @@ -59,8 +59,8 @@ void CLuaEngineDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaEngineDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp index beaff8cdffb..c03a332b097 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaFireDefs.cpp @@ -18,8 +18,8 @@ void CLuaFireDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } int CLuaFireDefs::CreateFire(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp index 6d699319f45..62a7afac818 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaGUIDefs.cpp @@ -195,8 +195,8 @@ void CLuaGUIDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaGUIDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp index 8d924008725..111c79ee85f 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp @@ -31,8 +31,8 @@ void CLuaMarkerDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaMarkerDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp index 4046e1d5a95..a49f949df7e 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp @@ -38,8 +38,8 @@ void CLuaObjectDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaObjectDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp index cc5b427eded..c3e25dbaeac 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp @@ -92,8 +92,8 @@ void CLuaPedDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaPedDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp index f37f66875ef..a04b8cecca8 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp @@ -25,8 +25,8 @@ void CLuaPickupDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaPickupDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp index 121c821327d..c04e80ccd32 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp @@ -50,8 +50,8 @@ void CLuaPlayerDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaPlayerDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp index 64522aaa663..54eff5aa94d 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaPointLightDefs.cpp @@ -25,8 +25,8 @@ void CLuaPointLightDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaPointLightDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp index b965a51a070..6755a6b003b 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaProjectileDefs.cpp @@ -24,8 +24,8 @@ void CLuaProjectileDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaProjectileDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp index c2779c549b2..90f1757a4ee 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp @@ -26,8 +26,8 @@ void CLuaRadarAreaDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaRadarAreaDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp index 67b47fe3c4f..8d3f9d09047 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp @@ -30,8 +30,8 @@ void CLuaResourceDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaResourceDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp index dc0e6612518..18fda530c6a 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaSearchLightDefs.cpp @@ -28,8 +28,8 @@ void CLuaSearchLightDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaSearchLightDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp index f3c6a5e79f2..ae71489f578 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp @@ -24,8 +24,8 @@ void CLuaTeamDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaTeamDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp index 7805d5dc20d..1cd91b853f7 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp @@ -23,8 +23,8 @@ void CLuaTimerDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaTimerDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index c36a59ac86e..9b818ca761c 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -142,8 +142,8 @@ void CLuaVehicleDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaVehicleDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp index 105e32465da..a391045f83b 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp @@ -31,8 +31,8 @@ void CLuaWaterDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaWaterDefs::AddClass(lua_State* luaVM) diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp index 32c5c6bc8bf..bdfae11add7 100644 --- a/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp +++ b/Client/mods/deathmatch/logic/luadefs/CLuaWeaponDefs.cpp @@ -42,8 +42,8 @@ void CLuaWeaponDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaWeaponDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/lua/CLuaManager.cpp b/Server/mods/deathmatch/logic/lua/CLuaManager.cpp index d7739294dc4..b8922ea59b1 100644 --- a/Server/mods/deathmatch/logic/lua/CLuaManager.cpp +++ b/Server/mods/deathmatch/logic/lua/CLuaManager.cpp @@ -357,8 +357,8 @@ void CLuaManager::LoadCFunctions() }; // Add all functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); // Restricted functions CLuaCFunctions::AddFunction("setServerConfigSetting", CLuaFunctionDefs::SetServerConfigSetting, true); diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp index 2006cda933a..4be85f9fa0f 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp @@ -56,8 +56,8 @@ void CLuaACLDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaACLDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp index 9b28f0713a9..60c50746829 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp @@ -44,8 +44,8 @@ void CLuaAccountDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaAccountDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp index e20c38cee78..0f2eabc68fb 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaBanDefs.cpp @@ -37,8 +37,8 @@ void CLuaBanDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaBanDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp index 1efdfde1f8a..1f6a7086931 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp @@ -34,8 +34,8 @@ void CLuaBlipDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaBlipDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp index 937ac827ae8..37387ac3178 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaCameraDefs.cpp @@ -27,8 +27,8 @@ void CLuaCameraDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } int CLuaCameraDefs::getCameraMatrix(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp index b8c19ccdcdb..eda424e8cbc 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaColShapeDefs.cpp @@ -36,8 +36,8 @@ void CLuaColShapeDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaColShapeDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp index f6004ef94ad..7380c895b3e 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp @@ -32,8 +32,8 @@ void CLuaDatabaseDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaDatabaseDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp index 67d08ff2d3e..9d5783be7ea 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp @@ -100,8 +100,8 @@ void CLuaElementDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } // TODO: specials diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp index 9392b442983..2593221b126 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaHandlingDefs.cpp @@ -25,8 +25,8 @@ void CLuaHandlingDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } int CLuaHandlingDefs::SetVehicleHandling(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp index 47b97cb4108..16fc3ab10e1 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaMarkerDefs.cpp @@ -33,8 +33,8 @@ void CLuaMarkerDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaMarkerDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp index 7f6076514b2..d3f8d7bd3e7 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaObjectDefs.cpp @@ -29,8 +29,8 @@ void CLuaObjectDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaObjectDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp index 11797d42761..14d80da029c 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp @@ -78,8 +78,8 @@ void CLuaPedDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } // TODO: specials diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp index 7989f8f247a..8ac71e21b84 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.cpp @@ -32,8 +32,8 @@ void CLuaPickupDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaPickupDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp index f64924b772a..bea1d3e9c17 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp @@ -102,8 +102,8 @@ void CLuaPlayerDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaPlayerDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp index 9b15ad92ef0..ab931109274 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaRadarAreaDefs.cpp @@ -30,8 +30,8 @@ void CLuaRadarAreaDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaRadarAreaDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp index f2eb156a36a..2208f4454c3 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp @@ -68,8 +68,8 @@ void CLuaResourceDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); CLuaCFunctions::AddFunction("updateResourceACLRequest", updateResourceACLRequest, true); } diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp index df13bc0c192..15caac7ccc0 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp @@ -33,8 +33,8 @@ void CLuaTeamDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaTeamDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp index e5a9fdc4f34..603c756b88a 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp @@ -39,8 +39,8 @@ void CLuaTextDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaTextDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp index bea8f0c73e9..4959f1cb61c 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTimerDefs.cpp @@ -23,8 +23,8 @@ void CLuaTimerDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaTimerDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp index be88f32096b..9ec7a1e16ec 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaVehicleDefs.cpp @@ -120,8 +120,8 @@ void CLuaVehicleDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaVehicleDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp index b05df232a3f..d1bb9eb6853 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaVoiceDefs.cpp @@ -20,8 +20,8 @@ void CLuaVoiceDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } int CLuaVoiceDefs::IsVoiceEnabled(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp index 6fb06ac6c31..289821f5bc7 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaWaterDefs.cpp @@ -25,8 +25,8 @@ void CLuaWaterDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaWaterDefs::AddClass(lua_State* luaVM) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp index 2a11cc5de49..38c55cd8b22 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaWorldDefs.cpp @@ -90,8 +90,8 @@ void CLuaWorldDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } int CLuaWorldDefs::getTime(lua_State* luaVM) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp index 7b69a6f0e26..e6ad6f0125f 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaBitDefs.cpp @@ -32,8 +32,8 @@ void CLuaBitDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } int CLuaBitDefs::bitAnd(lua_State* luaVM) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp index 2dc85c3f83e..bdfb03723d6 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaCryptDefs.cpp @@ -28,8 +28,8 @@ void CLuaCryptDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } std::string CLuaCryptDefs::Md5(std::string strMd5) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp index c162f860234..055f5d0311e 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaFileDefs.cpp @@ -36,8 +36,8 @@ void CLuaFileDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaFileDefs::AddClass(lua_State* luaVM) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp index dc5d82a77dd..f210e5e7479 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaUTFDefs.cpp @@ -21,8 +21,8 @@ void CLuaUTFDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } int CLuaUTFDefs::UtfLen(lua_State* luaVM) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp index c1e49d5463d..bc1b90618f9 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaUtilDefs.cpp @@ -49,8 +49,8 @@ void CLuaUtilDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } int CLuaUtilDefs::DisabledFunction(lua_State* luaVM) diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp index c06149b10d5..6f23ee46f42 100644 --- a/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp +++ b/Shared/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp @@ -36,8 +36,8 @@ void CLuaXMLDefs::LoadFunctions() }; // Add functions - for (const auto& [k, v] : functions) - CLuaCFunctions::AddFunction(k, v); + for (const auto& [name, func] : functions) + CLuaCFunctions::AddFunction(name, func); } void CLuaXMLDefs::AddClass(lua_State* luaVM)