Fixed getPedTotalAmmo crashing game if incorrect slot ID was passed

lopezloo · lopezloo · commit d691b66ba68e · 2016-01-17T12:47:53.000+01:00
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;

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ int CLuaFunctionDefs::GetPedTotalAmmo ( lua_State* luaVM )`
`233`	`233`	`lua_pushnumber ( luaVM, usAmmo );`
`234`	`234`	`return 1;`
`235`	`235`	`}`
`236`		`- else if ( pPed->m_usWeaponAmmo [ ucSlot ] )`
	`236`	`+ else if ( ucSlot < WEAPONSLOT_MAX && pPed->m_usWeaponAmmo [ ucSlot ] )`
`237`	`237`	`{`
`238`	`238`	`// The ped musn't be streamed in, so we can get the stored value instead`
`239`	`239`	`ushort usAmmo = 1;`