Merged changes from official Metamod 1.20.
authorScott Ehlert <ds@alliedmods.net>
Fri Mar 15 15:01:19 2013 -0500 (2013-03-15)
changeset 275f62b46dcf019
parent 274 194308bba518
child 276 e71bc95bf583
Merged changes from official Metamod 1.20.
doc/Changelog
doc/html/metamod.html
doc/html/release_notes.html
doc/html/supportedmods.html
doc/txt/metamod.txt
doc/txt/release_notes.txt
doc/txt/supportedmods.txt
metamod/ents/hl15we
metamod/ents/stargatetc
metamod/game_support.cpp
metamod/games.h
metamod/info_name.h
metamod/linkgame.cpp
metamod/vers_meta.h
     1.1 --- a/doc/Changelog	Fri Mar 15 14:59:27 2013 -0500
     1.2 +++ b/doc/Changelog	Fri Mar 15 15:01:19 2013 -0500
     1.3 @@ -1,5 +1,14 @@
     1.4  # vim: set tw=75 ft=none :
     1.5  
     1.6 +2013-02-16 1.20
     1.7 + - Changed loading of Linux game dll to first try to find the dll under
     1.8 +   known name with the last '_*' part stripped out. Falls back to the
     1.9 +   old known name if a file with the stripped name is not found.
    1.10 +
    1.11 +2006/??/?? 1.19.1
    1.12 + - Added Mod support for Half-Life 1.5: Weapon Edition version 1.5.0.5.
    1.13 + - Added additional entities for Stargate TC 1.0g.
    1.14 +
    1.15  2006/04/17 1.19
    1.16   - Added support for new HLSDK API functions QueryClientCvarValue2() and 
    1.17     ClientCvar2(). The helper function IS_QUERYING_CLIENT_CVAR() is now
     2.1 --- a/doc/html/metamod.html	Fri Mar 15 14:59:27 2013 -0500
     2.2 +++ b/doc/html/metamod.html	Fri Mar 15 15:01:19 2013 -0500
     2.3 @@ -21,10 +21,10 @@
     2.4  <li> <b><tt>meta version</tt></b> - displays version information about the 
     2.5  	Metamod instance currently running on the server, ie:
     2.6  	<p>
     2.7 -	<tt>Metamod v1.17   2003/08/01
     2.8 +	<tt>Metamod v1.20   2013-02-16 (5:13)
     2.9  	<br>by Will Day &lt;[email protected]&gt;
    2.10  	<br>http://www.metamod.org/
    2.11 -	<br>compiled: Aug  4 2003, 22:43:33 Eastern (debugging)
    2.12 +	<br>compiled: Feb 16 2013, 02:35:21 +0100 (debugging)
    2.13  	</tt>
    2.14  
    2.15  <p><li> <b><tt>meta list</tt></b> - displays information about the list of 
    2.16 @@ -46,7 +46,7 @@
    2.17  <b><tt>metamod_version</tt></b> that should report the version of Metamod
    2.18  running on the server, ie:
    2.19  	<p>
    2.20 -	<dd><tt>"metamod_version" is "1.17"</tt>
    2.21 +	<dd><tt>"metamod_version" is "1.20"</tt>
    2.22  
    2.23  <a name=installation>
    2.24  <h2>Installation
     3.1 --- a/doc/html/release_notes.html	Fri Mar 15 14:59:27 2013 -0500
     3.2 +++ b/doc/html/release_notes.html	Fri Mar 15 15:01:19 2013 -0500
     3.3 @@ -10,6 +10,32 @@
     3.4  <h1>Release Notes
     3.5  </h1>
     3.6  
     3.7 +<a name=major.1.20>
     3.8 +<h2>Major changes with Metamod 1.20
     3.9 +</h2></a>
    3.10 +<ul>
    3.11 +	<p><li>New versions of HalfLife do not use '_i386' in the names of the
    3.12 +	Linux game dll anymore. Metamod changed the lookup for game dlls in that
    3.13 +	it first tries to strip anything after the last underscore ('_') in the
    3.14 +	game dll and load that dll. If that file does not exist it falls back
    3.15 +	to the old name for backwards compatibility.
    3.16 +	<li>The HalfLife engine employs this stripping of the dll name on the
    3.17 +	setting found in the liblist.gam file, too. That means that it will
    3.18 +	look for metamod.so, even if the liblist.gam file lists
    3.19 +	metamod_i386.so. Unlike Metamod, the engine will not fall back to the
    3.20 +	old name and fail to load Metamod if it can not be found under
    3.21 +	metamod.so. Therefore we are adding a symbolic link to the tarball.
    3.22 +	When you unpack the tarball to your dlls directory you will get a link
    3.23 +	of name metamod.so so that engine loading can work with the newer
    3.24 +	engine, too. Should you install/update your Metamod dll by hand, you
    3.25 +	will need to make sure that a newer engine can find the dll under
    3.26 +	metamod.so, either by renameing the file or by creating a link to it.
    3.27 +	This does only apply to Linux. The Windows file is still called
    3.28 +	metamod.dll.
    3.29 +</ul>
    3.30 +
    3.31 +<hr>
    3.32 +
    3.33  <a name=major.1.19>
    3.34  <h2>Major changes with Metamod 1.19
    3.35  </h2></a>
     4.1 --- a/doc/html/supportedmods.html	Fri Mar 15 14:59:27 2013 -0500
     4.2 +++ b/doc/html/supportedmods.html	Fri Mar 15 15:01:19 2013 -0500
     4.3 @@ -243,6 +243,13 @@
     4.4    <td></td>
     4.5  </tr>
     4.6  <tr>
     4.7 +  <td><a href="http://www.weaponhell.hut1.ru">Half-Life 1.5: Weapon Edition</a></td>
     4.8 +  <td>1.5.0.5</td>
     4.9 +  <td>2006-06-10</td>
    4.10 +  <td><a href="http://metamod.org/dl/metamod/ents/hl15we">[ents]</a></td> <!-- entlist -->
    4.11 +  <td></td>
    4.12 +</tr>
    4.13 +<tr>
    4.14    <td><a href="http://www.hlrally.net/">HL-Rally</a></td>
    4.15    <td>Beta 1.0</td>
    4.16    <td>2003-11-15</td>
    4.17 @@ -482,8 +489,8 @@
    4.18  </tr>
    4.19  <tr>
    4.20    <td><a href="http://www.stargatetc.com/">StargateTC</a></td>
    4.21 -  <td>Beta 1.1</td>
    4.22 -  <td>2004-07-01</td>
    4.23 +  <td>1.0g</td>
    4.24 +  <td>2008-06-01</td>
    4.25    <td><a href="http://metamod.org/dl/metamod/ents/stargatetc">[ents]</a></td> <!-- entlist -->
    4.26    <td></td>
    4.27  </tr>
     5.1 --- a/doc/txt/metamod.txt	Fri Mar 15 14:59:27 2013 -0500
     5.2 +++ b/doc/txt/metamod.txt	Fri Mar 15 15:01:19 2013 -0500
     5.3 @@ -10,10 +10,10 @@
     5.4    - meta version - displays version information about the Metamod instance
     5.5      currently running on the server, ie:
     5.6  
     5.7 -    Metamod v1.17 2003/08/01
     5.8 +    Metamod v1.20 2013-02-16 (5:13)
     5.9      by Will Day <[email protected]>
    5.10      http://www.metamod.org/
    5.11 -    compiled: Aug 4 2003, 22:43:33 Eastern (debugging)
    5.12 +    compiled: Feb 16 2013, 02:35:21 +0100 (debugging)
    5.13  
    5.14    - meta list - displays information about the list of currently running
    5.15      plugins, ie:
    5.16 @@ -31,7 +31,7 @@
    5.17  Also available to client browser applications is a cvar metamod_version
    5.18  that should report the version of Metamod running on the server, ie:
    5.19  
    5.20 -"metamod_version" is "1.17"
    5.21 +"metamod_version" is "1.20"
    5.22  
    5.23  Installation
    5.24  ============
     6.1 --- a/doc/txt/release_notes.txt	Fri Mar 15 14:59:27 2013 -0500
     6.2 +++ b/doc/txt/release_notes.txt	Fri Mar 15 15:01:19 2013 -0500
     6.3 @@ -1,6 +1,30 @@
     6.4  Release Notes
     6.5  =-=-=-=-=-=-=
     6.6  
     6.7 +Major changes with Metamod 1.20
     6.8 +===============================
     6.9 +
    6.10 +  - New versions of HalfLife do not use '_i386' in the names of the Linux
    6.11 +    game dll anymore. Metamod changed the lookup for game dlls in that it
    6.12 +    first tries to strip anything after the last underscore ('_') in the
    6.13 +    game dll and load that dll. If that file does not exist it falls back
    6.14 +    to the old name for backwards compatibility.
    6.15 +  - The HalfLife engine employs this stripping of the dll name on the
    6.16 +    setting found in the liblist.gam file, too. That means that it will
    6.17 +    look for metamod.so, even if the liblist.gam file lists
    6.18 +    metamod_i386.so. Unlike Metamod, the engine will not fall back to the
    6.19 +    old name and fail to load Metamod if it can not be found under
    6.20 +    metamod.so. Therefore we are adding a symbolic link to the tarball.
    6.21 +    When you unpack the tarball to your dlls directory you will get a link
    6.22 +    of name metamod.so so that engine loading can work with the newer
    6.23 +    engine, too. Should you install/update your Metamod dll by hand, you
    6.24 +    will need to make sure that a newer engine can find the dll under
    6.25 +    metamod.so, either by renameing the file or by creating a link to it.
    6.26 +    This does only apply to Linux. The Windows file is still called
    6.27 +    metamod.dll.
    6.28 +
    6.29 +--------------------------------------------------------------------------
    6.30 +
    6.31  Major changes with Metamod 1.19
    6.32  ===============================
    6.33  
     7.1 --- a/doc/txt/supportedmods.txt	Fri Mar 15 14:59:27 2013 -0500
     7.2 +++ b/doc/txt/supportedmods.txt	Fri Mar 15 15:01:19 2013 -0500
     7.3 @@ -103,6 +103,10 @@
     7.4  | Goldeneye                    | v1.9C    | 2002-04-24 |                 |
     7.5  | (www.goldeneye-mod.net)      |          |            |                 |
     7.6  |------------------------------+----------+------------+-----------------|
     7.7 +| Half-Life 1.5: Weapon        |          |            |                 |
     7.8 +| Edition                      | 1.5.0.5  | 2006-06-10 |                 |
     7.9 +| (www.weaponhell.hut1.ru)     |          |            |                 |
    7.10 +|------------------------------+----------+------------+-----------------|
    7.11  | HL-Rally (www.hlrally.net)   | Beta 1.0 | 2003-11-15 |                 |
    7.12  |------------------------------+----------+------------+-----------------|
    7.13  | Holy Wars                    |          |            |                 |
    7.14 @@ -207,7 +211,7 @@
    7.15  | Snow-War                     | 2.0      | 2005-02-04 |                 |
    7.16  | (snowwar.hlgaming.com)       |          |            |                 |
    7.17  |------------------------------+----------+------------+-----------------|
    7.18 -| StargateTC                   | Beta 1.1 | 2004-07-01 |                 |
    7.19 +| StargateTC                   | 1.0g     | 2008-06-01 |                 |
    7.20  | (www.stargatetc.com)         |          |            |                 |
    7.21  |------------------------------+----------+------------+-----------------|
    7.22  | Sven Coop (www.svencoop.com) | v3.0     | 2004-07-01 |                 |
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/metamod/ents/hl15we	Fri Mar 15 15:01:19 2013 -0500
     8.3 @@ -0,0 +1,158 @@
     8.4 +// vim: set ft=cpp :
     8.5 +
     8.6 +// Half-Life 1.5: Weapon Edition
     8.7 +//     http://www.weaponhell.hut1.ru
     8.8 +//
     8.9 +// Game directory: hl15we
    8.10 +// Win32 DLL name: hl.dll
    8.11 +// Linux DSO name: hl_i386.so
    8.12 +
    8.13 +// Version 1.5.0.5
    8.14 +//
    8.15 +// From: "Ghoul [BB]" <ghoul-BB (AT) yandex (DOT) ru>
    8.16 +// Date: Mon, 22 May 2006 01:07:46 +0400 (MSD)
    8.17 +//
    8.18 +ak74grenade
    8.19 +ammo_10mmbuckshot
    8.20 +ammo_10mmbuckshotbox
    8.21 +ammo_127mm
    8.22 +ammo_12g
    8.23 +ammo_2mm
    8.24 +ammo_30mm
    8.25 +ammo_338Magnum
    8.26 +ammo_357SIG
    8.27 +ammo_45ACP
    8.28 +ammo_45cal
    8.29 +ammo_50AE
    8.30 +ammo_556Nato
    8.31 +ammo_762Magnum
    8.32 +ammo_762Nato
    8.33 +ammo_762x54
    8.34 +ammo_86mm
    8.35 +ammo_8mm
    8.36 +ammo_Dmissile
    8.37 +ammo_EnergyCells
    8.38 +ammo_GluonCells
    8.39 +ammo_MicroFusionCells
    8.40 +ammo_NGgrenades
    8.41 +ammo_ShockCore
    8.42 +ammo_ShockGrenade
    8.43 +ammo_SunOfGod
    8.44 +ammo_ak74grenades
    8.45 +ammo_bfg
    8.46 +ammo_cell
    8.47 +ammo_cgrenade
    8.48 +ammo_cpc
    8.49 +ammo_fuel
    8.50 +ammo_hellfire
    8.51 +ammo_isotope
    8.52 +ammo_minimissile
    8.53 +ammo_nails
    8.54 +ammo_nuke
    8.55 +ammo_quad
    8.56 +ammo_shrapnel
    8.57 +ammo_slugs
    8.58 +ammo_stormcell
    8.59 +ammo_uranium235
    8.60 +ammo_uranium238
    8.61 +ammo_xbolts
    8.62 +bbody
    8.63 +black_hole
    8.64 +chronoclip
    8.65 +clbaby
    8.66 +clmomma
    8.67 +dispball
    8.68 +env_fog
    8.69 +flak_bomb
    8.70 +flak_shard
    8.71 +flame
    8.72 +frostball
    8.73 +func_buyzone
    8.74 +func_tank_gauss
    8.75 +gluon
    8.76 +gluon2
    8.77 +hegrenade
    8.78 +hellfire
    8.79 +iflame
    8.80 +incendiary_rocket
    8.81 +info_money_start
    8.82 +item_PowerShield
    8.83 +item_antigrav
    8.84 +item_cloak
    8.85 +item_kevlar
    8.86 +item_money
    8.87 +item_moneycase
    8.88 +item_portableHEV
    8.89 +item_portableHealthkit
    8.90 +item_pt
    8.91 +lgtng_ball
    8.92 +m203grenade
    8.93 +nggrenade
    8.94 +nuke
    8.95 +nuke_rocket
    8.96 +plasma
    8.97 +plasma2
    8.98 +pshield_det
    8.99 +pulse
   8.100 +rain_modify
   8.101 +rain_settings
   8.102 +rrp
   8.103 +shock
   8.104 +shockH
   8.105 +shockcore
   8.106 +sstrike
   8.107 +sunofgod
   8.108 +teleenter
   8.109 +teslagren
   8.110 +weapon_30mmsg
   8.111 +weapon_ak74
   8.112 +weapon_akimbogun
   8.113 +weapon_assaultminigun
   8.114 +weapon_autoshotgun
   8.115 +weapon_awp
   8.116 +weapon_bandsaw
   8.117 +weapon_barett
   8.118 +weapon_beamgun
   8.119 +weapon_bfg
   8.120 +weapon_blaster
   8.121 +weapon_c4
   8.122 +weapon_chronosceptor
   8.123 +weapon_deagle
   8.124 +weapon_devastator
   8.125 +weapon_flakcannon
   8.126 +weapon_flamethrower
   8.127 +weapon_flashbang
   8.128 +weapon_froster
   8.129 +weapon_g11
   8.130 +weapon_gluongun
   8.131 +weapon_hegrenade
   8.132 +weapon_incendiary
   8.133 +weapon_lightsaber
   8.134 +weapon_m16
   8.135 +weapon_m249
   8.136 +weapon_m3
   8.137 +weapon_m40a1
   8.138 +weapon_m72
   8.139 +weapon_medkit
   8.140 +weapon_minigun
   8.141 +weapon_nailgun
   8.142 +weapon_photongun
   8.143 +weapon_plasmarifle
   8.144 +weapon_pulserifle
   8.145 +weapon_redeemer
   8.146 +weapon_satellite
   8.147 +weapon_shieldgun
   8.148 +weapon_sledgehammer
   8.149 +weapon_smartgun
   8.150 +weapon_svd
   8.151 +weapon_taucannon
   8.152 +weapon_teslagun
   8.153 +weapon_turret
   8.154 +weapon_u2
   8.155 +weapon_usp
   8.156 +weapon_uzi
   8.157 +weapon_whl
   8.158 +weapon_xbow
   8.159 +wh
   8.160 +whshard
   8.161 +xbowbolt
     9.1 --- a/metamod/ents/stargatetc	Fri Mar 15 14:59:27 2013 -0500
     9.2 +++ b/metamod/ents/stargatetc	Fri Mar 15 15:01:19 2013 -0500
     9.3 @@ -128,3 +128,35 @@
     9.4  zatarc_proj
     9.5  zone_gatetravel
     9.6  zone_shelter
     9.7 +
     9.8 +//
     9.9 +// Version 1.0g
    9.10 +//
    9.11 +// From: "Paul McGinniss" <[email protected]>
    9.12 +// Date: Fri, 30 May 2008 09:40:32 +1000
    9.13 +//
    9.14 +big_lance_proj
    9.15 +entity_spawn_round
    9.16 +env_fog
    9.17 +env_model
    9.18 +info_cap_rules
    9.19 +info_marker
    9.20 +info_observer
    9.21 +info_radar_block
    9.22 +mode_relay
    9.23 +monster_implanted
    9.24 +monster_skull
    9.25 +special_teleport_in
    9.26 +struct_goa
    9.27 +struct_goa_actual
    9.28 +struct_goa_actual_sub
    9.29 +struct_tau
    9.30 +struct_tau_actual
    9.31 +struct_tau_actual_sub
    9.32 +temp_eject
    9.33 +weapon_c4
    9.34 +weapon_glstaff
    9.35 +weapon_spas
    9.36 +weapon_usas
    9.37 +zone_bomb_target
    9.38 +zone_capture
    10.1 --- a/metamod/game_support.cpp	Fri Mar 15 14:59:27 2013 -0500
    10.2 +++ b/metamod/game_support.cpp	Fri Mar 15 15:01:19 2013 -0500
    10.3 @@ -4,7 +4,7 @@
    10.4  // game_support.cpp - info to recognize different HL mod "games"
    10.5  
    10.6  /*
    10.7 - * Copyright (c) 2001-2003 Will Day <[email protected]>
    10.8 + * Copyright (c) 2001-2013 Will Day <[email protected]>
    10.9   *
   10.10   *    This file is part of Metamod.
   10.11   *
   10.12 @@ -98,7 +98,8 @@
   10.13  	
   10.14  		// Writing the file was not successfull
   10.15  		if(length_out != length_in) {
   10.16 -			META_DEBUG(3,("Installing gamedll from chache: Failed to write all %d bytes to file, only %d written: %s\n", length_in, length_out, strerror(errno)) );
   10.17 +			META_DEBUG(3,("Installing gamedll from chache: Failed to write all %d bytes to file, only %d written: %s\n",
   10.18 +							length_in, length_out, strerror(errno)) );
   10.19  			// Let's not leave a mess but clean up nicely.
   10.20  			if (length_out >= 0) unlink(to);
   10.21  			return mFALSE;
   10.22 @@ -124,7 +125,9 @@
   10.23  	static char override_desc_buf[256];
   10.24  	game_modinfo_t *known;
   10.25  	const char *cp;
   10.26 -	char *knownfn = NULL;
   10.27 +	const char *knownfn = 0;
   10.28 +	const char *usedfn = 0;
   10.29 +	char *strippedfn = 0;
   10.30  	int override=0;
   10.31  
   10.32  	// Check for old-style "metagame.ini" file and complain.
   10.33 @@ -171,36 +174,74 @@
   10.34  	}
   10.35  	// Else use Auto-detect dll.
   10.36  	else {
   10.37 -		// Again, as above, I abuse the real_pathname member to store the full pathname
   10.38 -		// and the pathname member to store the relative name to pass it to the 
   10.39 -		// install_gamedll function to save stack space. They are going
   10.40 -		// to get overwritten later on, so that's ok.
   10.41 -		snprintf(gamedll->pathname, sizeof(gamedll->pathname), "dlls/%s", 
   10.42 -				knownfn);
   10.43 -		// Check if the gamedll file exists. If not, try to install it from
   10.44 -		// the cache.
   10.45 -		mBOOL ok = mTRUE;
   10.46 -		if(!valid_gamedir_file(gamedll->pathname)) {
   10.47 -			snprintf(gamedll->real_pathname, sizeof(gamedll->real_pathname), "%s/dlls/%s", 
   10.48 -					gamedll->gamedir, knownfn);
   10.49 -			ok = install_gamedll(gamedll->pathname, gamedll->real_pathname);
   10.50 +#ifdef linux
   10.51 +		// The engine changed game dll lookup behaviour in that it strips
   10.52 +		// anything after the last '_' from the name and tries to load the
   10.53 +		// resulting name. The DSO names were changed and do not have the
   10.54 +		// '_i386' part in them anymore, so cs_i386.so became cs.so. We
   10.55 +		// have to adapt to that and try to load the DSO name without the
   10.56 +		// '_*' part first, to see if we have a new version file available.
   10.57 +
   10.58 +		strippedfn = strdup(knownfn);
   10.59 +
   10.60 +		char *loc = strrchr(strippedfn, '_');
   10.61 +
   10.62 +		// A small safety net here: make sure that we are dealing with
   10.63 +		// a file name at least four characters long and ending in
   10.64 +		// '.so'. This way we can be sure that we can safely overwrite
   10.65 +		// anything from the '_' on with '.so'.
   10.66 +		int size = 0;
   10.67 +		const char *ext;
   10.68 +		if(0 != loc) {
   10.69 +			size = strlen(strippedfn);
   10.70 +			ext = strippedfn + (size - 3);
   10.71  		}
   10.72  
   10.73 -		// If the file still doesn't exist, and knownfn has an "_i386.so"
   10.74 -		// in it, try to strip the _i386.so out.
   10.75 -		if (!ok) {
   10.76 -			if (char *loc = strstr(knownfn, "_i386.so")) {
   10.77 -				strcpy(loc, ".so");
   10.78 -				snprintf(gamedll->pathname, sizeof(gamedll->pathname), "dlls/%s", knownfn);
   10.79 -				snprintf(gamedll->real_pathname, sizeof(gamedll->real_pathname),
   10.80 +		if(0 != loc && size > 3 && 0 == strcasecmp(ext, ".so")) {
   10.81 +			
   10.82 +			strcpy(loc, ".so");
   10.83 +			META_DEBUG(4, ("Checking for new version game DLL name '%s'.\n", strippedfn) );
   10.84 +
   10.85 +			// Again, as above, I abuse the real_pathname member to store the full pathname
   10.86 +			// and the pathname member to store the relative name to pass it to the 
   10.87 +			// install_gamedll function to save stack space. They are going
   10.88 +			// to get overwritten later on, so that's ok.
   10.89 +			snprintf(gamedll->pathname, sizeof(gamedll->pathname), "dlls/%s", 
   10.90 +					 strippedfn);
   10.91 +			// Check if the gamedll file exists. If not, try to install it from
   10.92 +			// the cache.
   10.93 +			mBOOL ok = mTRUE;
   10.94 +			if(!valid_gamedir_file(gamedll->pathname)) {
   10.95 +				snprintf(gamedll->real_pathname, sizeof(gamedll->real_pathname), "%s/dlls/%s", 
   10.96 +						 gamedll->gamedir, strippedfn);
   10.97 +				ok = install_gamedll(gamedll->pathname, gamedll->real_pathname);
   10.98 +			}
   10.99 +			if(ok) usedfn = strippedfn;
  10.100 +		}
  10.101 +		else {
  10.102 +			META_DEBUG(4, ("Known game DLL name does not qualify for checking for a stripped version, skipping: '%s'.\n",
  10.103 +							strippedfn) );
  10.104 +		}
  10.105 +#endif /* linux */
  10.106 +
  10.107 +		// If no file to be used was found, try the old known DLL file
  10.108 +		// name.
  10.109 +		if (0 == usedfn) {
  10.110 +			META_DEBUG(4, ("Checking for old version game DLL name '%s'.\n", knownfn) );
  10.111 +			snprintf(gamedll->pathname, sizeof(gamedll->pathname), "dlls/%s", knownfn);
  10.112 +			// Check if the gamedll file exists. If not, try to install it from
  10.113 +			// the cache.
  10.114 +			if(!valid_gamedir_file(gamedll->pathname)) {
  10.115 +				snprintf(gamedll->real_pathname, sizeof(gamedll->real_pathname), "%s/dlls/%s", 
  10.116  						gamedll->gamedir, knownfn);
  10.117  				install_gamedll(gamedll->pathname, gamedll->real_pathname);
  10.118  			}
  10.119 +			usedfn = knownfn;
  10.120  		}
  10.121  
  10.122  		// Now make an absolute path
  10.123  		snprintf(gamedll->pathname, sizeof(gamedll->pathname), "%s/dlls/%s", 
  10.124 -				gamedll->gamedir, knownfn);
  10.125 +				gamedll->gamedir, usedfn);
  10.126  	}
  10.127  
  10.128  	// get filename from pathname
  10.129 @@ -213,7 +254,7 @@
  10.130  	// gamedir, in case it differs from the "override" dll path.
  10.131  	if(known && override)
  10.132  		snprintf(gamedll->real_pathname, sizeof(gamedll->real_pathname),
  10.133 -				"%s/dlls/%s", gamedll->gamedir, knownfn);
  10.134 +				"%s/dlls/%s", gamedll->gamedir, usedfn);
  10.135  	else // !known or !override
  10.136  		STRNCPY(gamedll->real_pathname, gamedll->pathname, 
  10.137  				sizeof(gamedll->real_pathname));
  10.138 @@ -233,7 +274,7 @@
  10.139  				gamedll->file);
  10.140  	}
  10.141  
  10.142 -	free(knownfn);
  10.143 +	if(0 != strippedfn) free(strippedfn);
  10.144  
  10.145  	return(mTRUE);
  10.146  }
    11.1 --- a/metamod/games.h	Fri Mar 15 14:59:27 2013 -0500
    11.2 +++ b/metamod/games.h	Fri Mar 15 15:01:19 2013 -0500
    11.3 @@ -4,7 +4,7 @@
    11.4  // games.h - list of supported game mods and their data
    11.5   
    11.6  /*
    11.7 - * Copyright (c) 2001-2006 Will Day <[email protected]>
    11.8 + * Copyright (c) 2001-2008 Will Day <[email protected]>
    11.9   *
   11.10   *    This file is part of Metamod.
   11.11   *
   11.12 @@ -74,6 +74,7 @@
   11.13  {"gearbox",        "opfor"MODARCH".so",      "opfor.dll",      "opfor.dylib",     "Opposing Force"},
   11.14  {"globalwarfare",  "gw"MODARCH".so",         "mp.dll",         "none",            "Global Warfare"},
   11.15  {"goldeneye",      "golden"MODARCH".so",     "mp.dll",         "none",            "Goldeneye"},
   11.16 +{"hl15we",         "hl"MODARCH".so",         "hl.dll",         "none",            "Half-Life 1.5: Weapon Edition"},
   11.17  {"hlrally",        "hlr"MODARCH".so",        "hlrally.dll",    "none",            "HL-Rally"},
   11.18  {"holywars",       "hl"MODARCH".so",         "holywars.dll",   "none",            "Holy Wars"},
   11.19  {"hostileintent",  "hl"MODARCH".so",         "hl.dll",         "none",            "Hostile Intent"},
    12.1 --- a/metamod/info_name.h	Fri Mar 15 14:59:27 2013 -0500
    12.2 +++ b/metamod/info_name.h	Fri Mar 15 15:01:19 2013 -0500
    12.3 @@ -4,7 +4,7 @@
    12.4  // info_name.h - name, desc, author, etc
    12.5  
    12.6  /*
    12.7 - * Copyright (c) 2001-2004 Will Day <[email protected]>
    12.8 + * Copyright (c) 2001-2013 Will Day <[email protected]>
    12.9   *
   12.10   *    This file is part of Metamod.
   12.11   *
   12.12 @@ -43,7 +43,7 @@
   12.13  #define VAUTHOR		"Will Day <[email protected]>"
   12.14  #define VURL		"http://www.metamod.org/"
   12.15  
   12.16 -#define COPYRIGHT_YEAR "2006"
   12.17 +#define COPYRIGHT_YEAR "2013"
   12.18  
   12.19  // Various strings for the Windows DLL Resources in res_meta.rc
   12.20  #define RC_COMMENTS		"Metamod allows running multiple mod-like plugin DLLs, to add functionality or change the behavior of the running HLDS game mod.  See " VURL
    13.1 --- a/metamod/linkgame.cpp	Fri Mar 15 14:59:27 2013 -0500
    13.2 +++ b/metamod/linkgame.cpp	Fri Mar 15 15:01:19 2013 -0500
    13.3 @@ -44,29 +44,68 @@
    13.4  // "mklinkgame.sh".  See the files in the directory "ents" for the actual
    13.5  // list of entities.
    13.6  
    13.7 +LINK_ENTITY_TO_GAME(AngleIMatrix);
    13.8 +LINK_ENTITY_TO_GAME(AngleMatrix);
    13.9 +LINK_ENTITY_TO_GAME(BALLS_airball);
   13.10 +LINK_ENTITY_TO_GAME(CTF_Map);
   13.11 +LINK_ENTITY_TO_GAME(CreateInterface);
   13.12 +LINK_ENTITY_TO_GAME(DLLClassName);
   13.13 +LINK_ENTITY_TO_GAME(DelayedUse);
   13.14 +LINK_ENTITY_TO_GAME(Electro_Bolt);
   13.15 +LINK_ENTITY_TO_GAME(FISHINGROD_bolt);
   13.16 +LINK_ENTITY_TO_GAME(FOOT_bolt);
   13.17 +LINK_ENTITY_TO_GAME(FlyingTomaHawk);
   13.18 +LINK_ENTITY_TO_GAME(GetChaseOrigin);
   13.19 +LINK_ENTITY_TO_GAME(IsoBomb);
   13.20 +LINK_ENTITY_TO_GAME(PythRound);
   13.21 +LINK_ENTITY_TO_GAME(RONINTeamScore);
   13.22 +LINK_ENTITY_TO_GAME(SA_Model);
   13.23 +LINK_ENTITY_TO_GAME(SCAVENGERTeamScore);
   13.24 +LINK_ENTITY_TO_GAME(Satelite__Laser);
   13.25 +LINK_ENTITY_TO_GAME(TSAmmoPack);
   13.26 +LINK_ENTITY_TO_GAME(TSWorldGun);
   13.27 +LINK_ENTITY_TO_GAME(TS_PowerUp);
   13.28 +LINK_ENTITY_TO_GAME(TS_bomb);
   13.29 +LINK_ENTITY_TO_GAME(USMCTeamScore);
   13.30 +LINK_ENTITY_TO_GAME(Zombie2Spit);
   13.31 +LINK_ENTITY_TO_GAME(_spit);
   13.32 +LINK_ENTITY_TO_GAME(_squadfix);
   13.33  LINK_ENTITY_TO_GAME(acidgib);
   13.34  LINK_ENTITY_TO_GAME(active_bomb);
   13.35  LINK_ENTITY_TO_GAME(afterimage);
   13.36  LINK_ENTITY_TO_GAME(aiscripted_sequence);
   13.37 -LINK_ENTITY_TO_GAME(alienresourcetower);
   13.38 +LINK_ENTITY_TO_GAME(ak74grenade);
   13.39  LINK_ENTITY_TO_GAME(alien_slave_energy_ball);
   13.40  LINK_ENTITY_TO_GAME(alien_slave_sapper);
   13.41 +LINK_ENTITY_TO_GAME(alienresourcetower);
   13.42  LINK_ENTITY_TO_GAME(ambient_generic);
   13.43  LINK_ENTITY_TO_GAME(ammo_0mm45);
   13.44  LINK_ENTITY_TO_GAME(ammo_0mm50b);
   13.45 +LINK_ENTITY_TO_GAME(ammo_10mmbuckshot);
   13.46 +LINK_ENTITY_TO_GAME(ammo_10mmbuckshotbox);
   13.47 +LINK_ENTITY_TO_GAME(ammo_127mm);
   13.48 +LINK_ENTITY_TO_GAME(ammo_12g);
   13.49  LINK_ENTITY_TO_GAME(ammo_1911clip);
   13.50 +LINK_ENTITY_TO_GAME(ammo_2mm);
   13.51  LINK_ENTITY_TO_GAME(ammo_30cal);
   13.52 +LINK_ENTITY_TO_GAME(ammo_30mm);
   13.53 +LINK_ENTITY_TO_GAME(ammo_338Magnum);
   13.54  LINK_ENTITY_TO_GAME(ammo_338magnum);
   13.55  LINK_ENTITY_TO_GAME(ammo_357);
   13.56 +LINK_ENTITY_TO_GAME(ammo_357SIG);
   13.57  LINK_ENTITY_TO_GAME(ammo_357sig);
   13.58  LINK_ENTITY_TO_GAME(ammo_40glclip);
   13.59  LINK_ENTITY_TO_GAME(ammo_40mm);
   13.60  LINK_ENTITY_TO_GAME(ammo_44);
   13.61 +LINK_ENTITY_TO_GAME(ammo_45ACP);
   13.62  LINK_ENTITY_TO_GAME(ammo_45acp);
   13.63 +LINK_ENTITY_TO_GAME(ammo_45cal);
   13.64 +LINK_ENTITY_TO_GAME(ammo_50AE);
   13.65  LINK_ENTITY_TO_GAME(ammo_50ae);
   13.66  LINK_ENTITY_TO_GAME(ammo_50cal);
   13.67  LINK_ENTITY_TO_GAME(ammo_556);
   13.68  LINK_ENTITY_TO_GAME(ammo_556AR);
   13.69 +LINK_ENTITY_TO_GAME(ammo_556Nato);
   13.70  LINK_ENTITY_TO_GAME(ammo_556box);
   13.71  LINK_ENTITY_TO_GAME(ammo_556nato);
   13.72  LINK_ENTITY_TO_GAME(ammo_556natobox);
   13.73 @@ -74,33 +113,55 @@
   13.74  LINK_ENTITY_TO_GAME(ammo_5mm56);
   13.75  LINK_ENTITY_TO_GAME(ammo_5mm7);
   13.76  LINK_ENTITY_TO_GAME(ammo_762);
   13.77 +LINK_ENTITY_TO_GAME(ammo_762Magnum);
   13.78 +LINK_ENTITY_TO_GAME(ammo_762Nato);
   13.79  LINK_ENTITY_TO_GAME(ammo_762mmbox);
   13.80  LINK_ENTITY_TO_GAME(ammo_762nato);
   13.81 +LINK_ENTITY_TO_GAME(ammo_762x54);
   13.82  LINK_ENTITY_TO_GAME(ammo_766mm);
   13.83  LINK_ENTITY_TO_GAME(ammo_7mm62);
   13.84 +LINK_ENTITY_TO_GAME(ammo_86mm);
   13.85 +LINK_ENTITY_TO_GAME(ammo_8mm);
   13.86  LINK_ENTITY_TO_GAME(ammo_9mm);
   13.87  LINK_ENTITY_TO_GAME(ammo_9mmAR);
   13.88  LINK_ENTITY_TO_GAME(ammo_9mmbox);
   13.89  LINK_ENTITY_TO_GAME(ammo_9mmclip);
   13.90 +LINK_ENTITY_TO_GAME(ammo_AK47clip);
   13.91 +LINK_ENTITY_TO_GAME(ammo_ARgrenades);
   13.92 +LINK_ENTITY_TO_GAME(ammo_BALLS);
   13.93 +LINK_ENTITY_TO_GAME(ammo_CEnfield);
   13.94 +LINK_ENTITY_TO_GAME(ammo_Deagle);
   13.95 +LINK_ENTITY_TO_GAME(ammo_Dmissile);
   13.96 +LINK_ENTITY_TO_GAME(ammo_EnergyCells);
   13.97 +LINK_ENTITY_TO_GAME(ammo_FISHINGROD);
   13.98 +LINK_ENTITY_TO_GAME(ammo_FOOT);
   13.99 +LINK_ENTITY_TO_GAME(ammo_FTclip);
  13.100 +LINK_ENTITY_TO_GAME(ammo_GMauserG98);
  13.101 +LINK_ENTITY_TO_GAME(ammo_GluonCells);
  13.102 +LINK_ENTITY_TO_GAME(ammo_M16grenades);
  13.103 +LINK_ENTITY_TO_GAME(ammo_MicroFusionCells);
  13.104 +LINK_ENTITY_TO_GAME(ammo_NGgrenades);
  13.105 +LINK_ENTITY_TO_GAME(ammo_ShockCore);
  13.106 +LINK_ENTITY_TO_GAME(ammo_ShockGrenade);
  13.107 +LINK_ENTITY_TO_GAME(ammo_SunOfGod);
  13.108 +LINK_ENTITY_TO_GAME(ammo_WTELEPORTERgrenades);
  13.109  LINK_ENTITY_TO_GAME(ammo_adrenaline);
  13.110  LINK_ENTITY_TO_GAME(ammo_ak101);
  13.111  LINK_ENTITY_TO_GAME(ammo_ak105);
  13.112  LINK_ENTITY_TO_GAME(ammo_ak47);
  13.113  LINK_ENTITY_TO_GAME(ammo_ak47clip);
  13.114 -LINK_ENTITY_TO_GAME(ammo_AK47clip);
  13.115  LINK_ENTITY_TO_GAME(ammo_ak5);
  13.116  LINK_ENTITY_TO_GAME(ammo_ak74);
  13.117  LINK_ENTITY_TO_GAME(ammo_ak74clip);
  13.118 +LINK_ENTITY_TO_GAME(ammo_ak74grenades);
  13.119  LINK_ENTITY_TO_GAME(ammo_anaconda);
  13.120  LINK_ENTITY_TO_GAME(ammo_ar10clip);
  13.121  LINK_ENTITY_TO_GAME(ammo_ar33clip);
  13.122  LINK_ENTITY_TO_GAME(ammo_areaammo);
  13.123 -LINK_ENTITY_TO_GAME(ammo_ARgrenades);
  13.124  LINK_ENTITY_TO_GAME(ammo_aug);
  13.125  LINK_ENTITY_TO_GAME(ammo_awm);
  13.126  LINK_ENTITY_TO_GAME(ammo_awp);
  13.127  LINK_ENTITY_TO_GAME(ammo_axes);
  13.128 -LINK_ENTITY_TO_GAME(ammo_BALLS);
  13.129  LINK_ENTITY_TO_GAME(ammo_bar);
  13.130  LINK_ENTITY_TO_GAME(ammo_baretta);
  13.131  LINK_ENTITY_TO_GAME(ammo_bazooka);
  13.132 @@ -111,17 +172,18 @@
  13.133  LINK_ENTITY_TO_GAME(ammo_beretta);
  13.134  LINK_ENTITY_TO_GAME(ammo_berettaclip);
  13.135  LINK_ENTITY_TO_GAME(ammo_berrett82clip);
  13.136 +LINK_ENTITY_TO_GAME(ammo_bfg);
  13.137  LINK_ENTITY_TO_GAME(ammo_bizon);
  13.138  LINK_ENTITY_TO_GAME(ammo_boltrifle);
  13.139  LINK_ENTITY_TO_GAME(ammo_bow);
  13.140 -LINK_ENTITY_TO_GAME(ammobox);
  13.141  LINK_ENTITY_TO_GAME(ammo_bren);
  13.142  LINK_ENTITY_TO_GAME(ammo_brick);
  13.143  LINK_ENTITY_TO_GAME(ammo_buckshot);
  13.144  LINK_ENTITY_TO_GAME(ammo_buffalo);
  13.145  LINK_ENTITY_TO_GAME(ammo_cannon);
  13.146  LINK_ENTITY_TO_GAME(ammo_caseless);
  13.147 -LINK_ENTITY_TO_GAME(ammo_CEnfield);
  13.148 +LINK_ENTITY_TO_GAME(ammo_cell);
  13.149 +LINK_ENTITY_TO_GAME(ammo_cgrenade);
  13.150  LINK_ENTITY_TO_GAME(ammo_chemical);
  13.151  LINK_ENTITY_TO_GAME(ammo_cloaker);
  13.152  LINK_ENTITY_TO_GAME(ammo_colt);
  13.153 @@ -130,6 +192,7 @@
  13.154  LINK_ENTITY_TO_GAME(ammo_colts);
  13.155  LINK_ENTITY_TO_GAME(ammo_concussion);
  13.156  LINK_ENTITY_TO_GAME(ammo_cougarclip);
  13.157 +LINK_ENTITY_TO_GAME(ammo_cpc);
  13.158  LINK_ENTITY_TO_GAME(ammo_crate);
  13.159  LINK_ENTITY_TO_GAME(ammo_crossbow);
  13.160  LINK_ENTITY_TO_GAME(ammo_d5kclip);
  13.161 @@ -137,7 +200,6 @@
  13.162  LINK_ENTITY_TO_GAME(ammo_dd44clip);
  13.163  LINK_ENTITY_TO_GAME(ammo_de50);
  13.164  LINK_ENTITY_TO_GAME(ammo_deagle);
  13.165 -LINK_ENTITY_TO_GAME(ammo_Deagle);
  13.166  LINK_ENTITY_TO_GAME(ammo_deagleclip);
  13.167  LINK_ENTITY_TO_GAME(ammo_deploygun);
  13.168  LINK_ENTITY_TO_GAME(ammo_desert);
  13.169 @@ -157,17 +219,15 @@
  13.170  LINK_ENTITY_TO_GAME(ammo_famas);
  13.171  LINK_ENTITY_TO_GAME(ammo_famasclip);
  13.172  LINK_ENTITY_TO_GAME(ammo_fg42);
  13.173 -LINK_ENTITY_TO_GAME(ammo_FISHINGROD);
  13.174  LINK_ENTITY_TO_GAME(ammo_fiveseven);
  13.175  LINK_ENTITY_TO_GAME(ammo_flameammo);
  13.176  LINK_ENTITY_TO_GAME(ammo_flameclip);
  13.177  LINK_ENTITY_TO_GAME(ammo_flashbang);
  13.178  LINK_ENTITY_TO_GAME(ammo_fnfal);
  13.179  LINK_ENTITY_TO_GAME(ammo_fnp90clip);
  13.180 -LINK_ENTITY_TO_GAME(ammo_FOOT);
  13.181  LINK_ENTITY_TO_GAME(ammo_frag);
  13.182  LINK_ENTITY_TO_GAME(ammo_freezeclip);
  13.183 -LINK_ENTITY_TO_GAME(ammo_FTclip);
  13.184 +LINK_ENTITY_TO_GAME(ammo_fuel);
  13.185  LINK_ENTITY_TO_GAME(ammo_g11);
  13.186  LINK_ENTITY_TO_GAME(ammo_g36);
  13.187  LINK_ENTITY_TO_GAME(ammo_g36clip);
  13.188 @@ -186,16 +246,17 @@
  13.189  LINK_ENTITY_TO_GAME(ammo_glock17);
  13.190  LINK_ENTITY_TO_GAME(ammo_glock18);
  13.191  LINK_ENTITY_TO_GAME(ammo_glockclip);
  13.192 -LINK_ENTITY_TO_GAME(ammo_GMauserG98);
  13.193  LINK_ENTITY_TO_GAME(ammo_goldpp7clip);
  13.194  LINK_ENTITY_TO_GAME(ammo_gp25);
  13.195  LINK_ENTITY_TO_GAME(ammo_greasegun);
  13.196  LINK_ENTITY_TO_GAME(ammo_grenades);
  13.197  LINK_ENTITY_TO_GAME(ammo_handcannon);
  13.198  LINK_ENTITY_TO_GAME(ammo_helirockets);
  13.199 +LINK_ENTITY_TO_GAME(ammo_hellfire);
  13.200  LINK_ENTITY_TO_GAME(ammo_hk21);
  13.201  LINK_ENTITY_TO_GAME(ammo_hk33clip);
  13.202  LINK_ENTITY_TO_GAME(ammo_hkmp5);
  13.203 +LINK_ENTITY_TO_GAME(ammo_isotope);
  13.204  LINK_ENTITY_TO_GAME(ammo_jackhammer);
  13.205  LINK_ENTITY_TO_GAME(ammo_javelins);
  13.206  LINK_ENTITY_TO_GAME(ammo_k43);
  13.207 @@ -217,7 +278,6 @@
  13.208  LINK_ENTITY_TO_GAME(ammo_m16);
  13.209  LINK_ENTITY_TO_GAME(ammo_m16a2clip);
  13.210  LINK_ENTITY_TO_GAME(ammo_m16clip);
  13.211 -LINK_ENTITY_TO_GAME(ammo_M16grenades);
  13.212  LINK_ENTITY_TO_GAME(ammo_m1carbine);
  13.213  LINK_ENTITY_TO_GAME(ammo_m2);
  13.214  LINK_ENTITY_TO_GAME(ammo_m203);
  13.215 @@ -241,6 +301,7 @@
  13.216  LINK_ENTITY_TO_GAME(ammo_mg42);
  13.217  LINK_ENTITY_TO_GAME(ammo_mindrayclip);
  13.218  LINK_ENTITY_TO_GAME(ammo_minigunClip);
  13.219 +LINK_ENTITY_TO_GAME(ammo_minimissile);
  13.220  LINK_ENTITY_TO_GAME(ammo_mk23);
  13.221  LINK_ENTITY_TO_GAME(ammo_mossberg);
  13.222  LINK_ENTITY_TO_GAME(ammo_mp40);
  13.223 @@ -256,10 +317,12 @@
  13.224  LINK_ENTITY_TO_GAME(ammo_mp5sd);
  13.225  LINK_ENTITY_TO_GAME(ammo_msg90);
  13.226  LINK_ENTITY_TO_GAME(ammo_musketoon);
  13.227 +LINK_ENTITY_TO_GAME(ammo_nails);
  13.228  LINK_ENTITY_TO_GAME(ammo_nato);
  13.229  LINK_ENTITY_TO_GAME(ammo_nato308);
  13.230  LINK_ENTITY_TO_GAME(ammo_natoclip);
  13.231  LINK_ENTITY_TO_GAME(ammo_needle);
  13.232 +LINK_ENTITY_TO_GAME(ammo_nuke);
  13.233  LINK_ENTITY_TO_GAME(ammo_null);
  13.234  LINK_ENTITY_TO_GAME(ammo_p99);
  13.235  LINK_ENTITY_TO_GAME(ammo_p99clip);
  13.236 @@ -274,6 +337,7 @@
  13.237  LINK_ENTITY_TO_GAME(ammo_pschreck);
  13.238  LINK_ENTITY_TO_GAME(ammo_psg1);
  13.239  LINK_ENTITY_TO_GAME(ammo_psg1clip);
  13.240 +LINK_ENTITY_TO_GAME(ammo_quad);
  13.241  LINK_ENTITY_TO_GAME(ammo_railgun);
  13.242  LINK_ENTITY_TO_GAME(ammo_rcp90clip);
  13.243  LINK_ENTITY_TO_GAME(ammo_remington);
  13.244 @@ -298,12 +362,14 @@
  13.245  LINK_ENTITY_TO_GAME(ammo_scopedkar);
  13.246  LINK_ENTITY_TO_GAME(ammo_shells);
  13.247  LINK_ENTITY_TO_GAME(ammo_shot);
  13.248 +LINK_ENTITY_TO_GAME(ammo_shrapnel);
  13.249  LINK_ENTITY_TO_GAME(ammo_sig245clip);
  13.250  LINK_ENTITY_TO_GAME(ammo_silverpp7clip);
  13.251  LINK_ENTITY_TO_GAME(ammo_sks);
  13.252 +LINK_ENTITY_TO_GAME(ammo_slugs);
  13.253  LINK_ENTITY_TO_GAME(ammo_smg9);
  13.254 +LINK_ENTITY_TO_GAME(ammo_snUZI);
  13.255  LINK_ENTITY_TO_GAME(ammo_sniper);
  13.256 -LINK_ENTITY_TO_GAME(ammo_snUZI);
  13.257  LINK_ENTITY_TO_GAME(ammo_spas12);
  13.258  LINK_ENTITY_TO_GAME(ammo_spasclip);
  13.259  LINK_ENTITY_TO_GAME(ammo_spellbook);
  13.260 @@ -313,25 +379,26 @@
  13.261  LINK_ENTITY_TO_GAME(ammo_spring);
  13.262  LINK_ENTITY_TO_GAME(ammo_srifleclip);
  13.263  LINK_ENTITY_TO_GAME(ammo_ssg3000);
  13.264 +LINK_ENTITY_TO_GAME(ammo_st_far);
  13.265 +LINK_ENTITY_TO_GAME(ammo_st_heavy);
  13.266 +LINK_ENTITY_TO_GAME(ammo_st_medium);
  13.267 +LINK_ENTITY_TO_GAME(ammo_st_short);
  13.268 +LINK_ENTITY_TO_GAME(ammo_st_special1);
  13.269 +LINK_ENTITY_TO_GAME(ammo_st_special2);
  13.270  LINK_ENTITY_TO_GAME(ammo_sten);
  13.271  LINK_ENTITY_TO_GAME(ammo_sterling);
  13.272  LINK_ENTITY_TO_GAME(ammo_steyr_m40);
  13.273 -LINK_ENTITY_TO_GAME(ammo_st_far);
  13.274  LINK_ENTITY_TO_GAME(ammo_stg24);
  13.275 -LINK_ENTITY_TO_GAME(ammo_st_heavy);
  13.276 -LINK_ENTITY_TO_GAME(ammo_st_medium);
  13.277  LINK_ENTITY_TO_GAME(ammo_stoner);
  13.278  LINK_ENTITY_TO_GAME(ammo_stonerscope);
  13.279  LINK_ENTITY_TO_GAME(ammo_stonersilencer);
  13.280 -LINK_ENTITY_TO_GAME(ammo_st_short);
  13.281 -LINK_ENTITY_TO_GAME(ammo_st_special1);
  13.282 -LINK_ENTITY_TO_GAME(ammo_st_special2);
  13.283 +LINK_ENTITY_TO_GAME(ammo_stormcell);
  13.284  LINK_ENTITY_TO_GAME(ammo_stubcoolant);
  13.285  LINK_ENTITY_TO_GAME(ammo_stumpbox);
  13.286  LINK_ENTITY_TO_GAME(ammo_svd);
  13.287 +LINK_ENTITY_TO_GAME(ammo_swarm_xen_secondary);
  13.288  LINK_ENTITY_TO_GAME(ammo_swarmprimary);
  13.289  LINK_ENTITY_TO_GAME(ammo_swarmsecondary);
  13.290 -LINK_ENTITY_TO_GAME(ammo_swarm_xen_secondary);
  13.291  LINK_ENTITY_TO_GAME(ammo_synthol);
  13.292  LINK_ENTITY_TO_GAME(ammo_tec9);
  13.293  LINK_ENTITY_TO_GAME(ammo_thompson);
  13.294 @@ -339,6 +406,8 @@
  13.295  LINK_ENTITY_TO_GAME(ammo_tommygun);
  13.296  LINK_ENTITY_TO_GAME(ammo_trigun);
  13.297  LINK_ENTITY_TO_GAME(ammo_ump45);
  13.298 +LINK_ENTITY_TO_GAME(ammo_uranium235);
  13.299 +LINK_ENTITY_TO_GAME(ammo_uranium238);
  13.300  LINK_ENTITY_TO_GAME(ammo_usp);
  13.301  LINK_ENTITY_TO_GAME(ammo_uspclip);
  13.302  LINK_ENTITY_TO_GAME(ammo_uzi);
  13.303 @@ -351,12 +420,11 @@
  13.304  LINK_ENTITY_TO_GAME(ammo_whiskey);
  13.305  LINK_ENTITY_TO_GAME(ammo_winchester);
  13.306  LINK_ENTITY_TO_GAME(ammo_winchesterclip);
  13.307 -LINK_ENTITY_TO_GAME(ammo_WTELEPORTERgrenades);
  13.308 +LINK_ENTITY_TO_GAME(ammo_xbolts);
  13.309  LINK_ENTITY_TO_GAME(ammo_xm4);
  13.310  LINK_ENTITY_TO_GAME(ammo_xm4slug);
  13.311  LINK_ENTITY_TO_GAME(ammo_zmgclip);
  13.312 -LINK_ENTITY_TO_GAME(AngleIMatrix);
  13.313 -LINK_ENTITY_TO_GAME(AngleMatrix);
  13.314 +LINK_ENTITY_TO_GAME(ammobox);
  13.315  LINK_ENTITY_TO_GAME(antifric_timer);
  13.316  LINK_ENTITY_TO_GAME(antifriction_grenade);
  13.317  LINK_ENTITY_TO_GAME(arcade_points);
  13.318 @@ -367,21 +435,20 @@
  13.319  LINK_ENTITY_TO_GAME(aura);
  13.320  LINK_ENTITY_TO_GAME(authenticationmanager);
  13.321  LINK_ENTITY_TO_GAME(autogl_gren);
  13.322 -LINK_ENTITY_TO_GAME(balle);
  13.323  LINK_ENTITY_TO_GAME(ball_launcher);
  13.324  LINK_ENTITY_TO_GAME(ball_lightning);
  13.325 -LINK_ENTITY_TO_GAME(BALLS_airball);
  13.326 +LINK_ENTITY_TO_GAME(balle);
  13.327  LINK_ENTITY_TO_GAME(banana);
  13.328  LINK_ENTITY_TO_GAME(bankinterest);
  13.329  LINK_ENTITY_TO_GAME(barneymine);
  13.330 +LINK_ENTITY_TO_GAME(base_drive_ent);
  13.331  LINK_ENTITY_TO_GAME(basecurse);
  13.332 -LINK_ENTITY_TO_GAME(base_drive_ent);
  13.333  LINK_ENTITY_TO_GAME(bb_ammo);
  13.334  LINK_ENTITY_TO_GAME(bb_custommission);
  13.335  LINK_ENTITY_TO_GAME(bb_equipment);
  13.336 -LINK_ENTITY_TO_GAME(bb_escapeair);
  13.337  LINK_ENTITY_TO_GAME(bb_escape_final);
  13.338  LINK_ENTITY_TO_GAME(bb_escape_radar);
  13.339 +LINK_ENTITY_TO_GAME(bb_escapeair);
  13.340  LINK_ENTITY_TO_GAME(bb_funk);
  13.341  LINK_ENTITY_TO_GAME(bb_healthkit);
  13.342  LINK_ENTITY_TO_GAME(bb_mapmission);
  13.343 @@ -393,6 +460,7 @@
  13.344  LINK_ENTITY_TO_GAME(bb_tank);
  13.345  LINK_ENTITY_TO_GAME(bb_waypoint);
  13.346  LINK_ENTITY_TO_GAME(bb_zombie_player);
  13.347 +LINK_ENTITY_TO_GAME(bbody);
  13.348  LINK_ENTITY_TO_GAME(beam);
  13.349  LINK_ENTITY_TO_GAME(beam_attack);
  13.350  LINK_ENTITY_TO_GAME(beamshot);
  13.351 @@ -401,7 +469,9 @@
  13.352  LINK_ENTITY_TO_GAME(bfg10k);
  13.353  LINK_ENTITY_TO_GAME(big_bang);
  13.354  LINK_ENTITY_TO_GAME(big_disk);
  13.355 +LINK_ENTITY_TO_GAME(big_lance_proj);
  13.356  LINK_ENTITY_TO_GAME(bird);
  13.357 +LINK_ENTITY_TO_GAME(black_hole);
  13.358  LINK_ENTITY_TO_GAME(blade);
  13.359  LINK_ENTITY_TO_GAME(blaster_beam);
  13.360  LINK_ENTITY_TO_GAME(blaster_bolt);
  13.361 @@ -445,7 +515,10 @@
  13.362  LINK_ENTITY_TO_GAME(chain_hurter);
  13.363  LINK_ENTITY_TO_GAME(charge);
  13.364  LINK_ENTITY_TO_GAME(charged_bolt);
  13.365 +LINK_ENTITY_TO_GAME(chronoclip);
  13.366  LINK_ENTITY_TO_GAME(cine_blood);
  13.367 +LINK_ENTITY_TO_GAME(clbaby);
  13.368 +LINK_ENTITY_TO_GAME(clmomma);
  13.369  LINK_ENTITY_TO_GAME(cm_rocket_01);
  13.370  LINK_ENTITY_TO_GAME(cocklebur);
  13.371  LINK_ENTITY_TO_GAME(conc_charge);
  13.372 @@ -457,10 +530,9 @@
  13.373  LINK_ENTITY_TO_GAME(controller_health_ball);
  13.374  LINK_ENTITY_TO_GAME(controller_throw_ball);
  13.375  LINK_ENTITY_TO_GAME(counter);
  13.376 -LINK_ENTITY_TO_GAME(CreateInterface);
  13.377  LINK_ENTITY_TO_GAME(crossbow_bolt);
  13.378 +LINK_ENTITY_TO_GAME(crowbar_rocket);
  13.379  LINK_ENTITY_TO_GAME(crowbarang);
  13.380 -LINK_ENTITY_TO_GAME(crowbar_rocket);
  13.381  LINK_ENTITY_TO_GAME(crowd);
  13.382  LINK_ENTITY_TO_GAME(ctb_point_one);
  13.383  LINK_ENTITY_TO_GAME(ctb_point_two);
  13.384 @@ -478,7 +550,6 @@
  13.385  LINK_ENTITY_TO_GAME(ctf_frag);
  13.386  LINK_ENTITY_TO_GAME(ctf_hook);
  13.387  LINK_ENTITY_TO_GAME(ctf_lowgrav);
  13.388 -LINK_ENTITY_TO_GAME(CTF_Map);
  13.389  LINK_ENTITY_TO_GAME(ctf_protect);
  13.390  LINK_ENTITY_TO_GAME(ctf_redflag);
  13.391  LINK_ENTITY_TO_GAME(ctf_redspawn);
  13.392 @@ -518,11 +589,11 @@
  13.393  LINK_ENTITY_TO_GAME(dc_trigger_team);
  13.394  LINK_ENTITY_TO_GAME(deadcorpse);
  13.395  LINK_ENTITY_TO_GAME(deal_columbian_start);
  13.396 -LINK_ENTITY_TO_GAME(dealer);
  13.397  LINK_ENTITY_TO_GAME(deal_italian_start);
  13.398  LINK_ENTITY_TO_GAME(deal_swat_start);
  13.399 +LINK_ENTITY_TO_GAME(dealer);
  13.400 +LINK_ENTITY_TO_GAME(death_ball);
  13.401  LINK_ENTITY_TO_GAME(deathball);
  13.402 -LINK_ENTITY_TO_GAME(death_ball);
  13.403  LINK_ENTITY_TO_GAME(deathsoul);
  13.404  LINK_ENTITY_TO_GAME(debris);
  13.405  LINK_ENTITY_TO_GAME(decore_aicore);
  13.406 @@ -553,15 +624,14 @@
  13.407  LINK_ENTITY_TO_GAME(decore_torch);
  13.408  LINK_ENTITY_TO_GAME(decore_torchflame);
  13.409  LINK_ENTITY_TO_GAME(defensechamber);
  13.410 -LINK_ENTITY_TO_GAME(DelayedUse);
  13.411  LINK_ENTITY_TO_GAME(demoman_mine);
  13.412  LINK_ENTITY_TO_GAME(detpack);
  13.413  LINK_ENTITY_TO_GAME(dg_streak_spiral);
  13.414  LINK_ENTITY_TO_GAME(disc);
  13.415 +LINK_ENTITY_TO_GAME(disc_arena);
  13.416  LINK_ENTITY_TO_GAME(discarena);
  13.417 -LINK_ENTITY_TO_GAME(disc_arena);
  13.418 +LINK_ENTITY_TO_GAME(dispball);
  13.419  LINK_ENTITY_TO_GAME(displacer_ball);
  13.420 -LINK_ENTITY_TO_GAME(DLLClassName);
  13.421  LINK_ENTITY_TO_GAME(dmgmirrorcurse);
  13.422  LINK_ENTITY_TO_GAME(dmgscalecurse);
  13.423  LINK_ENTITY_TO_GAME(dod_ammo);
  13.424 @@ -616,14 +686,15 @@
  13.425  LINK_ENTITY_TO_GAME(eagle_laser);
  13.426  LINK_ENTITY_TO_GAME(effect_shield);
  13.427  LINK_ENTITY_TO_GAME(egon_mirv);
  13.428 -LINK_ENTITY_TO_GAME(Electro_Bolt);
  13.429  LINK_ENTITY_TO_GAME(emp_cannister);
  13.430  LINK_ENTITY_TO_GAME(emp_pulse);
  13.431  LINK_ENTITY_TO_GAME(entity_botcam);
  13.432  LINK_ENTITY_TO_GAME(entity_clustergod);
  13.433  LINK_ENTITY_TO_GAME(entity_digitgod);
  13.434 +LINK_ENTITY_TO_GAME(entity_spawn_round);
  13.435  LINK_ENTITY_TO_GAME(entity_spritegod);
  13.436  LINK_ENTITY_TO_GAME(entity_volcanospew);
  13.437 +LINK_ENTITY_TO_GAME(env_ClusterExplosion);
  13.438  LINK_ENTITY_TO_GAME(env_animsprite);
  13.439  LINK_ENTITY_TO_GAME(env_beam);
  13.440  LINK_ENTITY_TO_GAME(env_beamtrail);
  13.441 @@ -632,7 +703,6 @@
  13.442  LINK_ENTITY_TO_GAME(env_blowercannon);
  13.443  LINK_ENTITY_TO_GAME(env_bombglow);
  13.444  LINK_ENTITY_TO_GAME(env_bubbles);
  13.445 -LINK_ENTITY_TO_GAME(env_ClusterExplosion);
  13.446  LINK_ENTITY_TO_GAME(env_customize);
  13.447  LINK_ENTITY_TO_GAME(env_debris);
  13.448  LINK_ENTITY_TO_GAME(env_decal);
  13.449 @@ -709,7 +779,6 @@
  13.450  LINK_ENTITY_TO_GAME(explosive_slug);
  13.451  LINK_ENTITY_TO_GAME(external_cam);
  13.452  LINK_ENTITY_TO_GAME(extra_ammo);
  13.453 -LINK_ENTITY_TO_GAME(fading_corpse);
  13.454  LINK_ENTITY_TO_GAME(fa_drop_zone);
  13.455  LINK_ENTITY_TO_GAME(fa_parachute);
  13.456  LINK_ENTITY_TO_GAME(fa_push_flag);
  13.457 @@ -717,20 +786,23 @@
  13.458  LINK_ENTITY_TO_GAME(fa_sd_object);
  13.459  LINK_ENTITY_TO_GAME(fa_team_goal);
  13.460  LINK_ENTITY_TO_GAME(fa_team_item);
  13.461 +LINK_ENTITY_TO_GAME(fading_corpse);
  13.462  LINK_ENTITY_TO_GAME(fev_cloud);
  13.463  LINK_ENTITY_TO_GAME(fev_vial);
  13.464  LINK_ENTITY_TO_GAME(final_flash);
  13.465  LINK_ENTITY_TO_GAME(finish);
  13.466 +LINK_ENTITY_TO_GAME(fire_ball);
  13.467  LINK_ENTITY_TO_GAME(fireanddie);
  13.468 -LINK_ENTITY_TO_GAME(fire_ball);
  13.469  LINK_ENTITY_TO_GAME(firework);
  13.470 -LINK_ENTITY_TO_GAME(FISHINGROD_bolt);
  13.471  LINK_ENTITY_TO_GAME(flag);
  13.472  LINK_ENTITY_TO_GAME(flag_capture_point);
  13.473  LINK_ENTITY_TO_GAME(flag_follow);
  13.474  LINK_ENTITY_TO_GAME(flag_world);
  13.475 +LINK_ENTITY_TO_GAME(flak_bomb);
  13.476 +LINK_ENTITY_TO_GAME(flak_grenade);
  13.477 +LINK_ENTITY_TO_GAME(flak_shard);
  13.478  LINK_ENTITY_TO_GAME(flakfrag);
  13.479 -LINK_ENTITY_TO_GAME(flak_grenade);
  13.480 +LINK_ENTITY_TO_GAME(flame);
  13.481  LINK_ENTITY_TO_GAME(flame_ball);
  13.482  LINK_ENTITY_TO_GAME(flame_chunk);
  13.483  LINK_ENTITY_TO_GAME(flamme);
  13.484 @@ -738,19 +810,18 @@
  13.485  LINK_ENTITY_TO_GAME(flare_fire);
  13.486  LINK_ENTITY_TO_GAME(flying_axe);
  13.487  LINK_ENTITY_TO_GAME(flying_crowbar);
  13.488 -LINK_ENTITY_TO_GAME(FlyingTomaHawk);
  13.489  LINK_ENTITY_TO_GAME(fog);
  13.490 +LINK_ENTITY_TO_GAME(follow_ent);
  13.491  LINK_ENTITY_TO_GAME(followbot);
  13.492 -LINK_ENTITY_TO_GAME(follow_ent);
  13.493  LINK_ENTITY_TO_GAME(follower_basic);
  13.494  LINK_ENTITY_TO_GAME(football);
  13.495 -LINK_ENTITY_TO_GAME(FOOT_bolt);
  13.496  LINK_ENTITY_TO_GAME(frag_grenade);
  13.497  LINK_ENTITY_TO_GAME(freeze_beam);
  13.498  LINK_ENTITY_TO_GAME(freeze_gel);
  13.499  LINK_ENTITY_TO_GAME(freeze_grenade);
  13.500  LINK_ENTITY_TO_GAME(freeze_timer);
  13.501  LINK_ENTITY_TO_GAME(friction_timer);
  13.502 +LINK_ENTITY_TO_GAME(frostball);
  13.503  LINK_ENTITY_TO_GAME(fruit_sacrifice_point_team_green);
  13.504  LINK_ENTITY_TO_GAME(fruit_sacrifice_point_team_red);
  13.505  LINK_ENTITY_TO_GAME(func_airstrike_area);
  13.506 @@ -777,8 +848,8 @@
  13.507  LINK_ENTITY_TO_GAME(func_elevator);
  13.508  LINK_ENTITY_TO_GAME(func_escapezone);
  13.509  LINK_ENTITY_TO_GAME(func_friction);
  13.510 +LINK_ENTITY_TO_GAME(func_goal_zone);
  13.511  LINK_ENTITY_TO_GAME(func_goalpoint);
  13.512 -LINK_ENTITY_TO_GAME(func_goal_zone);
  13.513  LINK_ENTITY_TO_GAME(func_golem_body);
  13.514  LINK_ENTITY_TO_GAME(func_golem_controls_attack);
  13.515  LINK_ENTITY_TO_GAME(func_golem_controls_forward);
  13.516 @@ -801,8 +872,8 @@
  13.517  LINK_ENTITY_TO_GAME(func_jail_release);
  13.518  LINK_ENTITY_TO_GAME(func_ladder);
  13.519  LINK_ENTITY_TO_GAME(func_laddertype);
  13.520 +LINK_ENTITY_TO_GAME(func_land_transport);
  13.521  LINK_ENTITY_TO_GAME(func_landtransport);
  13.522 -LINK_ENTITY_TO_GAME(func_land_transport);
  13.523  LINK_ENTITY_TO_GAME(func_modeltank);
  13.524  LINK_ENTITY_TO_GAME(func_modelvehicle);
  13.525  LINK_ENTITY_TO_GAME(func_modelvehiclemodel);
  13.526 @@ -826,8 +897,8 @@
  13.527  LINK_ENTITY_TO_GAME(func_physics);
  13.528  LINK_ENTITY_TO_GAME(func_pillageable);
  13.529  LINK_ENTITY_TO_GAME(func_plat);
  13.530 +LINK_ENTITY_TO_GAME(func_plat_toggleremove);
  13.531  LINK_ENTITY_TO_GAME(func_platrot);
  13.532 -LINK_ENTITY_TO_GAME(func_plat_toggleremove);
  13.533  LINK_ENTITY_TO_GAME(func_player_start);
  13.534  LINK_ENTITY_TO_GAME(func_point);
  13.535  LINK_ENTITY_TO_GAME(func_possesion);
  13.536 @@ -837,8 +908,8 @@
  13.537  LINK_ENTITY_TO_GAME(func_recharge);
  13.538  LINK_ENTITY_TO_GAME(func_reset);
  13.539  LINK_ENTITY_TO_GAME(func_resource);
  13.540 +LINK_ENTITY_TO_GAME(func_rot_button);
  13.541  LINK_ENTITY_TO_GAME(func_rotating);
  13.542 -LINK_ENTITY_TO_GAME(func_rot_button);
  13.543  LINK_ENTITY_TO_GAME(func_searchlight);
  13.544  LINK_ENTITY_TO_GAME(func_securityzone);
  13.545  LINK_ENTITY_TO_GAME(func_seethrough);
  13.546 @@ -848,6 +919,9 @@
  13.547  LINK_ENTITY_TO_GAME(func_sickbay_psych);
  13.548  LINK_ENTITY_TO_GAME(func_snow);
  13.549  LINK_ENTITY_TO_GAME(func_tank);
  13.550 +LINK_ENTITY_TO_GAME(func_tank_gauss);
  13.551 +LINK_ENTITY_TO_GAME(func_tank_of);
  13.552 +LINK_ENTITY_TO_GAME(func_tank_turret);
  13.553  LINK_ENTITY_TO_GAME(func_tankbase);
  13.554  LINK_ENTITY_TO_GAME(func_tankcannon);
  13.555  LINK_ENTITY_TO_GAME(func_tankcontrols);
  13.556 @@ -861,11 +935,9 @@
  13.557  LINK_ENTITY_TO_GAME(func_tankmg);
  13.558  LINK_ENTITY_TO_GAME(func_tankmortar);
  13.559  LINK_ENTITY_TO_GAME(func_tankmortar_of);
  13.560 -LINK_ENTITY_TO_GAME(func_tank_of);
  13.561  LINK_ENTITY_TO_GAME(func_tankrocket);
  13.562  LINK_ENTITY_TO_GAME(func_tankrocket_of);
  13.563  LINK_ENTITY_TO_GAME(func_tanktarget);
  13.564 -LINK_ENTITY_TO_GAME(func_tank_turret);
  13.565  LINK_ENTITY_TO_GAME(func_tbutton);
  13.566  LINK_ENTITY_TO_GAME(func_tech_breakable);
  13.567  LINK_ENTITY_TO_GAME(func_trackautochange);
  13.568 @@ -891,7 +963,6 @@
  13.569  LINK_ENTITY_TO_GAME(func_weaponcheck);
  13.570  LINK_ENTITY_TO_GAME(func_weldable);
  13.571  LINK_ENTITY_TO_GAME(func_wind);
  13.572 -LINK_ENTITY_TO_GAME(gameclock);
  13.573  LINK_ENTITY_TO_GAME(game_clock);
  13.574  LINK_ENTITY_TO_GAME(game_counter);
  13.575  LINK_ENTITY_TO_GAME(game_counter_set);
  13.576 @@ -900,12 +971,12 @@
  13.577  LINK_ENTITY_TO_GAME(game_item);
  13.578  LINK_ENTITY_TO_GAME(game_levelmusic);
  13.579  LINK_ENTITY_TO_GAME(game_nuke);
  13.580 -LINK_ENTITY_TO_GAME(game_playerdie);
  13.581  LINK_ENTITY_TO_GAME(game_player_die);
  13.582  LINK_ENTITY_TO_GAME(game_player_equip);
  13.583  LINK_ENTITY_TO_GAME(game_player_hurt);
  13.584  LINK_ENTITY_TO_GAME(game_player_message);
  13.585  LINK_ENTITY_TO_GAME(game_player_team);
  13.586 +LINK_ENTITY_TO_GAME(game_playerdie);
  13.587  LINK_ENTITY_TO_GAME(game_roundend);
  13.588  LINK_ENTITY_TO_GAME(game_score);
  13.589  LINK_ENTITY_TO_GAME(game_team_master);
  13.590 @@ -917,38 +988,42 @@
  13.591  LINK_ENTITY_TO_GAME(game_zone_player);
  13.592  LINK_ENTITY_TO_GAME(game_zone_territory);
  13.593  LINK_ENTITY_TO_GAME(game_zone_vikscore);
  13.594 +LINK_ENTITY_TO_GAME(gameclock);
  13.595  LINK_ENTITY_TO_GAME(garg_hull);
  13.596  LINK_ENTITY_TO_GAME(garg_stomp);
  13.597  LINK_ENTITY_TO_GAME(gauss_becon);
  13.598  LINK_ENTITY_TO_GAME(generic_model);
  13.599 -LINK_ENTITY_TO_GAME(GetChaseOrigin);
  13.600  LINK_ENTITY_TO_GAME(getGlobalStunLevel);
  13.601  LINK_ENTITY_TO_GAME(ghost);
  13.602  LINK_ENTITY_TO_GAME(gibable_corpse);
  13.603  LINK_ENTITY_TO_GAME(gibshooter);
  13.604  LINK_ENTITY_TO_GAME(glock_gib);
  13.605  LINK_ENTITY_TO_GAME(glock_stickygib);
  13.606 +LINK_ENTITY_TO_GAME(gluon);
  13.607 +LINK_ENTITY_TO_GAME(gluon2);
  13.608  LINK_ENTITY_TO_GAME(gonarch_headcrabifier);
  13.609  LINK_ENTITY_TO_GAME(gonomeguts);
  13.610  LINK_ENTITY_TO_GAME(gonomespit);
  13.611 +LINK_ENTITY_TO_GAME(gr_shell);
  13.612  LINK_ENTITY_TO_GAME(grapple_bolt);
  13.613  LINK_ENTITY_TO_GAME(grapple_hook);
  13.614  LINK_ENTITY_TO_GAME(grapple_tip);
  13.615  LINK_ENTITY_TO_GAME(grappletongue);
  13.616  LINK_ENTITY_TO_GAME(gravity_grenade);
  13.617 -LINK_ENTITY_TO_GAME(grenade);
  13.618  LINK_ENTITY_TO_GAME(gren_projectile);
  13.619  LINK_ENTITY_TO_GAME(gren_smoke);
  13.620 -LINK_ENTITY_TO_GAME(gr_shell);
  13.621 +LINK_ENTITY_TO_GAME(grenade);
  13.622  LINK_ENTITY_TO_GAME(guard_info);
  13.623  LINK_ENTITY_TO_GAME(guidedattack);
  13.624  LINK_ENTITY_TO_GAME(gunmancycler);
  13.625  LINK_ENTITY_TO_GAME(hallucgrenade);
  13.626  LINK_ENTITY_TO_GAME(halo_base);
  13.627  LINK_ENTITY_TO_GAME(hand_knife);
  13.628 -LINK_ENTITY_TO_GAME(headcrab_teather);
  13.629  LINK_ENTITY_TO_GAME(he_charge_flare);
  13.630  LINK_ENTITY_TO_GAME(he_eye_flare);
  13.631 +LINK_ENTITY_TO_GAME(headcrab_teather);
  13.632 +LINK_ENTITY_TO_GAME(hegrenade);
  13.633 +LINK_ENTITY_TO_GAME(hellfire);
  13.634  LINK_ENTITY_TO_GAME(hi_bomb_zone);
  13.635  LINK_ENTITY_TO_GAME(hi_button_load);
  13.636  LINK_ENTITY_TO_GAME(hi_coop_tango);
  13.637 @@ -969,17 +1044,17 @@
  13.638  LINK_ENTITY_TO_GAME(hltr_assaut_boutton);
  13.639  LINK_ENTITY_TO_GAME(hltr_hostage);
  13.640  LINK_ENTITY_TO_GAME(hltr_object);
  13.641 +LINK_ENTITY_TO_GAME(hltr_object_tombe);
  13.642  LINK_ENTITY_TO_GAME(hltr_objectcapture);
  13.643  LINK_ENTITY_TO_GAME(hltr_objectif);
  13.644  LINK_ENTITY_TO_GAME(hltr_objectif_num);
  13.645 -LINK_ENTITY_TO_GAME(hltr_object_tombe);
  13.646  LINK_ENTITY_TO_GAME(hltr_passant);
  13.647  LINK_ENTITY_TO_GAME(hltr_spectator_start);
  13.648  LINK_ENTITY_TO_GAME(hltr_turret);
  13.649  LINK_ENTITY_TO_GAME(hltr_waypoint);
  13.650 +LINK_ENTITY_TO_GAME(holo_player);
  13.651  LINK_ENTITY_TO_GAME(hologram_beak);
  13.652  LINK_ENTITY_TO_GAME(hologram_damage);
  13.653 -LINK_ENTITY_TO_GAME(holo_player);
  13.654  LINK_ENTITY_TO_GAME(holywars_rocket);
  13.655  LINK_ENTITY_TO_GAME(homing_balls);
  13.656  LINK_ENTITY_TO_GAME(hornet);
  13.657 @@ -989,13 +1064,22 @@
  13.658  LINK_ENTITY_TO_GAME(human_flashgrenade);
  13.659  LINK_ENTITY_TO_GAME(hvr_blkop_rocket);
  13.660  LINK_ENTITY_TO_GAME(hvr_rocket);
  13.661 +LINK_ENTITY_TO_GAME(i_p_t);
  13.662 +LINK_ENTITY_TO_GAME(i_t_g);
  13.663 +LINK_ENTITY_TO_GAME(i_t_t);
  13.664 +LINK_ENTITY_TO_GAME(i_w_g);
  13.665 +LINK_ENTITY_TO_GAME(i_w_t);
  13.666 +LINK_ENTITY_TO_GAME(iflame);
  13.667  LINK_ENTITY_TO_GAME(impact_sprite);
  13.668  LINK_ENTITY_TO_GAME(impail_arrow);
  13.669  LINK_ENTITY_TO_GAME(impailer);
  13.670  LINK_ENTITY_TO_GAME(impgren);
  13.671  LINK_ENTITY_TO_GAME(implode_timer);
  13.672 +LINK_ENTITY_TO_GAME(in_shell);
  13.673 +LINK_ENTITY_TO_GAME(incendiary_rocket);
  13.674  LINK_ENTITY_TO_GAME(indian_arrow);
  13.675  LINK_ENTITY_TO_GAME(infect);
  13.676 +LINK_ENTITY_TO_GAME(info_Waterdetect);
  13.677  LINK_ENTITY_TO_GAME(info_administrator);
  13.678  LINK_ENTITY_TO_GAME(info_airstrike_node);
  13.679  LINK_ENTITY_TO_GAME(info_alarm);
  13.680 @@ -1025,6 +1109,7 @@
  13.681  LINK_ENTITY_TO_GAME(info_caisse_32);
  13.682  LINK_ENTITY_TO_GAME(info_caisse_64);
  13.683  LINK_ENTITY_TO_GAME(info_camera);
  13.684 +LINK_ENTITY_TO_GAME(info_cap_rules);
  13.685  LINK_ENTITY_TO_GAME(info_checkpoint);
  13.686  LINK_ENTITY_TO_GAME(info_chicken);
  13.687  LINK_ENTITY_TO_GAME(info_chip);
  13.688 @@ -1037,7 +1122,6 @@
  13.689  LINK_ENTITY_TO_GAME(info_ctfspawn_powerup);
  13.690  LINK_ENTITY_TO_GAME(info_curtain);
  13.691  LINK_ENTITY_TO_GAME(info_deathball_spawn);
  13.692 -LINK_ENTITY_TO_GAME(infodecal);
  13.693  LINK_ENTITY_TO_GAME(info_defaultammo);
  13.694  LINK_ENTITY_TO_GAME(info_displacer_earth_target);
  13.695  LINK_ENTITY_TO_GAME(info_displacer_xen_target);
  13.696 @@ -1074,9 +1158,9 @@
  13.697  LINK_ENTITY_TO_GAME(info_goldeneye);
  13.698  LINK_ENTITY_TO_GAME(info_good_start);
  13.699  LINK_ENTITY_TO_GAME(info_group);
  13.700 +LINK_ENTITY_TO_GAME(info_gwGeneral_spawn);
  13.701  LINK_ENTITY_TO_GAME(info_gwars_map);
  13.702  LINK_ENTITY_TO_GAME(info_gwbriefing_spawn);
  13.703 -LINK_ENTITY_TO_GAME(info_gwGeneral_spawn);
  13.704  LINK_ENTITY_TO_GAME(info_gwinmap_spawn);
  13.705  LINK_ENTITY_TO_GAME(info_gwplayer_spawn);
  13.706  LINK_ENTITY_TO_GAME(info_gwwaiting_spawn);
  13.707 @@ -1103,12 +1187,14 @@
  13.708  LINK_ENTITY_TO_GAME(info_landmine);
  13.709  LINK_ENTITY_TO_GAME(info_leave_game);
  13.710  LINK_ENTITY_TO_GAME(info_location);
  13.711 +LINK_ENTITY_TO_GAME(info_map_parameters);
  13.712  LINK_ENTITY_TO_GAME(info_mapdetect);
  13.713  LINK_ENTITY_TO_GAME(info_mapinfo);
  13.714 -LINK_ENTITY_TO_GAME(info_map_parameters);
  13.715  LINK_ENTITY_TO_GAME(info_marguerite);
  13.716 +LINK_ENTITY_TO_GAME(info_marker);
  13.717  LINK_ENTITY_TO_GAME(info_minefield);
  13.718  LINK_ENTITY_TO_GAME(info_model);
  13.719 +LINK_ENTITY_TO_GAME(info_money_start);
  13.720  LINK_ENTITY_TO_GAME(info_monkey_start_team_green);
  13.721  LINK_ENTITY_TO_GAME(info_monkey_start_team_red);
  13.722  LINK_ENTITY_TO_GAME(info_monster_return);
  13.723 @@ -1124,6 +1210,7 @@
  13.724  LINK_ENTITY_TO_GAME(info_nomines);
  13.725  LINK_ENTITY_TO_GAME(info_null);
  13.726  LINK_ENTITY_TO_GAME(info_objective);
  13.727 +LINK_ENTITY_TO_GAME(info_observer);
  13.728  LINK_ENTITY_TO_GAME(info_observer_start);
  13.729  LINK_ENTITY_TO_GAME(info_orientation);
  13.730  LINK_ENTITY_TO_GAME(info_paintball);
  13.731 @@ -1158,9 +1245,7 @@
  13.732  LINK_ENTITY_TO_GAME(info_player_slayer);
  13.733  LINK_ENTITY_TO_GAME(info_player_spectator);
  13.734  LINK_ENTITY_TO_GAME(info_player_start);
  13.735 -LINK_ENTITY_TO_GAME(info_playerstart_blue);
  13.736  LINK_ENTITY_TO_GAME(info_player_start_prox);
  13.737 -LINK_ENTITY_TO_GAME(info_playerstart_red);
  13.738  LINK_ENTITY_TO_GAME(info_player_start_reverse);
  13.739  LINK_ENTITY_TO_GAME(info_player_team1);
  13.740  LINK_ENTITY_TO_GAME(info_player_team2);
  13.741 @@ -1172,15 +1257,18 @@
  13.742  LINK_ENTITY_TO_GAME(info_player_team_iw);
  13.743  LINK_ENTITY_TO_GAME(info_player_team_s);
  13.744  LINK_ENTITY_TO_GAME(info_player_team_sm);
  13.745 -LINK_ENTITY_TO_GAME(info_player_teamspawn);
  13.746  LINK_ENTITY_TO_GAME(info_player_team_st);
  13.747  LINK_ENTITY_TO_GAME(info_player_team_we);
  13.748 +LINK_ENTITY_TO_GAME(info_player_teamspawn);
  13.749  LINK_ENTITY_TO_GAME(info_player_torri);
  13.750  LINK_ENTITY_TO_GAME(info_player_unas);
  13.751  LINK_ENTITY_TO_GAME(info_player_usmc_reenforcement);
  13.752  LINK_ENTITY_TO_GAME(info_player_vampire);
  13.753  LINK_ENTITY_TO_GAME(info_player_viking);
  13.754 +LINK_ENTITY_TO_GAME(info_playerstart_blue);
  13.755 +LINK_ENTITY_TO_GAME(info_playerstart_red);
  13.756  LINK_ENTITY_TO_GAME(info_pvk);
  13.757 +LINK_ENTITY_TO_GAME(info_radar_block);
  13.758  LINK_ENTITY_TO_GAME(info_rescue_monster);
  13.759  LINK_ENTITY_TO_GAME(info_rescue_point);
  13.760  LINK_ENTITY_TO_GAME(info_reset);
  13.761 @@ -1239,19 +1327,19 @@
  13.762  LINK_ENTITY_TO_GAME(info_team2_player8);
  13.763  LINK_ENTITY_TO_GAME(info_team2_player9);
  13.764  LINK_ENTITY_TO_GAME(info_team_base);
  13.765 -LINK_ENTITY_TO_GAME(info_teamplaydetect);
  13.766  LINK_ENTITY_TO_GAME(info_team_ronin);
  13.767  LINK_ENTITY_TO_GAME(info_team_scavenger);
  13.768 -LINK_ENTITY_TO_GAME(info_teamspawn);
  13.769  LINK_ENTITY_TO_GAME(info_team_start);
  13.770  LINK_ENTITY_TO_GAME(info_team_usmc);
  13.771 +LINK_ENTITY_TO_GAME(info_teamplaydetect);
  13.772 +LINK_ENTITY_TO_GAME(info_teamspawn);
  13.773  LINK_ENTITY_TO_GAME(info_teleport_destination);
  13.774  LINK_ENTITY_TO_GAME(info_texlights);
  13.775 +LINK_ENTITY_TO_GAME(info_tf_teamcheck);
  13.776 +LINK_ENTITY_TO_GAME(info_tf_teamset);
  13.777  LINK_ENTITY_TO_GAME(info_tfdetect);
  13.778  LINK_ENTITY_TO_GAME(info_tfgoal);
  13.779  LINK_ENTITY_TO_GAME(info_tfgoal_timer);
  13.780 -LINK_ENTITY_TO_GAME(info_tf_teamcheck);
  13.781 -LINK_ENTITY_TO_GAME(info_tf_teamset);
  13.782  LINK_ENTITY_TO_GAME(info_throw_in);
  13.783  LINK_ENTITY_TO_GAME(info_transistor);
  13.784  LINK_ENTITY_TO_GAME(info_transport_node);
  13.785 @@ -1261,19 +1349,18 @@
  13.786  LINK_ENTITY_TO_GAME(info_vgui_start);
  13.787  LINK_ENTITY_TO_GAME(info_vip_start);
  13.788  LINK_ENTITY_TO_GAME(info_wanteddetect);
  13.789 -LINK_ENTITY_TO_GAME(info_Waterdetect);
  13.790  LINK_ENTITY_TO_GAME(info_waypoint);
  13.791 +LINK_ENTITY_TO_GAME(info_ww_teamcheck);
  13.792 +LINK_ENTITY_TO_GAME(info_ww_teamset);
  13.793  LINK_ENTITY_TO_GAME(info_wwdetect);
  13.794  LINK_ENTITY_TO_GAME(info_wwgoal);
  13.795  LINK_ENTITY_TO_GAME(info_wwgoal_timer);
  13.796 -LINK_ENTITY_TO_GAME(info_ww_teamcheck);
  13.797 -LINK_ENTITY_TO_GAME(info_ww_teamset);
  13.798  LINK_ENTITY_TO_GAME(info_zone);
  13.799  LINK_ENTITY_TO_GAME(info_zone_caisse);
  13.800 +LINK_ENTITY_TO_GAME(infodecal);
  13.801  LINK_ENTITY_TO_GAME(inout_register);
  13.802 -LINK_ENTITY_TO_GAME(in_shell);
  13.803 -LINK_ENTITY_TO_GAME(i_p_t);
  13.804 -LINK_ENTITY_TO_GAME(IsoBomb);
  13.805 +LINK_ENTITY_TO_GAME(item_NVG);
  13.806 +LINK_ENTITY_TO_GAME(item_PowerShield);
  13.807  LINK_ENTITY_TO_GAME(item_acme);
  13.808  LINK_ENTITY_TO_GAME(item_airtank);
  13.809  LINK_ENTITY_TO_GAME(item_ammo);
  13.810 @@ -1281,6 +1368,7 @@
  13.811  LINK_ENTITY_TO_GAME(item_ammopack);
  13.812  LINK_ENTITY_TO_GAME(item_antidote);
  13.813  LINK_ENTITY_TO_GAME(item_antidotee);
  13.814 +LINK_ENTITY_TO_GAME(item_antigrav);
  13.815  LINK_ENTITY_TO_GAME(item_armor);
  13.816  LINK_ENTITY_TO_GAME(item_armor1);
  13.817  LINK_ENTITY_TO_GAME(item_armor2);
  13.818 @@ -1328,14 +1416,15 @@
  13.819  LINK_ENTITY_TO_GAME(item_chainmail);
  13.820  LINK_ENTITY_TO_GAME(item_chicken);
  13.821  LINK_ENTITY_TO_GAME(item_claymore);
  13.822 +LINK_ENTITY_TO_GAME(item_cloak);
  13.823  LINK_ENTITY_TO_GAME(item_cloaker);
  13.824  LINK_ENTITY_TO_GAME(item_concussion);
  13.825  LINK_ENTITY_TO_GAME(item_corpse);
  13.826 +LINK_ENTITY_TO_GAME(item_ctf_flag);
  13.827  LINK_ENTITY_TO_GAME(item_ctfaccelerator);
  13.828  LINK_ENTITY_TO_GAME(item_ctfbackpack);
  13.829  LINK_ENTITY_TO_GAME(item_ctfbase);
  13.830  LINK_ENTITY_TO_GAME(item_ctfflag);
  13.831 -LINK_ENTITY_TO_GAME(item_ctf_flag);
  13.832  LINK_ENTITY_TO_GAME(item_ctflongjump);
  13.833  LINK_ENTITY_TO_GAME(item_ctfportablehev);
  13.834  LINK_ENTITY_TO_GAME(item_ctfregeneration);
  13.835 @@ -1395,20 +1484,24 @@
  13.836  LINK_ENTITY_TO_GAME(item_megavirus);
  13.837  LINK_ENTITY_TO_GAME(item_metal);
  13.838  LINK_ENTITY_TO_GAME(item_mine);
  13.839 +LINK_ENTITY_TO_GAME(item_money);
  13.840 +LINK_ENTITY_TO_GAME(item_moneycase);
  13.841  LINK_ENTITY_TO_GAME(item_newspaper);
  13.842  LINK_ENTITY_TO_GAME(item_nightvision);
  13.843  LINK_ENTITY_TO_GAME(item_nuclearbomb);
  13.844  LINK_ENTITY_TO_GAME(item_nuclearbombbutton);
  13.845  LINK_ENTITY_TO_GAME(item_nuclearbombtimer);
  13.846  LINK_ENTITY_TO_GAME(item_nvg);
  13.847 -LINK_ENTITY_TO_GAME(item_NVG);
  13.848  LINK_ENTITY_TO_GAME(item_objective);
  13.849  LINK_ENTITY_TO_GAME(item_papers);
  13.850  LINK_ENTITY_TO_GAME(item_parachute);
  13.851  LINK_ENTITY_TO_GAME(item_pickaxe);
  13.852  LINK_ENTITY_TO_GAME(item_platemail);
  13.853 +LINK_ENTITY_TO_GAME(item_portableHEV);
  13.854 +LINK_ENTITY_TO_GAME(item_portableHealthkit);
  13.855  LINK_ENTITY_TO_GAME(item_powerarmor);
  13.856  LINK_ENTITY_TO_GAME(item_powerup);
  13.857 +LINK_ENTITY_TO_GAME(item_pt);
  13.858  LINK_ENTITY_TO_GAME(item_quad);
  13.859  LINK_ENTITY_TO_GAME(item_radio);
  13.860  LINK_ENTITY_TO_GAME(item_random);
  13.861 @@ -1448,13 +1541,9 @@
  13.862  LINK_ENTITY_TO_GAME(item_weapon);
  13.863  LINK_ENTITY_TO_GAME(item_wheelside);
  13.864  LINK_ENTITY_TO_GAME(item_wwgoal);
  13.865 -LINK_ENTITY_TO_GAME(i_t_g);
  13.866 -LINK_ENTITY_TO_GAME(i_t_t);
  13.867 -LINK_ENTITY_TO_GAME(i_w_g);
  13.868 -LINK_ENTITY_TO_GAME(i_w_t);
  13.869 -LINK_ENTITY_TO_GAME(jailer);
  13.870  LINK_ENTITY_TO_GAME(jail_execute);
  13.871  LINK_ENTITY_TO_GAME(jail_team_master);
  13.872 +LINK_ENTITY_TO_GAME(jailer);
  13.873  LINK_ENTITY_TO_GAME(javelin);
  13.874  LINK_ENTITY_TO_GAME(judge);
  13.875  LINK_ENTITY_TO_GAME(jumppad_sign);
  13.876 @@ -1469,25 +1558,27 @@
  13.877  LINK_ENTITY_TO_GAME(kwSpikeProjectile);
  13.878  LINK_ENTITY_TO_GAME(lance_proj);
  13.879  LINK_ENTITY_TO_GAME(laser_aimer);
  13.880 -LINK_ENTITY_TO_GAME(laserbolt);
  13.881  LINK_ENTITY_TO_GAME(laser_dot);
  13.882  LINK_ENTITY_TO_GAME(laser_spot);
  13.883 +LINK_ENTITY_TO_GAME(laserbolt);
  13.884  LINK_ENTITY_TO_GAME(law_rocket);
  13.885  LINK_ENTITY_TO_GAME(lc_init_ent);
  13.886  LINK_ENTITY_TO_GAME(lc_respawner);
  13.887  LINK_ENTITY_TO_GAME(lc_spawner);
  13.888  LINK_ENTITY_TO_GAME(lcs_spawner);
  13.889  LINK_ENTITY_TO_GAME(lflamme_fire);
  13.890 +LINK_ENTITY_TO_GAME(lgtng_ball);
  13.891  LINK_ENTITY_TO_GAME(lifesoul);
  13.892  LINK_ENTITY_TO_GAME(light);
  13.893  LINK_ENTITY_TO_GAME(light_environment);
  13.894 -LINK_ENTITY_TO_GAME(lightfader);
  13.895  LINK_ENTITY_TO_GAME(light_glow);
  13.896  LINK_ENTITY_TO_GAME(light_spot);
  13.897 +LINK_ENTITY_TO_GAME(lightfader);
  13.898  LINK_ENTITY_TO_GAME(load_wpt);
  13.899  LINK_ENTITY_TO_GAME(locus_alias);
  13.900  LINK_ENTITY_TO_GAME(locus_beam);
  13.901  LINK_ENTITY_TO_GAME(locus_variable);
  13.902 +LINK_ENTITY_TO_GAME(m203grenade);
  13.903  LINK_ENTITY_TO_GAME(m61_grenade);
  13.904  LINK_ENTITY_TO_GAME(m72_rocket);
  13.905  LINK_ENTITY_TO_GAME(magicattack);
  13.906 @@ -1534,8 +1625,8 @@
  13.907  LINK_ENTITY_TO_GAME(mi_model);
  13.908  LINK_ENTITY_TO_GAME(mi_model_names);
  13.909  LINK_ENTITY_TO_GAME(mi_model_static);
  13.910 -LINK_ENTITY_TO_GAME(mini_grunt);
  13.911 -LINK_ENTITY_TO_GAME(mini_rocket);
  13.912 +LINK_ENTITY_TO_GAME(mi_obj_icon);
  13.913 +LINK_ENTITY_TO_GAME(mi_obj_switch);
  13.914  LINK_ENTITY_TO_GAME(mi_objective_attack);
  13.915  LINK_ENTITY_TO_GAME(mi_objective_bomb);
  13.916  LINK_ENTITY_TO_GAME(mi_objective_defend);
  13.917 @@ -1548,15 +1639,11 @@
  13.918  LINK_ENTITY_TO_GAME(mi_objective_repair);
  13.919  LINK_ENTITY_TO_GAME(mi_objective_team1);
  13.920  LINK_ENTITY_TO_GAME(mi_objective_team2);
  13.921 -LINK_ENTITY_TO_GAME(mi_obj_icon);
  13.922 -LINK_ENTITY_TO_GAME(mi_obj_switch);
  13.923  LINK_ENTITY_TO_GAME(mi_respawn);
  13.924  LINK_ENTITY_TO_GAME(mi_set_objective);
  13.925  LINK_ENTITY_TO_GAME(mi_set_respawn);
  13.926  LINK_ENTITY_TO_GAME(mi_set_timer);
  13.927  LINK_ENTITY_TO_GAME(mi_spawn_zone);
  13.928 -LINK_ENTITY_TO_GAME(mission_modifier);
  13.929 -LINK_ENTITY_TO_GAME(misterx);
  13.930  LINK_ENTITY_TO_GAME(mi_team_damage);
  13.931  LINK_ENTITY_TO_GAME(mi_team_names);
  13.932  LINK_ENTITY_TO_GAME(mi_team_push);
  13.933 @@ -1564,11 +1651,17 @@
  13.934  LINK_ENTITY_TO_GAME(mi_timer);
  13.935  LINK_ENTITY_TO_GAME(mi_trigger_weather);
  13.936  LINK_ENTITY_TO_GAME(mi_weather);
  13.937 +LINK_ENTITY_TO_GAME(mini_grunt);
  13.938 +LINK_ENTITY_TO_GAME(mini_rocket);
  13.939 +LINK_ENTITY_TO_GAME(mission_modifier);
  13.940 +LINK_ENTITY_TO_GAME(misterx);
  13.941 +LINK_ENTITY_TO_GAME(mode_relay);
  13.942  LINK_ENTITY_TO_GAME(model_entity);
  13.943  LINK_ENTITY_TO_GAME(molotov);
  13.944  LINK_ENTITY_TO_GAME(momentary_door);
  13.945  LINK_ENTITY_TO_GAME(momentary_jail_door);
  13.946  LINK_ENTITY_TO_GAME(momentary_rot_button);
  13.947 +LINK_ENTITY_TO_GAME(monster_ShockTrooper_dead);
  13.948  LINK_ENTITY_TO_GAME(monster_a10);
  13.949  LINK_ENTITY_TO_GAME(monster_adrian);
  13.950  LINK_ENTITY_TO_GAME(monster_adrian_dead);
  13.951 @@ -1751,6 +1844,7 @@
  13.952  LINK_ENTITY_TO_GAME(monster_hwgrunt);
  13.953  LINK_ENTITY_TO_GAME(monster_hwgrunt_repel);
  13.954  LINK_ENTITY_TO_GAME(monster_ichthyosaur);
  13.955 +LINK_ENTITY_TO_GAME(monster_implanted);
  13.956  LINK_ENTITY_TO_GAME(monster_kaiewi);
  13.957  LINK_ENTITY_TO_GAME(monster_kaiewi_dead);
  13.958  LINK_ENTITY_TO_GAME(monster_kate);
  13.959 @@ -1763,7 +1857,6 @@
  13.960  LINK_ENTITY_TO_GAME(monster_llama);
  13.961  LINK_ENTITY_TO_GAME(monster_lrocket);
  13.962  LINK_ENTITY_TO_GAME(monster_m2);
  13.963 -LINK_ENTITY_TO_GAME(monstermaker);
  13.964  LINK_ENTITY_TO_GAME(monster_male_assassin);
  13.965  LINK_ENTITY_TO_GAME(monster_manta);
  13.966  LINK_ENTITY_TO_GAME(monster_masala);
  13.967 @@ -1801,8 +1894,6 @@
  13.968  LINK_ENTITY_TO_GAME(monster_pitworm);
  13.969  LINK_ENTITY_TO_GAME(monster_pitworm_up);
  13.970  LINK_ENTITY_TO_GAME(monster_player);
  13.971 -LINK_ENTITY_TO_GAME(monsterpoint);
  13.972 -LINK_ENTITY_TO_GAME(monsterpoint_backup);
  13.973  LINK_ENTITY_TO_GAME(monster_poison);
  13.974  LINK_ENTITY_TO_GAME(monster_powderkeg);
  13.975  LINK_ENTITY_TO_GAME(monster_prisoner);
  13.976 @@ -1819,8 +1910,8 @@
  13.977  LINK_ENTITY_TO_GAME(monster_replicator);
  13.978  LINK_ENTITY_TO_GAME(monster_robogrunt);
  13.979  LINK_ENTITY_TO_GAME(monster_robogrunt_dead);
  13.980 +LINK_ENTITY_TO_GAME(monster_robogrunt_repel);
  13.981  LINK_ENTITY_TO_GAME(monster_robogruntrepel);
  13.982 -LINK_ENTITY_TO_GAME(monster_robogrunt_repel);
  13.983  LINK_ENTITY_TO_GAME(monster_rustbattery);
  13.984  LINK_ENTITY_TO_GAME(monster_rustbit);
  13.985  LINK_ENTITY_TO_GAME(monster_rustbit_friendly);
  13.986 @@ -1837,7 +1928,6 @@
  13.987  LINK_ENTITY_TO_GAME(monster_sheep);
  13.988  LINK_ENTITY_TO_GAME(monster_shockroach);
  13.989  LINK_ENTITY_TO_GAME(monster_shocktrooper);
  13.990 -LINK_ENTITY_TO_GAME(monster_ShockTrooper_dead);
  13.991  LINK_ENTITY_TO_GAME(monster_shocktrooper_repel);
  13.992  LINK_ENTITY_TO_GAME(monster_shotgun);
  13.993  LINK_ENTITY_TO_GAME(monster_sitting_civilian);
  13.994 @@ -1856,6 +1946,7 @@
  13.995  LINK_ENTITY_TO_GAME(monster_skeleton_dead);
  13.996  LINK_ENTITY_TO_GAME(monster_skelly);
  13.997  LINK_ENTITY_TO_GAME(monster_skellydance);
  13.998 +LINK_ENTITY_TO_GAME(monster_skull);
  13.999  LINK_ENTITY_TO_GAME(monster_skunk);
 13.1000  LINK_ENTITY_TO_GAME(monster_smallminer);
 13.1001  LINK_ENTITY_TO_GAME(monster_smallminer_dead);
 13.1002 @@ -1912,8 +2003,11 @@
 13.1003  LINK_ENTITY_TO_GAME(monster_zombie_barney);
 13.1004  LINK_ENTITY_TO_GAME(monster_zombie_soldier);
 13.1005  LINK_ENTITY_TO_GAME(monster_zombie_soldier_dead);
 13.1006 +LINK_ENTITY_TO_GAME(monstermaker);
 13.1007 +LINK_ENTITY_TO_GAME(monsterpoint);
 13.1008 +LINK_ENTITY_TO_GAME(monsterpoint_backup);
 13.1009 +LINK_ENTITY_TO_GAME(mortar_shell);
 13.1010  LINK_ENTITY_TO_GAME(mortarshell);
 13.1011 -LINK_ENTITY_TO_GAME(mortar_shell);
 13.1012  LINK_ENTITY_TO_GAME(motion_manager);
 13.1013  LINK_ENTITY_TO_GAME(motion_thread);
 13.1014  LINK_ENTITY_TO_GAME(movementchamber);
 13.1015 @@ -1969,11 +2063,12 @@
 13.1016  LINK_ENTITY_TO_GAME(multi_gate_8);
 13.1017  LINK_ENTITY_TO_GAME(multi_gate_9);
 13.1018  LINK_ENTITY_TO_GAME(multi_manager);
 13.1019 +LINK_ENTITY_TO_GAME(multi_watcher);
 13.1020  LINK_ENTITY_TO_GAME(multisource);
 13.1021 -LINK_ENTITY_TO_GAME(multi_watcher);
 13.1022  LINK_ENTITY_TO_GAME(my_monster);
 13.1023  LINK_ENTITY_TO_GAME(nail);
 13.1024  LINK_ENTITY_TO_GAME(neutrinobeam);
 13.1025 +LINK_ENTITY_TO_GAME(nggrenade);
 13.1026  LINK_ENTITY_TO_GAME(nihilanth_energy_ball);
 13.1027  LINK_ENTITY_TO_GAME(node_viewer);
 13.1028  LINK_ENTITY_TO_GAME(node_viewer_fly);
 13.1029 @@ -1996,13 +2091,13 @@
 13.1030  LINK_ENTITY_TO_GAME(ol_bottle);
 13.1031  LINK_ENTITY_TO_GAME(ol_ctf_blueteam);
 13.1032  LINK_ENTITY_TO_GAME(ol_ctf_redteam);
 13.1033 -LINK_ENTITY_TO_GAME(oldbot);
 13.1034 -LINK_ENTITY_TO_GAME(old_rocket);
 13.1035  LINK_ENTITY_TO_GAME(ol_furniture);
 13.1036  LINK_ENTITY_TO_GAME(ol_lantern);
 13.1037  LINK_ENTITY_TO_GAME(ol_redcapture);
 13.1038  LINK_ENTITY_TO_GAME(ol_redflag);
 13.1039  LINK_ENTITY_TO_GAME(ol_spitoon);
 13.1040 +LINK_ENTITY_TO_GAME(old_rocket);
 13.1041 +LINK_ENTITY_TO_GAME(oldbot);
 13.1042  LINK_ENTITY_TO_GAME(op4mortar);
 13.1043  LINK_ENTITY_TO_GAME(oz_logo);
 13.1044  LINK_ENTITY_TO_GAME(oz_rune);
 13.1045 @@ -2021,15 +2116,15 @@
 13.1046  LINK_ENTITY_TO_GAME(pe_light);
 13.1047  LINK_ENTITY_TO_GAME(pe_light_ref);
 13.1048  LINK_ENTITY_TO_GAME(pe_object_case);
 13.1049 +LINK_ENTITY_TO_GAME(pe_object_htool);
 13.1050  LINK_ENTITY_TO_GAME(pe_objectclip);
 13.1051 -LINK_ENTITY_TO_GAME(pe_object_htool);
 13.1052  LINK_ENTITY_TO_GAME(pe_radar_mark);
 13.1053  LINK_ENTITY_TO_GAME(pe_rain);
 13.1054  LINK_ENTITY_TO_GAME(pe_spawn_corps);
 13.1055  LINK_ENTITY_TO_GAME(pe_spawn_syndicate);
 13.1056  LINK_ENTITY_TO_GAME(pe_terminal);
 13.1057 +LINK_ENTITY_TO_GAME(phase_pulse);
 13.1058  LINK_ENTITY_TO_GAME(phasegate);
 13.1059 -LINK_ENTITY_TO_GAME(phase_pulse);
 13.1060  LINK_ENTITY_TO_GAME(pickup_drive_agrunt);
 13.1061  LINK_ENTITY_TO_GAME(pickup_drive_apache);
 13.1062  LINK_ENTITY_TO_GAME(pickup_drive_assassin);
 13.1063 @@ -2043,12 +2138,13 @@
 13.1064  LINK_ENTITY_TO_GAME(pickup_drive_slave);
 13.1065  LINK_ENTITY_TO_GAME(pickup_drive_turret);
 13.1066  LINK_ENTITY_TO_GAME(pineapple);
 13.1067 +LINK_ENTITY_TO_GAME(pipe_bomb);
 13.1068  LINK_ENTITY_TO_GAME(pipebomb);
 13.1069 -LINK_ENTITY_TO_GAME(pipe_bomb);
 13.1070  LINK_ENTITY_TO_GAME(pitdronespike);
 13.1071  LINK_ENTITY_TO_GAME(pitworm_gib);
 13.1072  LINK_ENTITY_TO_GAME(pitworm_gibshooter);
 13.1073  LINK_ENTITY_TO_GAME(plasma);
 13.1074 +LINK_ENTITY_TO_GAME(plasma2);
 13.1075  LINK_ENTITY_TO_GAME(plasma_ball);
 13.1076  LINK_ENTITY_TO_GAME(player);
 13.1077  LINK_ENTITY_TO_GAME(player_beartrapstrip);
 13.1078 @@ -2058,7 +2154,6 @@
 13.1079  LINK_ENTITY_TO_GAME(player_giveitems);
 13.1080  LINK_ENTITY_TO_GAME(player_glasses);
 13.1081  LINK_ENTITY_TO_GAME(player_helmet);
 13.1082 -LINK_ENTITY_TO_GAME(playerhornet);
 13.1083  LINK_ENTITY_TO_GAME(player_loadsaved);
 13.1084  LINK_ENTITY_TO_GAME(player_respawn_zone);
 13.1085  LINK_ENTITY_TO_GAME(player_roach);
 13.1086 @@ -2066,6 +2161,7 @@
 13.1087  LINK_ENTITY_TO_GAME(player_togglehud);
 13.1088  LINK_ENTITY_TO_GAME(player_weaponship);
 13.1089  LINK_ENTITY_TO_GAME(player_weaponstrip);
 13.1090 +LINK_ENTITY_TO_GAME(playerhornet);
 13.1091  LINK_ENTITY_TO_GAME(point_win);
 13.1092  LINK_ENTITY_TO_GAME(poison_injected);
 13.1093  LINK_ENTITY_TO_GAME(potatoc);
 13.1094 @@ -2112,6 +2208,7 @@
 13.1095  LINK_ENTITY_TO_GAME(proj_whirlwind);
 13.1096  LINK_ENTITY_TO_GAME(proj_wyvern);
 13.1097  LINK_ENTITY_TO_GAME(promagcurse);
 13.1098 +LINK_ENTITY_TO_GAME(pshield_det);
 13.1099  LINK_ENTITY_TO_GAME(pt_bomb_zone);
 13.1100  LINK_ENTITY_TO_GAME(pt_campaign_end);
 13.1101  LINK_ENTITY_TO_GAME(pt_change_attribute);
 13.1102 @@ -2131,6 +2228,7 @@
 13.1103  LINK_ENTITY_TO_GAME(pt_trigger_bomb);
 13.1104  LINK_ENTITY_TO_GAME(pt_trigger_loader);
 13.1105  LINK_ENTITY_TO_GAME(pt_trigger_zone);
 13.1106 +LINK_ENTITY_TO_GAME(pulse);
 13.1107  LINK_ENTITY_TO_GAME(pulsefrag);
 13.1108  LINK_ENTITY_TO_GAME(punch_tripmine);
 13.1109  LINK_ENTITY_TO_GAME(push_point1);
 13.1110 @@ -2138,12 +2236,13 @@
 13.1111  LINK_ENTITY_TO_GAME(push_point3);
 13.1112  LINK_ENTITY_TO_GAME(push_point4);
 13.1113  LINK_ENTITY_TO_GAME(push_point5);
 13.1114 -LINK_ENTITY_TO_GAME(PythRound);
 13.1115  LINK_ENTITY_TO_GAME(quake_nail);
 13.1116  LINK_ENTITY_TO_GAME(quake_rocket);
 13.1117  LINK_ENTITY_TO_GAME(race_controller);
 13.1118  LINK_ENTITY_TO_GAME(race_path);
 13.1119  LINK_ENTITY_TO_GAME(rage);
 13.1120 +LINK_ENTITY_TO_GAME(rain_modify);
 13.1121 +LINK_ENTITY_TO_GAME(rain_settings);
 13.1122  LINK_ENTITY_TO_GAME(random_ammo);
 13.1123  LINK_ENTITY_TO_GAME(random_speaker);
 13.1124  LINK_ENTITY_TO_GAME(random_trigger);
 13.1125 @@ -2164,14 +2263,14 @@
 13.1126  LINK_ENTITY_TO_GAME(rocket_napalm);
 13.1127  LINK_ENTITY_TO_GAME(rocket_phoenix);
 13.1128  LINK_ENTITY_TO_GAME(rocket_pigeon);
 13.1129 +LINK_ENTITY_TO_GAME(rocket_snipe);
 13.1130  LINK_ENTITY_TO_GAME(rocketpistol_rocket);
 13.1131 -LINK_ENTITY_TO_GAME(rocket_snipe);
 13.1132 -LINK_ENTITY_TO_GAME(RONINTeamScore);
 13.1133  LINK_ENTITY_TO_GAME(rope_sample);
 13.1134  LINK_ENTITY_TO_GAME(rope_segment);
 13.1135  LINK_ENTITY_TO_GAME(rpg7_rocket);
 13.1136  LINK_ENTITY_TO_GAME(rpg_rocket);
 13.1137  LINK_ENTITY_TO_GAME(rr_shell);
 13.1138 +LINK_ENTITY_TO_GAME(rrp);
 13.1139  LINK_ENTITY_TO_GAME(rs_effect);
 13.1140  LINK_ENTITY_TO_GAME(rs_fog);
 13.1141  LINK_ENTITY_TO_GAME(rs_grenade);
 13.1142 @@ -2183,21 +2282,18 @@
 13.1143  LINK_ENTITY_TO_GAME(rs_timer);
 13.1144  LINK_ENTITY_TO_GAME(rs_val);
 13.1145  LINK_ENTITY_TO_GAME(rs_victorypoints);
 13.1146 -LINK_ENTITY_TO_GAME(SA_Model);
 13.1147  LINK_ENTITY_TO_GAME(sams_shower);
 13.1148  LINK_ENTITY_TO_GAME(sanity);
 13.1149  LINK_ENTITY_TO_GAME(satelite_laser);
 13.1150 -LINK_ENTITY_TO_GAME(Satelite__Laser);
 13.1151  LINK_ENTITY_TO_GAME(save_wpt);
 13.1152  LINK_ENTITY_TO_GAME(scan);
 13.1153  LINK_ENTITY_TO_GAME(scatterattack);
 13.1154  LINK_ENTITY_TO_GAME(scattersplit);
 13.1155 -LINK_ENTITY_TO_GAME(SCAVENGERTeamScore);
 13.1156 -LINK_ENTITY_TO_GAME(scientistbomb);
 13.1157 +LINK_ENTITY_TO_GAME(sci_spawner);
 13.1158  LINK_ENTITY_TO_GAME(scientist_mine);
 13.1159 -LINK_ENTITY_TO_GAME(sci_spawner);
 13.1160 +LINK_ENTITY_TO_GAME(scientistbomb);
 13.1161 +LINK_ENTITY_TO_GAME(score_multiplier);
 13.1162  LINK_ENTITY_TO_GAME(scoreboard);
 13.1163 -LINK_ENTITY_TO_GAME(score_multiplier);
 13.1164  LINK_ENTITY_TO_GAME(scripted);
 13.1165  LINK_ENTITY_TO_GAME(scripted_action);
 13.1166  LINK_ENTITY_TO_GAME(scripted_sentence);
 13.1167 @@ -2232,15 +2328,18 @@
 13.1168  LINK_ENTITY_TO_GAME(shell_pschreck);
 13.1169  LINK_ENTITY_TO_GAME(shenlong);
 13.1170  LINK_ENTITY_TO_GAME(shipAI_shipmate);
 13.1171 +LINK_ENTITY_TO_GAME(shock);
 13.1172 +LINK_ENTITY_TO_GAME(shockH);
 13.1173  LINK_ENTITY_TO_GAME(shock_beam);
 13.1174 +LINK_ENTITY_TO_GAME(shockcore);
 13.1175  LINK_ENTITY_TO_GAME(shotgun_crate);
 13.1176  LINK_ENTITY_TO_GAME(shotgun_forklift);
 13.1177  LINK_ENTITY_TO_GAME(shotgun_hev);
 13.1178  LINK_ENTITY_TO_GAME(shotgun_sci);
 13.1179  LINK_ENTITY_TO_GAME(show_wpt);
 13.1180  LINK_ENTITY_TO_GAME(shrapnel);
 13.1181 +LINK_ENTITY_TO_GAME(shrink_timer);
 13.1182  LINK_ENTITY_TO_GAME(shrinker_project);
 13.1183 -LINK_ENTITY_TO_GAME(shrink_timer);
 13.1184  LINK_ENTITY_TO_GAME(siegeturret);
 13.1185  LINK_ENTITY_TO_GAME(skull);
 13.1186  LINK_ENTITY_TO_GAME(skunk_fart);
 13.1187 @@ -2257,8 +2356,6 @@
 13.1188  LINK_ENTITY_TO_GAME(slGruntTakeCoverFromBestSound);
 13.1189  LINK_ENTITY_TO_GAME(slGruntTossGrenadeCover);
 13.1190  LINK_ENTITY_TO_GAME(slIdleTrigger);
 13.1191 -LINK_ENTITY_TO_GAME(slowcurse);
 13.1192 -LINK_ENTITY_TO_GAME(slowrefirecurse);
 13.1193  LINK_ENTITY_TO_GAME(slRunToScript);
 13.1194  LINK_ENTITY_TO_GAME(slTakeCoverFromBestSound);
 13.1195  LINK_ENTITY_TO_GAME(slTakeCoverFromEnemy);
 13.1196 @@ -2267,9 +2364,11 @@
 13.1197  LINK_ENTITY_TO_GAME(slTlkIdleWatchClient);
 13.1198  LINK_ENTITY_TO_GAME(slTwitchDie);
 13.1199  LINK_ENTITY_TO_GAME(slWalkToScript);
 13.1200 -LINK_ENTITY_TO_GAME(smoking_grenade);
 13.1201 +LINK_ENTITY_TO_GAME(slowcurse);
 13.1202 +LINK_ENTITY_TO_GAME(slowrefirecurse);
 13.1203  LINK_ENTITY_TO_GAME(sm_project);
 13.1204  LINK_ENTITY_TO_GAME(sm_rocket_01);
 13.1205 +LINK_ENTITY_TO_GAME(smoking_grenade);
 13.1206  LINK_ENTITY_TO_GAME(snark_cam);
 13.1207  LINK_ENTITY_TO_GAME(snark_project);
 13.1208  LINK_ENTITY_TO_GAME(snowball);
 13.1209 @@ -2277,32 +2376,39 @@
 13.1210  LINK_ENTITY_TO_GAME(spark_shower);
 13.1211  LINK_ENTITY_TO_GAME(spawn_base_team1);
 13.1212  LINK_ENTITY_TO_GAME(spawn_base_team2);
 13.1213 -LINK_ENTITY_TO_GAME(spawnfar);
 13.1214  LINK_ENTITY_TO_GAME(spawn_observer);
 13.1215  LINK_ENTITY_TO_GAME(spawn_player_custom);
 13.1216  LINK_ENTITY_TO_GAME(spawn_player_team1);
 13.1217  LINK_ENTITY_TO_GAME(spawn_player_team2);
 13.1218 +LINK_ENTITY_TO_GAME(spawnfar);
 13.1219  LINK_ENTITY_TO_GAME(speaker);
 13.1220  LINK_ENTITY_TO_GAME(spear_bolt);
 13.1221  LINK_ENTITY_TO_GAME(specailbc);
 13.1222 +LINK_ENTITY_TO_GAME(special_teleport_in);
 13.1223  LINK_ENTITY_TO_GAME(sphere_explosion);
 13.1224  LINK_ENTITY_TO_GAME(sphere_mine);
 13.1225  LINK_ENTITY_TO_GAME(spirit_bomb);
 13.1226 -LINK_ENTITY_TO_GAME(_spit);
 13.1227  LINK_ENTITY_TO_GAME(spitgunprojectile);
 13.1228  LINK_ENTITY_TO_GAME(spore);
 13.1229  LINK_ENTITY_TO_GAME(sporegrenade);
 13.1230  LINK_ENTITY_TO_GAME(sporegunprojectile);
 13.1231  LINK_ENTITY_TO_GAME(spy_camera);
 13.1232  LINK_ENTITY_TO_GAME(spy_escape);
 13.1233 -LINK_ENTITY_TO_GAME(_squadfix);
 13.1234  LINK_ENTITY_TO_GAME(squadmaker);
 13.1235  LINK_ENTITY_TO_GAME(squidspit);
 13.1236 +LINK_ENTITY_TO_GAME(sstrike);
 13.1237 +LINK_ENTITY_TO_GAME(st_rocket);
 13.1238  LINK_ENTITY_TO_GAME(streak_spiral);
 13.1239 -LINK_ENTITY_TO_GAME(st_rocket);
 13.1240 +LINK_ENTITY_TO_GAME(struct_goa);
 13.1241 +LINK_ENTITY_TO_GAME(struct_goa_actual);
 13.1242 +LINK_ENTITY_TO_GAME(struct_goa_actual_sub);
 13.1243 +LINK_ENTITY_TO_GAME(struct_tau);
 13.1244 +LINK_ENTITY_TO_GAME(struct_tau_actual);
 13.1245 +LINK_ENTITY_TO_GAME(struct_tau_actual_sub);
 13.1246  LINK_ENTITY_TO_GAME(sturmbody);
 13.1247  LINK_ENTITY_TO_GAME(suck_grenade);
 13.1248  LINK_ENTITY_TO_GAME(suck_mine);
 13.1249 +LINK_ENTITY_TO_GAME(sunofgod);
 13.1250  LINK_ENTITY_TO_GAME(swarm_garg_stomp);
 13.1251  LINK_ENTITY_TO_GAME(swarm_spawnpt_acontroller);
 13.1252  LINK_ENTITY_TO_GAME(swarm_spawnpt_agarg);
 13.1253 @@ -2328,6 +2434,7 @@
 13.1254  LINK_ENTITY_TO_GAME(tango_nomad);
 13.1255  LINK_ENTITY_TO_GAME(tango_sentinel);
 13.1256  LINK_ENTITY_TO_GAME(tango_sniper);
 13.1257 +LINK_ENTITY_TO_GAME(targ_speaker);
 13.1258  LINK_ENTITY_TO_GAME(target_all_players);
 13.1259  LINK_ENTITY_TO_GAME(target_animation);
 13.1260  LINK_ENTITY_TO_GAME(target_cdaudio);
 13.1261 @@ -2353,13 +2460,12 @@
 13.1262  LINK_ENTITY_TO_GAME(target_spawnitem);
 13.1263  LINK_ENTITY_TO_GAME(target_spectate);
 13.1264  LINK_ENTITY_TO_GAME(target_team);
 13.1265 +LINK_ENTITY_TO_GAME(target_team_score);
 13.1266  LINK_ENTITY_TO_GAME(target_teamdie);
 13.1267 -LINK_ENTITY_TO_GAME(target_team_score);
 13.1268  LINK_ENTITY_TO_GAME(target_teleport);
 13.1269  LINK_ENTITY_TO_GAME(target_tripmine);
 13.1270  LINK_ENTITY_TO_GAME(target_weaponstrip);
 13.1271  LINK_ENTITY_TO_GAME(target_win);
 13.1272 -LINK_ENTITY_TO_GAME(targ_speaker);
 13.1273  LINK_ENTITY_TO_GAME(tcontroller_cball);
 13.1274  LINK_ENTITY_TO_GAME(tcontroller_tball);
 13.1275  LINK_ENTITY_TO_GAME(team_advarmory);
 13.1276 @@ -2379,6 +2485,9 @@
 13.1277  LINK_ENTITY_TO_GAME(team_webstrand);
 13.1278  LINK_ENTITY_TO_GAME(telebecon);
 13.1279  LINK_ENTITY_TO_GAME(teledeath);
 13.1280 +LINK_ENTITY_TO_GAME(teleenter);
 13.1281 +LINK_ENTITY_TO_GAME(temp_eject);
 13.1282 +LINK_ENTITY_TO_GAME(teslagren);
 13.1283  LINK_ENTITY_TO_GAME(test_effect);
 13.1284  LINK_ENTITY_TO_GAME(testhull);
 13.1285  LINK_ENTITY_TO_GAME(testparticles);
 13.1286 @@ -2425,8 +2534,8 @@
 13.1287  LINK_ENTITY_TO_GAME(thrown_knife);
 13.1288  LINK_ENTITY_TO_GAME(thrown_object);
 13.1289  LINK_ENTITY_TO_GAME(thrown_sledge);
 13.1290 +LINK_ENTITY_TO_GAME(timed_grenade);
 13.1291  LINK_ENTITY_TO_GAME(timedevent);
 13.1292 -LINK_ENTITY_TO_GAME(timed_grenade);
 13.1293  LINK_ENTITY_TO_GAME(timer);
 13.1294  LINK_ENTITY_TO_GAME(timer_add);
 13.1295  LINK_ENTITY_TO_GAME(tlAGruntTakeCoverFromEnemy);
 13.1296 @@ -2464,6 +2573,9 @@
 13.1297  LINK_ENTITY_TO_GAME(trenches_axis_start);
 13.1298  LINK_ENTITY_TO_GAME(trenches_central_start);
 13.1299  LINK_ENTITY_TO_GAME(trigger);
 13.1300 +LINK_ENTITY_TO_GAME(trigger_GoalLine);
 13.1301 +LINK_ENTITY_TO_GAME(trigger_PenaltyBox);
 13.1302 +LINK_ENTITY_TO_GAME(trigger_SideLine);
 13.1303  LINK_ENTITY_TO_GAME(trigger_adv_teleport);
 13.1304  LINK_ENTITY_TO_GAME(trigger_armory);
 13.1305  LINK_ENTITY_TO_GAME(trigger_assault);
 13.1306 @@ -2504,7 +2616,6 @@
 13.1307  LINK_ENTITY_TO_GAME(trigger_flagcheck);
 13.1308  LINK_ENTITY_TO_GAME(trigger_geneworm_hit);
 13.1309  LINK_ENTITY_TO_GAME(trigger_goal);
 13.1310 -LINK_ENTITY_TO_GAME(trigger_GoalLine);
 13.1311  LINK_ENTITY_TO_GAME(trigger_golem);
 13.1312  LINK_ENTITY_TO_GAME(trigger_gravity);
 13.1313  LINK_ENTITY_TO_GAME(trigger_gunmanteleport);
 13.1314 @@ -2520,8 +2631,8 @@
 13.1315  LINK_ENTITY_TO_GAME(trigger_jump);
 13.1316  LINK_ENTITY_TO_GAME(trigger_jumppad);
 13.1317  LINK_ENTITY_TO_GAME(trigger_katehealth);
 13.1318 +LINK_ENTITY_TO_GAME(trigger_kill_nogib);
 13.1319  LINK_ENTITY_TO_GAME(trigger_killmonster);
 13.1320 -LINK_ENTITY_TO_GAME(trigger_kill_nogib);
 13.1321  LINK_ENTITY_TO_GAME(trigger_lightstyle);
 13.1322  LINK_ENTITY_TO_GAME(trigger_loadhazard);
 13.1323  LINK_ENTITY_TO_GAME(trigger_mine);
 13.1324 @@ -2536,7 +2647,6 @@
 13.1325  LINK_ENTITY_TO_GAME(trigger_once_round);
 13.1326  LINK_ENTITY_TO_GAME(trigger_onsight);
 13.1327  LINK_ENTITY_TO_GAME(trigger_particles);
 13.1328 -LINK_ENTITY_TO_GAME(trigger_PenaltyBox);
 13.1329  LINK_ENTITY_TO_GAME(trigger_playerfreeze);
 13.1330  LINK_ENTITY_TO_GAME(trigger_point_controle);
 13.1331  LINK_ENTITY_TO_GAME(trigger_presence);
 13.1332 @@ -2558,7 +2668,6 @@
 13.1333  LINK_ENTITY_TO_GAME(trigger_setflag);
 13.1334  LINK_ENTITY_TO_GAME(trigger_setorigin);
 13.1335  LINK_ENTITY_TO_GAME(trigger_shutup);
 13.1336 -LINK_ENTITY_TO_GAME(trigger_SideLine);
 13.1337  LINK_ENTITY_TO_GAME(trigger_sound);
 13.1338  LINK_ENTITY_TO_GAME(trigger_speed);
 13.1339  LINK_ENTITY_TO_GAME(trigger_sponly);
 13.1340 @@ -2572,9 +2681,7 @@
 13.1341  LINK_ENTITY_TO_GAME(trigger_zone_bleu);
 13.1342  LINK_ENTITY_TO_GAME(trigger_zone_rouge);
 13.1343  LINK_ENTITY_TO_GAME(trip_beam);
 13.1344 -LINK_ENTITY_TO_GAME(TSAmmoPack);
 13.1345  LINK_ENTITY_TO_GAME(ts_bomb);
 13.1346 -LINK_ENTITY_TO_GAME(TS_bomb);
 13.1347  LINK_ENTITY_TO_GAME(ts_dmhill);
 13.1348  LINK_ENTITY_TO_GAME(ts_groundweapon);
 13.1349  LINK_ENTITY_TO_GAME(ts_hack);
 13.1350 @@ -2583,20 +2690,17 @@
 13.1351  LINK_ENTITY_TO_GAME(ts_objective_manager);
 13.1352  LINK_ENTITY_TO_GAME(ts_objective_ptr);
 13.1353  LINK_ENTITY_TO_GAME(ts_powerup);
 13.1354 -LINK_ENTITY_TO_GAME(TS_PowerUp);
 13.1355  LINK_ENTITY_TO_GAME(ts_slowmotion);
 13.1356  LINK_ENTITY_TO_GAME(ts_slowmotionpoint);
 13.1357  LINK_ENTITY_TO_GAME(ts_teamescape);
 13.1358  LINK_ENTITY_TO_GAME(ts_trigger);
 13.1359  LINK_ENTITY_TO_GAME(ts_vipescape);
 13.1360  LINK_ENTITY_TO_GAME(ts_wingiver);
 13.1361 -LINK_ENTITY_TO_GAME(TSWorldGun);
 13.1362  LINK_ENTITY_TO_GAME(turf_zone);
 13.1363  LINK_ENTITY_TO_GAME(turret);
 13.1364  LINK_ENTITY_TO_GAME(ultima_grenade);
 13.1365  LINK_ENTITY_TO_GAME(umbracloud);
 13.1366  LINK_ENTITY_TO_GAME(umbraprojectile);
 13.1367 -LINK_ENTITY_TO_GAME(USMCTeamScore);
 13.1368  LINK_ENTITY_TO_GAME(uw_monster_hybrid);
 13.1369  LINK_ENTITY_TO_GAME(uw_monster_michael);
 13.1370  LINK_ENTITY_TO_GAME(uw_player_lycan);
 13.1371 @@ -2622,6 +2726,7 @@
 13.1372  LINK_ENTITY_TO_GAME(weapon_1445lda);
 13.1373  LINK_ENTITY_TO_GAME(weapon_1911);
 13.1374  LINK_ENTITY_TO_GAME(weapon_30cal);
 13.1375 +LINK_ENTITY_TO_GAME(weapon_30mmsg);
 13.1376  LINK_ENTITY_TO_GAME(weapon_357);
 13.1377  LINK_ENTITY_TO_GAME(weapon_40gl);
 13.1378  LINK_ENTITY_TO_GAME(weapon_44sw);
 13.1379 @@ -2632,6 +2737,27 @@
 13.1380  LINK_ENTITY_TO_GAME(weapon_9mmAR);
 13.1381  LINK_ENTITY_TO_GAME(weapon_9mmhandgun);
 13.1382  LINK_ENTITY_TO_GAME(weapon_9mmm41a);
 13.1383 +LINK_ENTITY_TO_GAME(weapon_BritGrenMelee);
 13.1384 +LINK_ENTITY_TO_GAME(weapon_BritGrenNade);
 13.1385 +LINK_ENTITY_TO_GAME(weapon_BrownBess);
 13.1386 +LINK_ENTITY_TO_GAME(weapon_CEnfield);
 13.1387 +LINK_ENTITY_TO_GAME(weapon_CEnfieldMelee);
 13.1388 +LINK_ENTITY_TO_GAME(weapon_CEnfieldNade);
 13.1389 +LINK_ENTITY_TO_GAME(weapon_Charleville);
 13.1390 +LINK_ENTITY_TO_GAME(weapon_FT);
 13.1391 +LINK_ENTITY_TO_GAME(weapon_G11);
 13.1392 +LINK_ENTITY_TO_GAME(weapon_GMauserG98);
 13.1393 +LINK_ENTITY_TO_GAME(weapon_GMauserG98Melee);
 13.1394 +LINK_ENTITY_TO_GAME(weapon_GMauserG98Nade);
 13.1395 +LINK_ENTITY_TO_GAME(weapon_GermGrenMelee);
 13.1396 +LINK_ENTITY_TO_GAME(weapon_GermGrenNade);
 13.1397 +LINK_ENTITY_TO_GAME(weapon_Knife);
 13.1398 +LINK_ENTITY_TO_GAME(weapon_Pennsylvania);
 13.1399 +LINK_ENTITY_TO_GAME(weapon_PistolA);
 13.1400 +LINK_ENTITY_TO_GAME(weapon_PistolB);
 13.1401 +LINK_ENTITY_TO_GAME(weapon_Revolutionnaire);
 13.1402 +LINK_ENTITY_TO_GAME(weapon_SPchemicalgun);
 13.1403 +LINK_ENTITY_TO_GAME(weapon_Sabre);
 13.1404  LINK_ENTITY_TO_GAME(weapon_a5);
 13.1405  LINK_ENTITY_TO_GAME(weapon_aandagger);
 13.1406  LINK_ENTITY_TO_GAME(weapon_acannon);
 13.1407 @@ -2646,11 +2772,12 @@
 13.1408  LINK_ENTITY_TO_GAME(weapon_ak5);
 13.1409  LINK_ENTITY_TO_GAME(weapon_ak5s);
 13.1410  LINK_ENTITY_TO_GAME(weapon_ak74);
 13.1411 +LINK_ENTITY_TO_GAME(weapon_akimbo_glocks);
 13.1412  LINK_ENTITY_TO_GAME(weapon_akimbob);
 13.1413  LINK_ENTITY_TO_GAME(weapon_akimboberettas);
 13.1414  LINK_ENTITY_TO_GAME(weapon_akimbocolts);
 13.1415  LINK_ENTITY_TO_GAME(weapon_akimbodeagles);
 13.1416 -LINK_ENTITY_TO_GAME(weapon_akimbo_glocks);
 13.1417 +LINK_ENTITY_TO_GAME(weapon_akimbogun);
 13.1418  LINK_ENTITY_TO_GAME(weapon_akimbosawedoffs);
 13.1419  LINK_ENTITY_TO_GAME(weapon_akimcolt);
 13.1420  LINK_ENTITY_TO_GAME(weapon_akimsaa);
 13.1421 @@ -2664,10 +2791,12 @@
 13.1422  LINK_ENTITY_TO_GAME(weapon_angel);
 13.1423  LINK_ENTITY_TO_GAME(weapon_ar10);
 13.1424  LINK_ENTITY_TO_GAME(weapon_ar33);
 13.1425 +LINK_ENTITY_TO_GAME(weapon_assaultminigun);
 13.1426  LINK_ENTITY_TO_GAME(weapon_aug);
 13.1427  LINK_ENTITY_TO_GAME(weapon_autococker);
 13.1428  LINK_ENTITY_TO_GAME(weapon_autogl);
 13.1429  LINK_ENTITY_TO_GAME(weapon_automag);
 13.1430 +LINK_ENTITY_TO_GAME(weapon_autoshotgun);
 13.1431  LINK_ENTITY_TO_GAME(weapon_awm);
 13.1432  LINK_ENTITY_TO_GAME(weapon_awp);
 13.1433  LINK_ENTITY_TO_GAME(weapon_axe);
 13.1434 @@ -2679,8 +2808,10 @@
 13.1435  LINK_ENTITY_TO_GAME(weapon_banana);
 13.1436  LINK_ENTITY_TO_GAME(weapon_banane);
 13.1437  LINK_ENTITY_TO_GAME(weapon_bandage);
 13.1438 +LINK_ENTITY_TO_GAME(weapon_bandsaw);
 13.1439  LINK_ENTITY_TO_GAME(weapon_bang);
 13.1440  LINK_ENTITY_TO_GAME(weapon_bar);
 13.1441 +LINK_ENTITY_TO_GAME(weapon_barett);
 13.1442  LINK_ENTITY_TO_GAME(weapon_baretta);
 13.1443  LINK_ENTITY_TO_GAME(weapon_barnacle);
 13.1444  LINK_ENTITY_TO_GAME(weapon_barney9mmar);
 13.1445 @@ -2707,6 +2838,7 @@
 13.1446  LINK_ENTITY_TO_GAME(weapon_ber93r);
 13.1447  LINK_ENTITY_TO_GAME(weapon_beretta);
 13.1448  LINK_ENTITY_TO_GAME(weapon_beretta_a);
 13.1449 +LINK_ENTITY_TO_GAME(weapon_bfg);
 13.1450  LINK_ENTITY_TO_GAME(weapon_bigaxe);
 13.1451  LINK_ENTITY_TO_GAME(weapon_bigbang);
 13.1452  LINK_ENTITY_TO_GAME(weapon_biggun);
 13.1453 @@ -2728,13 +2860,9 @@
 13.1454  LINK_ENTITY_TO_GAME(weapon_bomb);
 13.1455  LINK_ENTITY_TO_GAME(weapon_bomber);
 13.1456  LINK_ENTITY_TO_GAME(weapon_bow);
 13.1457 -LINK_ENTITY_TO_GAME(weaponbox);
 13.1458  LINK_ENTITY_TO_GAME(weapon_bren);
 13.1459  LINK_ENTITY_TO_GAME(weapon_brickcannon);
 13.1460  LINK_ENTITY_TO_GAME(weapon_briefcase);
 13.1461 -LINK_ENTITY_TO_GAME(weapon_BritGrenMelee);
 13.1462 -LINK_ENTITY_TO_GAME(weapon_BritGrenNade);
 13.1463 -LINK_ENTITY_TO_GAME(weapon_BrownBess);
 13.1464  LINK_ENTITY_TO_GAME(weapon_bsword);
 13.1465  LINK_ENTITY_TO_GAME(weapon_buffalo);
 13.1466  LINK_ENTITY_TO_GAME(weapon_burningattack);
 13.1467 @@ -2751,20 +2879,17 @@
 13.1468  LINK_ENTITY_TO_GAME(weapon_cattleprod);
 13.1469  LINK_ENTITY_TO_GAME(weapon_caws);
 13.1470  LINK_ENTITY_TO_GAME(weapon_ce_lasgun);
 13.1471 -LINK_ENTITY_TO_GAME(weapon_cellphone);
 13.1472 -LINK_ENTITY_TO_GAME(weapon_CEnfield);
 13.1473 -LINK_ENTITY_TO_GAME(weapon_CEnfieldMelee);
 13.1474 -LINK_ENTITY_TO_GAME(weapon_CEnfieldNade);
 13.1475  LINK_ENTITY_TO_GAME(weapon_ce_powersword);
 13.1476  LINK_ENTITY_TO_GAME(weapon_ce_psistaff);
 13.1477  LINK_ENTITY_TO_GAME(weapon_ce_rocketlauncher);
 13.1478  LINK_ENTITY_TO_GAME(weapon_ce_shurikencatapult);
 13.1479  LINK_ENTITY_TO_GAME(weapon_ce_shurikenpistol);
 13.1480 +LINK_ENTITY_TO_GAME(weapon_cellphone);
 13.1481  LINK_ENTITY_TO_GAME(weapon_chaingun);
 13.1482  LINK_ENTITY_TO_GAME(weapon_chainsaw);
 13.1483  LINK_ENTITY_TO_GAME(weapon_charge);
 13.1484  LINK_ENTITY_TO_GAME(weapon_charged);
 13.1485 -LINK_ENTITY_TO_GAME(weapon_Charleville);
 13.1486 +LINK_ENTITY_TO_GAME(weapon_chronosceptor);
 13.1487  LINK_ENTITY_TO_GAME(weapon_claw);
 13.1488  LINK_ENTITY_TO_GAME(weapon_claws);
 13.1489  LINK_ENTITY_TO_GAME(weapon_claymore);
 13.1490 @@ -2847,9 +2972,9 @@
 13.1491  LINK_ENTITY_TO_GAME(weapon_eagle);
 13.1492  LINK_ENTITY_TO_GAME(weapon_eballblaster);
 13.1493  LINK_ENTITY_TO_GAME(weapon_egon);
 13.1494 +LINK_ENTITY_TO_GAME(weapon_el_standard);
 13.1495  LINK_ENTITY_TO_GAME(weapon_electro);
 13.1496  LINK_ENTITY_TO_GAME(weapon_elite);
 13.1497 -LINK_ENTITY_TO_GAME(weapon_el_standard);
 13.1498  LINK_ENTITY_TO_GAME(weapon_emag);
 13.1499  LINK_ENTITY_TO_GAME(weapon_empcannon);
 13.1500  LINK_ENTITY_TO_GAME(weapon_emsniper);
 13.1501 @@ -2895,10 +3020,9 @@
 13.1502  LINK_ENTITY_TO_GAME(weapon_freezer);
 13.1503  LINK_ENTITY_TO_GAME(weapon_freezerayspell);
 13.1504  LINK_ENTITY_TO_GAME(weapon_friezadisc);
 13.1505 -LINK_ENTITY_TO_GAME(weapon_FT);
 13.1506 +LINK_ENTITY_TO_GAME(weapon_froster);
 13.1507  LINK_ENTITY_TO_GAME(weapon_fusil);
 13.1508  LINK_ENTITY_TO_GAME(weapon_g11);
 13.1509 -LINK_ENTITY_TO_GAME(weapon_G11);
 13.1510  LINK_ENTITY_TO_GAME(weapon_g36);
 13.1511  LINK_ENTITY_TO_GAME(weapon_g36c);
 13.1512  LINK_ENTITY_TO_GAME(weapon_g36cs);
 13.1513 @@ -2921,8 +3045,6 @@
 13.1514  LINK_ENTITY_TO_GAME(weapon_genericbeam);
 13.1515  LINK_ENTITY_TO_GAME(weapon_gerknife);
 13.1516  LINK_ENTITY_TO_GAME(weapon_germanknife);
 13.1517 -LINK_ENTITY_TO_GAME(weapon_GermGrenMelee);
 13.1518 -LINK_ENTITY_TO_GAME(weapon_GermGrenNade);
 13.1519  LINK_ENTITY_TO_GAME(weapon_gewehr);
 13.1520  LINK_ENTITY_TO_GAME(weapon_giantplantspell);
 13.1521  LINK_ENTITY_TO_GAME(weapon_glauncher);
 13.1522 @@ -2931,9 +3053,8 @@
 13.1523  LINK_ENTITY_TO_GAME(weapon_glock18);
 13.1524  LINK_ENTITY_TO_GAME(weapon_glock_auto);
 13.1525  LINK_ENTITY_TO_GAME(weapon_glock_auto_a);
 13.1526 -LINK_ENTITY_TO_GAME(weapon_GMauserG98);
 13.1527 -LINK_ENTITY_TO_GAME(weapon_GMauserG98Melee);
 13.1528 -LINK_ENTITY_TO_GAME(weapon_GMauserG98Nade);
 13.1529 +LINK_ENTITY_TO_GAME(weapon_glstaff);
 13.1530 +LINK_ENTITY_TO_GAME(weapon_gluongun);
 13.1531  LINK_ENTITY_TO_GAME(weapon_goaregen);
 13.1532  LINK_ENTITY_TO_GAME(weapon_goldpp7);
 13.1533  LINK_ENTITY_TO_GAME(weapon_gps);
 13.1534 @@ -2973,6 +3094,7 @@
 13.1535  LINK_ENTITY_TO_GAME(weapon_hyperblaster);
 13.1536  LINK_ENTITY_TO_GAME(weapon_icepokespell);
 13.1537  LINK_ENTITY_TO_GAME(weapon_impulse);
 13.1538 +LINK_ENTITY_TO_GAME(weapon_incendiary);
 13.1539  LINK_ENTITY_TO_GAME(weapon_infector);
 13.1540  LINK_ENTITY_TO_GAME(weapon_invis);
 13.1541  LINK_ENTITY_TO_GAME(weapon_islavezap);
 13.1542 @@ -2997,14 +3119,13 @@
 13.1543  LINK_ENTITY_TO_GAME(weapon_killsaw);
 13.1544  LINK_ENTITY_TO_GAME(weapon_kmedkit);
 13.1545  LINK_ENTITY_TO_GAME(weapon_knife);
 13.1546 -LINK_ENTITY_TO_GAME(weapon_Knife);
 13.1547  LINK_ENTITY_TO_GAME(weapon_lacrymo);
 13.1548  LINK_ENTITY_TO_GAME(weapon_lance);
 13.1549  LINK_ENTITY_TO_GAME(weapon_lanceflamme);
 13.1550  LINK_ENTITY_TO_GAME(weapon_larve);
 13.1551  LINK_ENTITY_TO_GAME(weapon_laser);
 13.1552 +LINK_ENTITY_TO_GAME(weapon_laser_rifle);
 13.1553  LINK_ENTITY_TO_GAME(weapon_lasergatling);
 13.1554 -LINK_ENTITY_TO_GAME(weapon_laser_rifle);
 13.1555  LINK_ENTITY_TO_GAME(weapon_launcher);
 13.1556  LINK_ENTITY_TO_GAME(weapon_law);
 13.1557  LINK_ENTITY_TO_GAME(weapon_lawgiver);
 13.1558 @@ -3016,6 +3137,7 @@
 13.1559  LINK_ENTITY_TO_GAME(weapon_lightning);
 13.1560  LINK_ENTITY_TO_GAME(weapon_lightningboltspell);
 13.1561  LINK_ENTITY_TO_GAME(weapon_lightningcloudspell);
 13.1562 +LINK_ENTITY_TO_GAME(weapon_lightsaber);
 13.1563  LINK_ENTITY_TO_GAME(weapon_lightsabre);
 13.1564  LINK_ENTITY_TO_GAME(weapon_lngun);
 13.1565  LINK_ENTITY_TO_GAME(weapon_longbow);
 13.1566 @@ -3143,21 +3265,20 @@
 13.1567  LINK_ENTITY_TO_GAME(weapon_parrot);
 13.1568  LINK_ENTITY_TO_GAME(weapon_pdw);
 13.1569  LINK_ENTITY_TO_GAME(weapon_penguin);
 13.1570 -LINK_ENTITY_TO_GAME(weapon_Pennsylvania);
 13.1571  LINK_ENTITY_TO_GAME(weapon_pgp);
 13.1572  LINK_ENTITY_TO_GAME(weapon_phantom);
 13.1573  LINK_ENTITY_TO_GAME(weapon_phoenix);
 13.1574 +LINK_ENTITY_TO_GAME(weapon_photongun);
 13.1575  LINK_ENTITY_TO_GAME(weapon_piat);
 13.1576  LINK_ENTITY_TO_GAME(weapon_pick);
 13.1577  LINK_ENTITY_TO_GAME(weapon_pigeon);
 13.1578  LINK_ENTITY_TO_GAME(weapon_pipebomb);
 13.1579  LINK_ENTITY_TO_GAME(weapon_pipewrench);
 13.1580  LINK_ENTITY_TO_GAME(weapon_pistol);
 13.1581 -LINK_ENTITY_TO_GAME(weapon_PistolA);
 13.1582 -LINK_ENTITY_TO_GAME(weapon_PistolB);
 13.1583  LINK_ENTITY_TO_GAME(weapon_pistolet);
 13.1584  LINK_ENTITY_TO_GAME(weapon_pkm);
 13.1585  LINK_ENTITY_TO_GAME(weapon_plasma);
 13.1586 +LINK_ENTITY_TO_GAME(weapon_plasmarifle);
 13.1587  LINK_ENTITY_TO_GAME(weapon_plauncher);
 13.1588  LINK_ENTITY_TO_GAME(weapon_pmine);
 13.1589  LINK_ENTITY_TO_GAME(weapon_poison);
 13.1590 @@ -3172,6 +3293,7 @@
 13.1591  LINK_ENTITY_TO_GAME(weapon_psg);
 13.1592  LINK_ENTITY_TO_GAME(weapon_psg1);
 13.1593  LINK_ENTITY_TO_GAME(weapon_pt);
 13.1594 +LINK_ENTITY_TO_GAME(weapon_pulserifle);
 13.1595  LINK_ENTITY_TO_GAME(weapon_pushhands);
 13.1596  LINK_ENTITY_TO_GAME(weapon_python);
 13.1597  LINK_ENTITY_TO_GAME(weapon_quakegun);
 13.1598 @@ -3181,13 +3303,13 @@
 13.1599  LINK_ENTITY_TO_GAME(weapon_rallyhp);
 13.1600  LINK_ENTITY_TO_GAME(weapon_rbull);
 13.1601  LINK_ENTITY_TO_GAME(weapon_rcp90);
 13.1602 +LINK_ENTITY_TO_GAME(weapon_redeemer);
 13.1603  LINK_ENTITY_TO_GAME(weapon_reetou);
 13.1604  LINK_ENTITY_TO_GAME(weapon_regeneration);
 13.1605  LINK_ENTITY_TO_GAME(weapon_rem1100);
 13.1606  LINK_ENTITY_TO_GAME(weapon_remington);
 13.1607  LINK_ENTITY_TO_GAME(weapon_renzoku);
 13.1608  LINK_ENTITY_TO_GAME(weapon_resource);
 13.1609 -LINK_ENTITY_TO_GAME(weapon_Revolutionnaire);
 13.1610  LINK_ENTITY_TO_GAME(weapon_rgd5);
 13.1611  LINK_ENTITY_TO_GAME(weapon_rifle);
 13.1612  LINK_ENTITY_TO_GAME(weapon_rmine);
 13.1613 @@ -3207,12 +3329,12 @@
 13.1614  LINK_ENTITY_TO_GAME(weapon_saa);
 13.1615  LINK_ENTITY_TO_GAME(weapon_saber);
 13.1616  LINK_ENTITY_TO_GAME(weapon_sabers);
 13.1617 -LINK_ENTITY_TO_GAME(weapon_Sabre);
 13.1618  LINK_ENTITY_TO_GAME(weapon_saiga);
 13.1619  LINK_ENTITY_TO_GAME(weapon_sainte);
 13.1620  LINK_ENTITY_TO_GAME(weapon_sako);
 13.1621  LINK_ENTITY_TO_GAME(weapon_satchel);
 13.1622  LINK_ENTITY_TO_GAME(weapon_satelitelaser);
 13.1623 +LINK_ENTITY_TO_GAME(weapon_satellite);
 13.1624  LINK_ENTITY_TO_GAME(weapon_sawed);
 13.1625  LINK_ENTITY_TO_GAME(weapon_sawedoff);
 13.1626  LINK_ENTITY_TO_GAME(weapon_sawgun);
 13.1627 @@ -3256,30 +3378,31 @@
 13.1628  LINK_ENTITY_TO_GAME(weapon_sledge);
 13.1629  LINK_ENTITY_TO_GAME(weapon_sledgehammer);
 13.1630  LINK_ENTITY_TO_GAME(weapon_sm_assaultcannon);
 13.1631 -LINK_ENTITY_TO_GAME(weapon_smaw);
 13.1632  LINK_ENTITY_TO_GAME(weapon_sm_bolter);
 13.1633  LINK_ENTITY_TO_GAME(weapon_sm_boltpistol);
 13.1634  LINK_ENTITY_TO_GAME(weapon_sm_combatknife);
 13.1635  LINK_ENTITY_TO_GAME(weapon_sm_flamer);
 13.1636  LINK_ENTITY_TO_GAME(weapon_sm_fraggrenade);
 13.1637 -LINK_ENTITY_TO_GAME(weapon_smg9);
 13.1638  LINK_ENTITY_TO_GAME(weapon_sm_heavybolter);
 13.1639  LINK_ENTITY_TO_GAME(weapon_sm_heavyflamer);
 13.1640 -LINK_ENTITY_TO_GAME(weapon_smkgrenade);
 13.1641  LINK_ENTITY_TO_GAME(weapon_sm_lascannon);
 13.1642  LINK_ENTITY_TO_GAME(weapon_sm_missilelauncher);
 13.1643 -LINK_ENTITY_TO_GAME(weapon_smoke);
 13.1644 -LINK_ENTITY_TO_GAME(weapon_smokegrenade);
 13.1645  LINK_ENTITY_TO_GAME(weapon_sm_poweraxe);
 13.1646  LINK_ENTITY_TO_GAME(weapon_sm_powersword);
 13.1647  LINK_ENTITY_TO_GAME(weapon_sm_stormbolter);
 13.1648 +LINK_ENTITY_TO_GAME(weapon_smartgun);
 13.1649 +LINK_ENTITY_TO_GAME(weapon_smaw);
 13.1650 +LINK_ENTITY_TO_GAME(weapon_smg9);
 13.1651 +LINK_ENTITY_TO_GAME(weapon_smkgrenade);
 13.1652 +LINK_ENTITY_TO_GAME(weapon_smoke);
 13.1653 +LINK_ENTITY_TO_GAME(weapon_smokegrenade);
 13.1654 +LINK_ENTITY_TO_GAME(weapon_snUZI);
 13.1655  LINK_ENTITY_TO_GAME(weapon_snark);
 13.1656  LINK_ENTITY_TO_GAME(weapon_snipe);
 13.1657  LINK_ENTITY_TO_GAME(weapon_sniper);
 13.1658  LINK_ENTITY_TO_GAME(weapon_sniper3);
 13.1659  LINK_ENTITY_TO_GAME(weapon_sniperrifle);
 13.1660  LINK_ENTITY_TO_GAME(weapon_snowball);
 13.1661 -LINK_ENTITY_TO_GAME(weapon_snUZI);
 13.1662  LINK_ENTITY_TO_GAME(weapon_socom);
 13.1663  LINK_ENTITY_TO_GAME(weapon_socomtac);
 13.1664  LINK_ENTITY_TO_GAME(weapon_solarflare);
 13.1665 @@ -3288,7 +3411,6 @@
 13.1666  LINK_ENTITY_TO_GAME(weapon_spade);
 13.1667  LINK_ENTITY_TO_GAME(weapon_spas);
 13.1668  LINK_ENTITY_TO_GAME(weapon_spas12);
 13.1669 -LINK_ENTITY_TO_GAME(weapon_SPchemicalgun);
 13.1670  LINK_ENTITY_TO_GAME(weapon_spear);
 13.1671  LINK_ENTITY_TO_GAME(weapon_specialbeamcannon);
 13.1672  LINK_ENTITY_TO_GAME(weapon_spectre);
 13.1673 @@ -3310,29 +3432,29 @@
 13.1674  LINK_ENTITY_TO_GAME(weapon_srifle);
 13.1675  LINK_ENTITY_TO_GAME(weapon_ssg3000);
 13.1676  LINK_ENTITY_TO_GAME(weapon_sshotgun);
 13.1677 +LINK_ENTITY_TO_GAME(weapon_st_far);
 13.1678 +LINK_ENTITY_TO_GAME(weapon_st_heavy);
 13.1679 +LINK_ENTITY_TO_GAME(weapon_st_medium);
 13.1680 +LINK_ENTITY_TO_GAME(weapon_st_melee);
 13.1681 +LINK_ENTITY_TO_GAME(weapon_st_power);
 13.1682 +LINK_ENTITY_TO_GAME(weapon_st_psi);
 13.1683 +LINK_ENTITY_TO_GAME(weapon_st_short);
 13.1684 +LINK_ENTITY_TO_GAME(weapon_st_special);
 13.1685 +LINK_ENTITY_TO_GAME(weapon_st_throw);
 13.1686  LINK_ENTITY_TO_GAME(weapon_staff);
 13.1687  LINK_ENTITY_TO_GAME(weapon_star);
 13.1688  LINK_ENTITY_TO_GAME(weapon_sten);
 13.1689  LINK_ENTITY_TO_GAME(weapon_sterling);
 13.1690  LINK_ENTITY_TO_GAME(weapon_steyr_m40);
 13.1691 -LINK_ENTITY_TO_GAME(weapon_st_far);
 13.1692  LINK_ENTITY_TO_GAME(weapon_stg24);
 13.1693 -LINK_ENTITY_TO_GAME(weapon_st_heavy);
 13.1694  LINK_ENTITY_TO_GAME(weapon_stickgrenade);
 13.1695  LINK_ENTITY_TO_GAME(weapon_stickgrenade_ex);
 13.1696  LINK_ENTITY_TO_GAME(weapon_stinger);
 13.1697  LINK_ENTITY_TO_GAME(weapon_stingray2);
 13.1698 -LINK_ENTITY_TO_GAME(weapon_st_medium);
 13.1699 -LINK_ENTITY_TO_GAME(weapon_st_melee);
 13.1700  LINK_ENTITY_TO_GAME(weapon_stomp);
 13.1701  LINK_ENTITY_TO_GAME(weapon_stoner);
 13.1702  LINK_ENTITY_TO_GAME(weapon_stonerscope);
 13.1703  LINK_ENTITY_TO_GAME(weapon_stonersilencer);
 13.1704 -LINK_ENTITY_TO_GAME(weapon_st_power);
 13.1705 -LINK_ENTITY_TO_GAME(weapon_st_psi);
 13.1706 -LINK_ENTITY_TO_GAME(weapon_st_short);
 13.1707 -LINK_ENTITY_TO_GAME(weapon_st_special);
 13.1708 -LINK_ENTITY_TO_GAME(weapon_st_throw);
 13.1709  LINK_ENTITY_TO_GAME(weapon_stubgun);
 13.1710  LINK_ENTITY_TO_GAME(weapon_stumpgun);
 13.1711  LINK_ENTITY_TO_GAME(weapon_stupid);
 13.1712 @@ -3345,17 +3467,19 @@
 13.1713  LINK_ENTITY_TO_GAME(weapon_sword);
 13.1714  LINK_ENTITY_TO_GAME(weapon_syringe);
 13.1715  LINK_ENTITY_TO_GAME(weapon_tacgun);
 13.1716 +LINK_ENTITY_TO_GAME(weapon_taucannon);
 13.1717  LINK_ENTITY_TO_GAME(weapon_tavor);
 13.1718  LINK_ENTITY_TO_GAME(weapon_tdagger);
 13.1719  LINK_ENTITY_TO_GAME(weapon_tec9);
 13.1720  LINK_ENTITY_TO_GAME(weapon_telekinesis);
 13.1721  LINK_ENTITY_TO_GAME(weapon_teleporter);
 13.1722  LINK_ENTITY_TO_GAME(weapon_teleporteur);
 13.1723 +LINK_ENTITY_TO_GAME(weapon_teslagun);
 13.1724  LINK_ENTITY_TO_GAME(weapon_thompson);
 13.1725  LINK_ENTITY_TO_GAME(weapon_thornblastspell);
 13.1726  LINK_ENTITY_TO_GAME(weapon_throwaxe);
 13.1727 +LINK_ENTITY_TO_GAME(weapon_throwing_knife);
 13.1728  LINK_ENTITY_TO_GAME(weapon_throwingknife);
 13.1729 -LINK_ENTITY_TO_GAME(weapon_throwing_knife);
 13.1730  LINK_ENTITY_TO_GAME(weapon_timmy);
 13.1731  LINK_ENTITY_TO_GAME(weapon_tknife);
 13.1732  LINK_ENTITY_TO_GAME(weapon_tmine);
 13.1733 @@ -3377,13 +3501,16 @@
 13.1734  LINK_ENTITY_TO_GAME(weapon_trooper);
 13.1735  LINK_ENTITY_TO_GAME(weapon_tsgun);
 13.1736  LINK_ENTITY_TO_GAME(weapon_tucan);
 13.1737 +LINK_ENTITY_TO_GAME(weapon_turret);
 13.1738  LINK_ENTITY_TO_GAME(weapon_twosword);
 13.1739 +LINK_ENTITY_TO_GAME(weapon_u2);
 13.1740  LINK_ENTITY_TO_GAME(weapon_umbra);
 13.1741  LINK_ENTITY_TO_GAME(weapon_umbrella);
 13.1742  LINK_ENTITY_TO_GAME(weapon_ump45);
 13.1743  LINK_ENTITY_TO_GAME(weapon_updraftspell);
 13.1744 +LINK_ENTITY_TO_GAME(weapon_us_grenade);
 13.1745 +LINK_ENTITY_TO_GAME(weapon_usas);
 13.1746  LINK_ENTITY_TO_GAME(weapon_usas12);
 13.1747 -LINK_ENTITY_TO_GAME(weapon_us_grenade);
 13.1748  LINK_ENTITY_TO_GAME(weapon_usp);
 13.1749  LINK_ENTITY_TO_GAME(weapon_uspmp);
 13.1750  LINK_ENTITY_TO_GAME(weapon_uzi);
 13.1751 @@ -3411,20 +3538,25 @@
 13.1752  LINK_ENTITY_TO_GAME(weapon_whirlwindspell);
 13.1753  LINK_ENTITY_TO_GAME(weapon_whiskey);
 13.1754  LINK_ENTITY_TO_GAME(weapon_whiterayspell);
 13.1755 +LINK_ENTITY_TO_GAME(weapon_whl);
 13.1756  LINK_ENTITY_TO_GAME(weapon_winchester);
 13.1757  LINK_ENTITY_TO_GAME(weapon_wombatspell);
 13.1758  LINK_ENTITY_TO_GAME(weapon_wyvernspell);
 13.1759 +LINK_ENTITY_TO_GAME(weapon_xbow);
 13.1760  LINK_ENTITY_TO_GAME(weapon_xm1014);
 13.1761  LINK_ENTITY_TO_GAME(weapon_xm4);
 13.1762  LINK_ENTITY_TO_GAME(weapon_zat);
 13.1763  LINK_ENTITY_TO_GAME(weapon_zatarc);
 13.1764  LINK_ENTITY_TO_GAME(weapon_zmg);
 13.1765 +LINK_ENTITY_TO_GAME(weaponbox);
 13.1766  LINK_ENTITY_TO_GAME(weather_genie);
 13.1767  LINK_ENTITY_TO_GAME(weather_litnode);
 13.1768  LINK_ENTITY_TO_GAME(webgunprojectile);
 13.1769 +LINK_ENTITY_TO_GAME(wh);
 13.1770  LINK_ENTITY_TO_GAME(wheel);
 13.1771  LINK_ENTITY_TO_GAME(wheel_ent);
 13.1772  LINK_ENTITY_TO_GAME(whiskey_whisk);
 13.1773 +LINK_ENTITY_TO_GAME(whshard);
 13.1774  LINK_ENTITY_TO_GAME(world_areacontrol);
 13.1775  LINK_ENTITY_TO_GAME(world_artefact);
 13.1776  LINK_ENTITY_TO_GAME(world_capturelocation);
 13.1777 @@ -3483,6 +3615,7 @@
 13.1778  LINK_ENTITY_TO_GAME(ww_staff);
 13.1779  LINK_ENTITY_TO_GAME(wyvern);
 13.1780  LINK_ENTITY_TO_GAME(xbow_teather);
 13.1781 +LINK_ENTITY_TO_GAME(xbowbolt);
 13.1782  LINK_ENTITY_TO_GAME(xen_hair);
 13.1783  LINK_ENTITY_TO_GAME(xen_hull);
 13.1784  LINK_ENTITY_TO_GAME(xen_plantlight);
 13.1785 @@ -3492,8 +3625,9 @@
 13.1786  LINK_ENTITY_TO_GAME(xen_tree);
 13.1787  LINK_ENTITY_TO_GAME(xen_ttrigger);
 13.1788  LINK_ENTITY_TO_GAME(zatarc_proj);
 13.1789 -LINK_ENTITY_TO_GAME(Zombie2Spit);
 13.1790  LINK_ENTITY_TO_GAME(zone);
 13.1791 +LINK_ENTITY_TO_GAME(zone_bomb_target);
 13.1792 +LINK_ENTITY_TO_GAME(zone_capture);
 13.1793  LINK_ENTITY_TO_GAME(zone_gatetravel);
 13.1794  LINK_ENTITY_TO_GAME(zone_nodamage);
 13.1795  LINK_ENTITY_TO_GAME(zone_shelter);
    14.1 --- a/metamod/vers_meta.h	Fri Mar 15 14:59:27 2013 -0500
    14.2 +++ b/metamod/vers_meta.h	Fri Mar 15 15:01:19 2013 -0500
    14.3 @@ -5,7 +5,7 @@
    14.4  // with metamod.
    14.5  
    14.6  /*
    14.7 - * Copyright (c) 2001-2005 Will Day <[email protected]>
    14.8 + * Copyright (c) 2001-2013 Will Day <[email protected]>
    14.9   *
   14.10   *    This file is part of Metamod.
   14.11   *