Merge.
Merge.
1.1 --- a/gamedata/sdkhooks.games/engine.ep2v.txt Fri Mar 29 12:35:56 2013 -0700
1.2 +++ b/gamedata/sdkhooks.games/engine.ep2v.txt Fri Mar 29 15:45:55 2013 -0400
1.3 @@ -7,7 +7,6 @@
1.4 {
1.5 "game" "tf"
1.6 "game" "hl2mp"
1.7 - "game" "dod"
1.8 }
1.9
1.10 "Offsets"
1.11 @@ -144,29 +143,6 @@
1.12 "linux" "263"
1.13 "mac" "263"
1.14 }
1.15 -
1.16 -
1.17 - // no longer used
1.18 - "UpdateOnRemove"
1.19 - {
1.20 - "windows" "104"
1.21 - "linux" "105"
1.22 - "mac" "105"
1.23 - }
1.24 - //
1.25 - }
1.26 -
1.27 - "Signatures"
1.28 - {
1.29 - // no longer used
1.30 - "IEntityFactoryDictionary"
1.31 - {
1.32 - "library" "server"
1.33 - "windows" "\xB8\x01\x00\x00\x00\x84\x2A\x2A\x2A\x2A\x2A\x75\x1D\x09\x2A\x2A\x2A\x2A\x2A\xB9\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x68\x2A\x2A\x2A\x2A\xE8\x2A\x2A\x2A\x2A\x83\xC4\x04\xB8\x2A\x2A\x2A\x2A\xC3"
1.34 - "linux" "@_Z23EntityFactoryDictionaryv"
1.35 - "mac" "@_Z23EntityFactoryDictionaryv"
1.36 - }
1.37 - //
1.38 }
1.39 }
1.40
1.41 @@ -187,4 +163,143 @@
1.42 }
1.43 }
1.44 }
1.45 +
1.46 + "dod"
1.47 + {
1.48 + "Offsets"
1.49 + {
1.50 + "EndTouch"
1.51 + {
1.52 + "windows" "100"
1.53 + "linux" "101"
1.54 + "mac" "101"
1.55 + }
1.56 + "FireBullets"
1.57 + {
1.58 + "windows" "112"
1.59 + "linux" "113"
1.60 + "mac" "113"
1.61 + }
1.62 + "GetMaxHealth"
1.63 + {
1.64 + "windows" "117"
1.65 + "linux" "118"
1.66 + "mac" "118"
1.67 + }
1.68 + "GroundEntChanged"
1.69 + {
1.70 + "windows" "177"
1.71 + "linux" "178"
1.72 + "mac" "178"
1.73 + }
1.74 + "OnTakeDamage"
1.75 + {
1.76 + "windows" "62"
1.77 + "linux" "63"
1.78 + "mac" "63"
1.79 + }
1.80 + "PreThink"
1.81 + {
1.82 + "windows" "331"
1.83 + "linux" "332"
1.84 + "mac" "332"
1.85 + }
1.86 + "PostThink"
1.87 + {
1.88 + "windows" "332"
1.89 + "linux" "333"
1.90 + "mac" "333"
1.91 + }
1.92 + "Reload"
1.93 + {
1.94 + "windows" "274"
1.95 + "linux" "275"
1.96 + "mac" "275"
1.97 + }
1.98 + "SetTransmit"
1.99 + {
1.100 + "windows" "20"
1.101 + "linux" "21"
1.102 + "mac" "21"
1.103 + }
1.104 + "ShouldCollide"
1.105 + {
1.106 + "windows" "16"
1.107 + "linux" "17"
1.108 + "mac" "17"
1.109 + }
1.110 + "Spawn"
1.111 + {
1.112 + "windows" "22"
1.113 + "linux" "23"
1.114 + "mac" "23"
1.115 + }
1.116 + "StartTouch"
1.117 + {
1.118 + "windows" "98"
1.119 + "linux" "99"
1.120 + "mac" "99"
1.121 + }
1.122 + "Think"
1.123 + {
1.124 + "windows" "47"
1.125 + "linux" "48"
1.126 + "mac" "48"
1.127 + }
1.128 + "Touch"
1.129 + {
1.130 + "windows" "99"
1.131 + "linux" "100"
1.132 + "mac" "100"
1.133 + }
1.134 + "TraceAttack"
1.135 + {
1.136 + "windows" "60"
1.137 + "linux" "61"
1.138 + "mac" "61"
1.139 + }
1.140 + "Use"
1.141 + {
1.142 + "windows" "97"
1.143 + "linux" "98"
1.144 + "mac" "98"
1.145 + }
1.146 + "VPhysicsUpdate"
1.147 + {
1.148 + "windows" "157"
1.149 + "linux" "158"
1.150 + "mac" "158"
1.151 + }
1.152 + "Weapon_CanSwitchTo"
1.153 + {
1.154 + "windows" "265"
1.155 + "linux" "266"
1.156 + "mac" "266"
1.157 + }
1.158 + "Weapon_CanUse"
1.159 + {
1.160 + "windows" "259"
1.161 + "linux" "260"
1.162 + "mac" "260"
1.163 + }
1.164 + "Weapon_Drop"
1.165 + {
1.166 + "windows" "262"
1.167 + "linux" "263"
1.168 + "mac" "263"
1.169 + }
1.170 + "Weapon_Equip"
1.171 + {
1.172 + "windows" "260"
1.173 + "linux" "261"
1.174 + "mac" "261"
1.175 + }
1.176 + "Weapon_Switch"
1.177 + {
1.178 + "windows" "263"
1.179 + "linux" "264"
1.180 + "mac" "264"
1.181 + }
1.182 + }
1.183 + }
1.184 }
1.185 \ No newline at end of file
2.1 --- a/gamedata/sdktools.games/game.dod.txt Fri Mar 29 12:35:56 2013 -0700
2.2 +++ b/gamedata/sdktools.games/game.dod.txt Fri Mar 29 15:45:55 2013 -0400
2.3 @@ -18,57 +18,57 @@
2.4 {
2.5 "GiveNamedItem"
2.6 {
2.7 - "windows" "398"
2.8 - "linux" "399"
2.9 - "mac" "399"
2.10 + "windows" "399"
2.11 + "linux" "400"
2.12 + "mac" "400"
2.13 }
2.14 "RemovePlayerItem"
2.15 {
2.16 - "windows" "268"
2.17 - "linux" "269"
2.18 - "mac" "269"
2.19 + "windows" "269"
2.20 + "linux" "270"
2.21 + "mac" "270"
2.22 }
2.23 "Weapon_GetSlot"
2.24 {
2.25 - "windows" "266"
2.26 - "linux" "267"
2.27 - "mac" "267"
2.28 + "windows" "267"
2.29 + "linux" "268"
2.30 + "mac" "268"
2.31 }
2.32 "Ignite"
2.33 {
2.34 - "windows" "207"
2.35 - "linux" "208"
2.36 - "mac" "208"
2.37 + "windows" "208"
2.38 + "linux" "209"
2.39 + "mac" "209"
2.40 }
2.41 "Extinguish"
2.42 {
2.43 - "windows" "211"
2.44 - "linux" "212"
2.45 - "mac" "212"
2.46 + "windows" "212"
2.47 + "linux" "213"
2.48 + "mac" "213"
2.49 }
2.50 "Teleport"
2.51 {
2.52 - "windows" "107"
2.53 - "linux" "108"
2.54 - "mac" "108"
2.55 + "windows" "108"
2.56 + "linux" "109"
2.57 + "mac" "109"
2.58 }
2.59 "CommitSuicide"
2.60 {
2.61 - "windows" "436"
2.62 - "linux" "437"
2.63 - "mac" "437"
2.64 + "windows" "437"
2.65 + "linux" "438"
2.66 + "mac" "438"
2.67 }
2.68 "GetVelocity"
2.69 {
2.70 - "windows" "139"
2.71 - "linux" "140"
2.72 - "mac" "140"
2.73 + "windows" "140"
2.74 + "linux" "141"
2.75 + "mac" "141"
2.76 }
2.77 "EyeAngles"
2.78 {
2.79 - "windows" "130"
2.80 - "linux" "131"
2.81 - "mac" "131"
2.82 + "windows" "131"
2.83 + "linux" "132"
2.84 + "mac" "132"
2.85 }
2.86 "AcceptInput"
2.87 {
2.88 @@ -84,9 +84,9 @@
2.89 }
2.90 "WeaponEquip"
2.91 {
2.92 - "windows" "259"
2.93 - "linux" "260"
2.94 - "mac" "260"
2.95 + "windows" "260"
2.96 + "linux" "261"
2.97 + "mac" "261"
2.98 }
2.99 "Activate"
2.100 {
2.101 @@ -96,9 +96,9 @@
2.102 }
2.103 "PlayerRunCmd"
2.104 {
2.105 - "windows" "416"
2.106 - "linux" "417"
2.107 - "mac" "417"
2.108 + "windows" "417"
2.109 + "linux" "418"
2.110 + "mac" "418"
2.111 }
2.112 }
2.113