Merge.
1.1 --- a/gamedata/sdkhooks.games/engine.csgo.txt Fri Mar 22 14:30:29 2013 -0400
1.2 +++ b/gamedata/sdkhooks.games/engine.csgo.txt Fri Mar 22 14:31:30 2013 -0400
1.3 @@ -6,51 +6,51 @@
1.4 {
1.5 "EndTouch"
1.6 {
1.7 - "windows" "102"
1.8 - "linux" "103"
1.9 - "mac" "103"
1.10 + "windows" "103"
1.11 + "linux" "104"
1.12 + "mac" "104"
1.13 }
1.14 "FireBullets"
1.15 {
1.16 - "windows" "115"
1.17 - "linux" "116"
1.18 - "mac" "116"
1.19 + "windows" "116"
1.20 + "linux" "117"
1.21 + "mac" "117"
1.22 }
1.23 "GetMaxHealth"
1.24 {
1.25 - "windows" "119"
1.26 - "linux" "120"
1.27 - "mac" "120"
1.28 + "windows" "120"
1.29 + "linux" "121"
1.30 + "mac" "121"
1.31 }
1.32 "GroundEntChanged"
1.33 {
1.34 - "windows" "173"
1.35 - "linux" "174"
1.36 - "mac" "174"
1.37 + "windows" "174"
1.38 + "linux" "175"
1.39 + "mac" "175"
1.40 }
1.41 "OnTakeDamage"
1.42 {
1.43 - "windows" "66"
1.44 - "linux" "67"
1.45 - "mac" "67"
1.46 + "windows" "67"
1.47 + "linux" "68"
1.48 + "mac" "68"
1.49 }
1.50 "PreThink"
1.51 {
1.52 - "windows" "356"
1.53 - "linux" "357"
1.54 - "mac" "357"
1.55 - }
1.56 - "PostThink"
1.57 - {
1.58 "windows" "357"
1.59 "linux" "358"
1.60 "mac" "358"
1.61 }
1.62 + "PostThink"
1.63 + {
1.64 + "windows" "358"
1.65 + "linux" "359"
1.66 + "mac" "359"
1.67 + }
1.68 "Reload"
1.69 {
1.70 - "windows" "281"
1.71 - "linux" "282"
1.72 - "mac" "282"
1.73 + "windows" "282"
1.74 + "linux" "283"
1.75 + "mac" "283"
1.76 }
1.77 "SetTransmit"
1.78 {
1.79 @@ -72,78 +72,78 @@
1.80 }
1.81 "StartTouch"
1.82 {
1.83 - "windows" "100"
1.84 - "linux" "101"
1.85 - "mac" "101"
1.86 - }
1.87 - "Think"
1.88 - {
1.89 - "windows" "50"
1.90 - "linux" "51"
1.91 - "mac" "51"
1.92 - }
1.93 - "Touch"
1.94 - {
1.95 "windows" "101"
1.96 "linux" "102"
1.97 "mac" "102"
1.98 }
1.99 + "Think"
1.100 + {
1.101 + "windows" "51"
1.102 + "linux" "52"
1.103 + "mac" "52"
1.104 + }
1.105 + "Touch"
1.106 + {
1.107 + "windows" "102"
1.108 + "linux" "103"
1.109 + "mac" "103"
1.110 + }
1.111 "TraceAttack"
1.112 {
1.113 - "windows" "64"
1.114 - "linux" "65"
1.115 - "mac" "65"
1.116 + "windows" "65"
1.117 + "linux" "66"
1.118 + "mac" "66"
1.119 }
1.120 "Use"
1.121 {
1.122 - "windows" "99"
1.123 - "linux" "100"
1.124 - "mac" "100"
1.125 + "windows" "100"
1.126 + "linux" "101"
1.127 + "mac" "101"
1.128 }
1.129 "VPhysicsUpdate"
1.130 {
1.131 - "windows" "152"
1.132 - "linux" "153"
1.133 - "mac" "153"
1.134 + "windows" "153"
1.135 + "linux" "154"
1.136 + "mac" "154"
1.137 }
1.138 "Weapon_CanSwitchTo"
1.139 {
1.140 - "windows" "281"
1.141 - "linux" "282"
1.142 - "mac" "282"
1.143 + "windows" "282"
1.144 + "linux" "283"
1.145 + "mac" "283"
1.146 }
1.147 "Weapon_CanUse"
1.148 {
1.149 - "windows" "275"
1.150 - "linux" "276"
1.151 - "mac" "276"
1.152 - }
1.153 - "Weapon_Drop"
1.154 - {
1.155 - "windows" "278"
1.156 - "linux" "279"
1.157 - "mac" "279"
1.158 - }
1.159 - "Weapon_Equip"
1.160 - {
1.161 "windows" "276"
1.162 "linux" "277"
1.163 "mac" "277"
1.164 }
1.165 - "Weapon_Switch"
1.166 + "Weapon_Drop"
1.167 {
1.168 "windows" "279"
1.169 "linux" "280"
1.170 "mac" "280"
1.171 }
1.172 + "Weapon_Equip"
1.173 + {
1.174 + "windows" "277"
1.175 + "linux" "278"
1.176 + "mac" "278"
1.177 + }
1.178 + "Weapon_Switch"
1.179 + {
1.180 + "windows" "280"
1.181 + "linux" "281"
1.182 + "mac" "281"
1.183 + }
1.184
1.185
1.186 // no longer used
1.187 "UpdateOnRemove"
1.188 {
1.189 - "windows" "108"
1.190 - "linux" "109"
1.191 - "mac" "109"
1.192 + "windows" "109"
1.193 + "linux" "110"
1.194 + "mac" "110"
1.195 }
1.196 //
1.197 }
2.1 --- a/gamedata/sdktools.games/engine.csgo.txt Fri Mar 22 14:30:29 2013 -0400
2.2 +++ b/gamedata/sdktools.games/engine.csgo.txt Fri Mar 22 14:31:30 2013 -0400
2.3 @@ -239,63 +239,63 @@
2.4 {
2.5 "GiveNamedItem"
2.6 {
2.7 - "windows" "435"
2.8 - "linux" "436"
2.9 - "mac" "436"
2.10 + "windows" "436"
2.11 + "linux" "437"
2.12 + "mac" "437"
2.13 }
2.14 "RemovePlayerItem"
2.15 {
2.16 - "windows" "285"
2.17 - "linux" "286"
2.18 - "mac" "286"
2.19 + "windows" "286"
2.20 + "linux" "287"
2.21 + "mac" "287"
2.22 }
2.23 "Weapon_GetSlot"
2.24 {
2.25 - "windows" "283"
2.26 - "linux" "284"
2.27 - "mac" "284"
2.28 + "windows" "284"
2.29 + "linux" "285"
2.30 + "mac" "285"
2.31 }
2.32 "Ignite"
2.33 {
2.34 - "windows" "219"
2.35 - "linux" "220"
2.36 - "mac" "220"
2.37 + "windows" "220"
2.38 + "linux" "221"
2.39 + "mac" "221"
2.40 }
2.41 "Extinguish"
2.42 {
2.43 - "windows" "222"
2.44 - "linux" "223"
2.45 - "mac" "223"
2.46 + "windows" "223"
2.47 + "linux" "224"
2.48 + "mac" "224"
2.49 }
2.50 "Teleport"
2.51 {
2.52 - "windows" "111"
2.53 - "linux" "112"
2.54 - "mac" "112"
2.55 + "windows" "112"
2.56 + "linux" "113"
2.57 + "mac" "113"
2.58 }
2.59 "CommitSuicide"
2.60 {
2.61 - "windows" "485"
2.62 - "linux" "485"
2.63 - "mac" "485"
2.64 + "windows" "486"
2.65 + "linux" "486"
2.66 + "mac" "486"
2.67 }
2.68 "GetVelocity"
2.69 {
2.70 - "windows" "136"
2.71 - "linux" "137"
2.72 - "mac" "137"
2.73 + "windows" "137"
2.74 + "linux" "138"
2.75 + "mac" "138"
2.76 }
2.77 "EyeAngles"
2.78 {
2.79 - "windows" "127"
2.80 - "linux" "128"
2.81 - "mac" "128"
2.82 + "windows" "128"
2.83 + "linux" "129"
2.84 + "mac" "129"
2.85 }
2.86 "AcceptInput"
2.87 {
2.88 - "windows" "39"
2.89 - "linux" "40"
2.90 - "mac" "40"
2.91 + "windows" "40"
2.92 + "linux" "41"
2.93 + "mac" "41"
2.94 }
2.95 "SetEntityModel"
2.96 {
2.97 @@ -305,21 +305,21 @@
2.98 }
2.99 "WeaponEquip"
2.100 {
2.101 - "windows" "276"
2.102 - "linux" "277"
2.103 - "mac" "277"
2.104 + "windows" "277"
2.105 + "linux" "278"
2.106 + "mac" "278"
2.107 }
2.108 "Activate"
2.109 {
2.110 - "windows" "36"
2.111 - "linux" "37"
2.112 - "mac" "37"
2.113 + "windows" "37"
2.114 + "linux" "38"
2.115 + "mac" "38"
2.116 }
2.117 "PlayerRunCmd"
2.118 {
2.119 - "windows" "455"
2.120 - "linux" "456"
2.121 - "mac" "456"
2.122 + "windows" "456"
2.123 + "linux" "457"
2.124 + "mac" "457"
2.125 }
2.126 }
2.127 }
