Merge pull request #241 from patrikjuvonen/issue-6455-2

qaisjp · web-flow · commit 49e0ce473287 · 2018-07-16T20:13:49.000+01:00
0006455: use Clamp as requested, related to PR #232
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp
@@ -88,8 +88,8 @@ int CLuaBlipDefs::CreateBlip(lua_State* luaVM)
             CResource* pResource = pLuaMain->GetResource();
             if (pResource)
             {
-                short          sOrdering = std::max(-32768, std::min(32767, iOrdering));
-                unsigned short usVisibleDistance = std::max(0, std::min(65535, iVisibleDistance));
+                short          sOrdering = Clamp(-32768, iOrdering, 32767);
+                unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);
 
                 // Create the blip
                 CClientRadarMarker* pMarker =
@@ -148,8 +148,8 @@ int CLuaBlipDefs::CreateBlipAttachedTo(lua_State* luaVM)
             CResource* pResource = pLuaMain->GetResource();
             if (pResource)
             {
-                short          sOrdering = std::max(-32768, std::min(32767, iOrdering));
-                unsigned short usVisibleDistance = std::max(0, std::min(65535, iVisibleDistance));
+                short          sOrdering = Clamp(-32768, iOrdering, 32767);
+                unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);
 
                 // Create the blip
                 CClientRadarMarker* pMarker =
@@ -359,7 +359,7 @@ int CLuaBlipDefs::SetBlipOrdering(lua_State* luaVM)
 
     if (!argStream.HasErrors())
     {
-        short sOrdering = std::max(-32768, std::min(32767, iOrdering));
+        short sOrdering = Clamp(-32768, iOrdering, 32767);
 
         if (CStaticFunctionDefinitions::SetBlipOrdering(*pEntity, sOrdering))
         {
@@ -384,7 +384,7 @@ int CLuaBlipDefs::SetBlipVisibleDistance(lua_State* luaVM)
 
     if (!argStream.HasErrors())
     {
-        unsigned short usVisibleDistance = std::max(0, std::min(65535, iVisibleDistance));
+        unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);
 
         if (CStaticFunctionDefinitions::SetBlipVisibleDistance(*pEntity, usVisibleDistance))
         {
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp
@@ -97,8 +97,8 @@ int CLuaBlipDefs::CreateBlip(lua_State* luaVM)
             CResource* pResource = pLuaMain->GetResource();
             if (pResource)
             {
-                short          sOrdering = std::max(-32768, std::min(32767, iOrdering));
-                unsigned short usVisibleDistance = std::max(0, std::min(65535, iVisibleDistance));
+                short          sOrdering = Clamp(-32768, iOrdering, 32767);
+                unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);
 
                 // Create the blip
                 CBlip* pBlip = CStaticFunctionDefinitions::CreateBlip(pResource, vecPosition, ucIcon, ucSize, color, sOrdering, usVisibleDistance, pVisibleTo);
@@ -156,8 +156,8 @@ int CLuaBlipDefs::CreateBlipAttachedTo(lua_State* luaVM)
         CResource* resource = m_pLuaManager->GetVirtualMachineResource(luaVM);
         if (resource)
         {
-            short          sOrdering = std::max(-32768, std::min(32767, iOrdering));
-            unsigned short usVisibleDistance = std::max(0, std::min(65535, iVisibleDistance));
+            short          sOrdering = Clamp(-32768, iOrdering, 32767);
+            unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);
 
             // Create the blip
             CBlip* pBlip =
@@ -385,7 +385,7 @@ int CLuaBlipDefs::SetBlipOrdering(lua_State* luaVM)
 
     if (!argStream.HasErrors())
     {
-        short sOrdering = std::max(-32768, std::min(32767, iOrdering));
+        short sOrdering = Clamp(-32768, iOrdering, 32767);
 
         if (CStaticFunctionDefinitions::SetBlipOrdering(pElement, sOrdering))
         {
@@ -411,7 +411,7 @@ int CLuaBlipDefs::SetBlipVisibleDistance(lua_State* luaVM)
 
     if (!argStream.HasErrors())
     {
-        unsigned short usVisibleDistance = std::max(0, std::min(65535, iVisibleDistance));
+        unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);
 
         if (CStaticFunctionDefinitions::SetBlipVisibleDistance(pElement, usVisibleDistance))
         {

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ int CLuaBlipDefs::CreateBlip(lua_State* luaVM)`
`88`	`88`	`CResource* pResource = pLuaMain->GetResource();`
`89`	`89`	`if (pResource)`
`90`	`90`	`{`
`91`		`- short sOrdering = std::max(-32768, std::min(32767, iOrdering));`
`92`		`- unsigned short usVisibleDistance = std::max(0, std::min(65535, iVisibleDistance));`
	`91`	`+ short sOrdering = Clamp(-32768, iOrdering, 32767);`
	`92`	`+ unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);`
`93`	`93`
`94`	`94`	`// Create the blip`
`95`	`95`	`CClientRadarMarker* pMarker =`
`@@ -148,8 +148,8 @@ int CLuaBlipDefs::CreateBlipAttachedTo(lua_State* luaVM)`
`148`	`148`	`CResource* pResource = pLuaMain->GetResource();`
`149`	`149`	`if (pResource)`
`150`	`150`	`{`
`151`		`- short sOrdering = std::max(-32768, std::min(32767, iOrdering));`
`152`		`- unsigned short usVisibleDistance = std::max(0, std::min(65535, iVisibleDistance));`
	`151`	`+ short sOrdering = Clamp(-32768, iOrdering, 32767);`
	`152`	`+ unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);`
`153`	`153`
`154`	`154`	`// Create the blip`
`155`	`155`	`CClientRadarMarker* pMarker =`
`@@ -359,7 +359,7 @@ int CLuaBlipDefs::SetBlipOrdering(lua_State* luaVM)`
`359`	`359`
`360`	`360`	`if (!argStream.HasErrors())`
`361`	`361`	`{`
`362`		`- short sOrdering = std::max(-32768, std::min(32767, iOrdering));`
	`362`	`+ short sOrdering = Clamp(-32768, iOrdering, 32767);`
`363`	`363`
`364`	`364`	`if (CStaticFunctionDefinitions::SetBlipOrdering(*pEntity, sOrdering))`
`365`	`365`	`{`
`@@ -384,7 +384,7 @@ int CLuaBlipDefs::SetBlipVisibleDistance(lua_State* luaVM)`
`384`	`384`
`385`	`385`	`if (!argStream.HasErrors())`
`386`	`386`	`{`
`387`		`- unsigned short usVisibleDistance = std::max(0, std::min(65535, iVisibleDistance));`
	`387`	`+ unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);`
`388`	`388`
`389`	`389`	`if (CStaticFunctionDefinitions::SetBlipVisibleDistance(*pEntity, usVisibleDistance))`
`390`	`390`	`{`
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ int CLuaBlipDefs::CreateBlip(lua_State* luaVM)`
`97`	`97`	`CResource* pResource = pLuaMain->GetResource();`
`98`	`98`	`if (pResource)`
`99`	`99`	`{`
`100`		`- short sOrdering = std::max(-32768, std::min(32767, iOrdering));`
`101`		`- unsigned short usVisibleDistance = std::max(0, std::min(65535, iVisibleDistance));`
	`100`	`+ short sOrdering = Clamp(-32768, iOrdering, 32767);`
	`101`	`+ unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);`
`102`	`102`
`103`	`103`	`// Create the blip`
`104`	`104`	`CBlip* pBlip = CStaticFunctionDefinitions::CreateBlip(pResource, vecPosition, ucIcon, ucSize, color, sOrdering, usVisibleDistance, pVisibleTo);`
`@@ -156,8 +156,8 @@ int CLuaBlipDefs::CreateBlipAttachedTo(lua_State* luaVM)`
`156`	`156`	`CResource* resource = m_pLuaManager->GetVirtualMachineResource(luaVM);`
`157`	`157`	`if (resource)`
`158`	`158`	`{`
`159`		`- short sOrdering = std::max(-32768, std::min(32767, iOrdering));`
`160`		`- unsigned short usVisibleDistance = std::max(0, std::min(65535, iVisibleDistance));`
	`159`	`+ short sOrdering = Clamp(-32768, iOrdering, 32767);`
	`160`	`+ unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);`
`161`	`161`
`162`	`162`	`// Create the blip`
`163`	`163`	`CBlip* pBlip =`
`@@ -385,7 +385,7 @@ int CLuaBlipDefs::SetBlipOrdering(lua_State* luaVM)`
`385`	`385`
`386`	`386`	`if (!argStream.HasErrors())`
`387`	`387`	`{`
`388`		`- short sOrdering = std::max(-32768, std::min(32767, iOrdering));`
	`388`	`+ short sOrdering = Clamp(-32768, iOrdering, 32767);`
`389`	`389`
`390`	`390`	`if (CStaticFunctionDefinitions::SetBlipOrdering(pElement, sOrdering))`
`391`	`391`	`{`
`@@ -411,7 +411,7 @@ int CLuaBlipDefs::SetBlipVisibleDistance(lua_State* luaVM)`
`411`	`411`
`412`	`412`	`if (!argStream.HasErrors())`
`413`	`413`	`{`
`414`		`- unsigned short usVisibleDistance = std::max(0, std::min(65535, iVisibleDistance));`
	`414`	`+ unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);`
`415`	`415`
`416`	`416`	`if (CStaticFunctionDefinitions::SetBlipVisibleDistance(pElement, usVisibleDistance))`
`417`	`417`	`{`