Merge pull request #26 from lopezloo/getammofix

Fixed getPedTotalAmmo crashing game if incorrect slot ID was passed
multitheftauto · Jan 17, 2016 · 5bda149 · 5bda149
2 parents 3435725 + d691b66
commit 5bda149
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Ped.cpp b/MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Ped.cpp
@@ -233,7 +233,7 @@ int CLuaFunctionDefs::GetPedTotalAmmo ( lua_State* luaVM )
                 lua_pushnumber ( luaVM, usAmmo );
                 return 1;
             }
-            else if ( pPed->m_usWeaponAmmo [ ucSlot ] )
+            else if ( ucSlot < WEAPONSLOT_MAX && pPed->m_usWeaponAmmo [ ucSlot ] )
             {
                 // The ped musn't be streamed in, so we can get the stored value instead
                 ushort usAmmo = 1;