Merge branch 'master' of github.com:alliedmodders/sourcemod

This commit is contained in:
Ruben Gonzalez 2017-05-24 08:41:53 -04:00
commit 946150c8a2
4 changed files with 18 additions and 16 deletions

View File

@ -17,6 +17,7 @@
"#supported" "#supported"
{ {
"game" "swarm" "game" "swarm"
"game" "reactivedrop"
} }
"Offsets" "Offsets"

View File

@ -26,15 +26,15 @@
} }
"OnTakeDamage_Alive" "OnTakeDamage_Alive"
{ {
"windows" "279" "windows" "280"
} }
"PreThink" "PreThink"
{ {
"windows" "339" "windows" "340"
} }
"PostThink" "PostThink"
{ {
"windows" "340" "windows" "341"
} }
"SetTransmit" "SetTransmit"
{ {
@ -78,23 +78,23 @@
} }
"Weapon_CanSwitchTo" "Weapon_CanSwitchTo"
{ {
"windows" "273" "windows" "274"
} }
"Weapon_CanUse" "Weapon_CanUse"
{ {
"windows" "267" "windows" "268"
} }
"Weapon_Drop" "Weapon_Drop"
{ {
"windows" "270" "windows" "271"
} }
"Weapon_Equip" "Weapon_Equip"
{ {
"windows" "268" "windows" "269"
} }
"Weapon_Switch" "Weapon_Switch"
{ {
"windows" "271" "windows" "272"
} }
} }
} }

View File

@ -18,15 +18,15 @@
{ {
"GiveNamedItem" "GiveNamedItem"
{ {
"windows" "407" "windows" "408"
} }
"RemovePlayerItem" "RemovePlayerItem"
{ {
"windows" "277" "windows" "278"
} }
"Weapon_GetSlot" "Weapon_GetSlot"
{ {
"windows" "275" "windows" "276"
} }
"Ignite" "Ignite"
{ {
@ -42,7 +42,7 @@
} }
"CommitSuicide" "CommitSuicide"
{ {
"windows" "446" "windows" "447"
} }
"GetVelocity" "GetVelocity"
{ {
@ -62,7 +62,7 @@
} }
"WeaponEquip" "WeaponEquip"
{ {
"windows" "268" "windows" "269"
} }
"Activate" "Activate"
{ {
@ -70,11 +70,11 @@
} }
"PlayerRunCmd" "PlayerRunCmd"
{ {
"windows" "425" "windows" "426"
} }
"GiveAmmo" "GiveAmmo"
{ {
"windows" "259" "windows" "260"
} }
} }
@ -93,7 +93,7 @@
"FireOutput" "FireOutput"
{ {
"library" "server" "library" "server"
"windows" "\x55\x8B\xEC\x83\xE4\xC0\x81\xEC\x34\x01\x00\x00\xA1\x2A\x2A\x2A\x2A\x33\xC4\x89\x84\x24\x30\x01\x00\x00\x53\x8B\x5D\x20" "windows" "\x55\x8B\xEC\x83\xE4\xC0\x81\xEC\x34\x01\x00\x00\xA1\x2A\x2A\x2A\x2A\x33\xC4\x89\x84\x24\x30\x01\x00\x00\x8B\xC1"
} }
} }
} }

View File

@ -64,6 +64,7 @@ public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max
|| StrEqual(game, "garrysmod", false) || StrEqual(game, "garrysmod", false)
|| StrEqual(game, "swarm", false) || StrEqual(game, "swarm", false)
|| StrEqual(game, "bms", false) || StrEqual(game, "bms", false)
|| StrEqual(game, "reactivedrop", false)
|| GetEngineVersion() == Engine_Insurgency) || GetEngineVersion() == Engine_Insurgency)
{ {
strcopy(error, err_max, "Nextmap is incompatible with this game"); strcopy(error, err_max, "Nextmap is incompatible with this game");