CLuaBlipDefs: clamp blip size between 0 and 25 for backwards compatibility

Author: patrikjuvonen

Client/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp

@@ -60,14 +60,14 @@ int CLuaBlipDefs::CreateBlip(lua_State* luaVM)
 {
     CVector          vecPosition;
     unsigned char    ucIcon = 0;
-    unsigned char    ucSize = 2;
+    int              iSize = 2;
     SColorRGBA       color(255, 0, 0, 255);
     int              iOrdering = 0;
     int              iVisibleDistance = 16383;
     CScriptArgReader argStream(luaVM);
     argStream.ReadVector3D(vecPosition);
     argStream.ReadNumber(ucIcon, 0);
-    argStream.ReadNumber(ucSize, 2);
+    argStream.ReadNumber(iSize, 2);
     argStream.ReadNumber(color.R, 255);
     argStream.ReadNumber(color.G, 0);
     argStream.ReadNumber(color.B, 0);
@@ -88,6 +88,7 @@ int CLuaBlipDefs::CreateBlip(lua_State* luaVM)
             CResource* pResource = pLuaMain->GetResource();
             if (pResource)
             {
+                unsigned char  ucSize = Clamp(0, iSize, 25);
                 short          sOrdering = Clamp(-32768, iOrdering, 32767);
                 unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);
 
@@ -120,14 +121,14 @@ int CLuaBlipDefs::CreateBlipAttachedTo(lua_State* luaVM)
     CClientEntity* pEntity = NULL;
     // Default colors and size
     unsigned char    ucIcon = 0;
-    unsigned char    ucSize = 2;
+    int              iSize = 2;
     SColorRGBA       color(255, 0, 0, 255);
     int              iOrdering = 0;
     int              iVisibleDistance = 16383;
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pEntity);
     argStream.ReadNumber(ucIcon, 0);
-    argStream.ReadNumber(ucSize, 2);
+    argStream.ReadNumber(iSize, 2);
     argStream.ReadNumber(color.R, 255);
     argStream.ReadNumber(color.G, 0);
     argStream.ReadNumber(color.B, 0);
@@ -148,6 +149,7 @@ int CLuaBlipDefs::CreateBlipAttachedTo(lua_State* luaVM)
             CResource* pResource = pLuaMain->GetResource();
             if (pResource)
             {
+                unsigned char  ucSize = Clamp(0, iSize, 25);
                 short          sOrdering = Clamp(-32768, iOrdering, 32767);
                 unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);
 
@@ -303,13 +305,15 @@ int CLuaBlipDefs::SetBlipIcon(lua_State* luaVM)
 int CLuaBlipDefs::SetBlipSize(lua_State* luaVM)
 {
     CClientEntity*   pEntity = NULL;
-    unsigned char    ucSize = 0;
+    int              iSize = 0;
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pEntity);
-    argStream.ReadNumber(ucSize);
+    argStream.ReadNumber(iSize);
 
     if (!argStream.HasErrors())
     {
+        unsigned char ucSize = Clamp(0, iSize, 25);
+
         if (CStaticFunctionDefinitions::SetBlipSize(*pEntity, ucSize))
         {
             lua_pushboolean(luaVM, true);

Server/mods/deathmatch/logic/luadefs/CLuaBlipDefs.cpp

@@ -63,7 +63,8 @@ void CLuaBlipDefs::AddClass(lua_State* luaVM)
 int CLuaBlipDefs::CreateBlip(lua_State* luaVM)
 {
     CVector       vecPosition;
-    unsigned char ucIcon, ucSize;
+    unsigned char ucIcon;
+    int           iSize;
     SColorRGBA    color(255, 0, 0, 255);
     int           iOrdering;
     int           iVisibleDistance;
@@ -72,7 +73,7 @@ int CLuaBlipDefs::CreateBlip(lua_State* luaVM)
     CScriptArgReader argStream(luaVM);
     argStream.ReadVector3D(vecPosition);
     argStream.ReadNumber(ucIcon, 0);
-    argStream.ReadNumber(ucSize, 2);
+    argStream.ReadNumber(iSize, 2);
     argStream.ReadNumber(color.R, color.R);
     argStream.ReadNumber(color.G, color.G);
     argStream.ReadNumber(color.B, color.B);
@@ -97,6 +98,7 @@ int CLuaBlipDefs::CreateBlip(lua_State* luaVM)
             CResource* pResource = pLuaMain->GetResource();
             if (pResource)
             {
+                unsigned char  ucSize = Clamp(0, iSize, 25);
                 short          sOrdering = Clamp(-32768, iOrdering, 32767);
                 unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);
 
@@ -125,7 +127,8 @@ int CLuaBlipDefs::CreateBlip(lua_State* luaVM)
 int CLuaBlipDefs::CreateBlipAttachedTo(lua_State* luaVM)
 {
     CElement*     pElement;
-    unsigned char ucIcon, ucSize;
+    unsigned char ucIcon;
+    int           iSize;
     SColorRGBA    color(255, 0, 0, 255);
     int           iOrdering;
     int           iVisibleDistance;
@@ -134,7 +137,7 @@ int CLuaBlipDefs::CreateBlipAttachedTo(lua_State* luaVM)
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pElement);
     argStream.ReadNumber(ucIcon, 0);
-    argStream.ReadNumber(ucSize, 2);
+    argStream.ReadNumber(iSize, 2);
     argStream.ReadNumber(color.R, color.R);
     argStream.ReadNumber(color.G, color.G);
     argStream.ReadNumber(color.B, color.B);
@@ -156,6 +159,7 @@ int CLuaBlipDefs::CreateBlipAttachedTo(lua_State* luaVM)
         CResource* resource = m_pLuaManager->GetVirtualMachineResource(luaVM);
         if (resource)
         {
+            unsigned char  ucSize = Clamp(0, iSize, 25);
             short          sOrdering = Clamp(-32768, iOrdering, 32767);
             unsigned short usVisibleDistance = Clamp(0, iVisibleDistance, 65535);
 
@@ -325,15 +329,17 @@ int CLuaBlipDefs::SetBlipIcon(lua_State* luaVM)
 
 int CLuaBlipDefs::SetBlipSize(lua_State* luaVM)
 {
-    CElement*     pElement;
-    unsigned char ucSize;
+    CElement* pElement;
+    int       iSize;
 
     CScriptArgReader argStream(luaVM);
     argStream.ReadUserData(pElement);
-    argStream.ReadNumber(ucSize);
+    argStream.ReadNumber(iSize);
 
     if (!argStream.HasErrors())
     {
+        unsigned char ucSize = Clamp(0, iSize, 25);
+
         if (CStaticFunctionDefinitions::SetBlipSize(pElement, ucSize))
         {
             lua_pushboolean(luaVM, true);