Update key defines so they match and handle false returns from getWeaponNameFromID in GetWeaponName

Author: colistro123

amx/server/defines.lua

@@ -82,20 +82,25 @@ local controlMappingMT = {
 
 g_KeyMapping = setmetatable({
 	[1] = 'action',
-	[2] = 'crouch',
-	[4] = { 'fire', 'vehicle_fire' },
-	[8] = 'sprint',
-	[16] = 'vehicle_secondary_fire',
-	[32] = 'jump',
-	[64] = 'vehicle_look_right',
-	[128] = 'handbrake',
-	[256] = 'vehicle_look_left',
-	[512] = { 'look_behind', 'sub_mission' },
-	[1024] = 'walk',
-	[2048] = 'special_control_up',
-	[4096] = 'special_control_down',
-	[8192] = 'special_control_left',
-	[16384] = 'special_control_right',
+	[2 ^ 1] = 'crouch',
+	[2 ^ 2] = { 'fire', 'vehicle_fire' },
+	[2 ^ 3] = 'sprint',
+	[2 ^ 4] = { 'enter_exit','vehicle_secondary_fire' },
+	[2 ^ 5] = 'jump',
+	[2 ^ 6] = 'vehicle_look_right',
+	[2 ^ 7] = { 'handbrake', 'aim_weapon' },
+	[2 ^ 8] = 'vehicle_look_left',
+	[2 ^ 9] = { 'look_behind', 'sub_mission' },
+	[2 ^ 10] = 'walk',
+	[2 ^ 11] = 'special_control_up',
+	[2 ^ 12] = 'special_control_down',
+	[2 ^ 13] = 'special_control_left',
+	[2 ^ 14] = 'special_control_right',
+	[2 ^ 15] = 'not_used',
+	[2 ^ 16] = 'conversation_yes',
+	[2 ^ 17] = 'conversation_no',
+	[2 ^ 18] = 'group_control_back',
+	[2 ^ 19] = 'enter_passenger', --This one's undefined
 }, controlMappingMT)
 
 g_LeftRightMapping = setmetatable({

amx/server/syscalls.lua

@@ -894,9 +894,14 @@ end
 
 function GetWeaponName(amx, weaponID, buf, len)
 	local name = getWeaponNameFromID(weaponID)
-	if #name < len then
+	if name ~= false and #name < len then
 		writeMemString(amx, buf, name)
+		return 1
+	else
+		writeMemString(amx, buf, '') --I was going to return 'None' in here, but I believe SA-MP just returns a blank string
+		return 0
 	end
+	return 1
 end
 
 function GivePlayerMoney(amx, player, amount)