1.1 --- a/doc/Changelog Sat Aug 21 16:13:14 2004 +0000
1.2 +++ b/doc/Changelog Thu Nov 11 23:21:08 2004 +0000
1.3 @@ -1,20 +1,37 @@
1.4 # vim: set tw=75 ft=none :
1.5
1.6 +2004/11/10 1.17.3
1.7 + - Added Mod recognition and entities for Zombie Panic Beta 0.91c.
1.8 + - Added Mod recognition and entities for Out Break 1.0.
1.9 + - Added Mod recognition and entities for Operations 1942 v2.0.
1.10 + - Added Mod recognition and entities for The Trenches 1.0-Beta.
1.11 + - Added Mod recognition and entities for The Ship V0052.
1.12 + - Added additional entity for Natural Selection 3.0 beta 5.
1.13 + - Added Mod entities for Wizard Wars 1.2.
1.14 + - When reloading plugins honour their load time settings. Does no longer
1.15 + attempt to reload plugins when the loading after the unloading would
1.16 + fail due to a load time conflict.
1.17 + - Fixed only loading one plugin when multiple plugins with the same prefix
1.18 + were used, e.g. mm_pluginA.dll and mm_pluginB.dll. (Bug 1040186)
1.19 + - Fixed a minor memory leak when unloading plugins.
1.20 + - Fixed potential bug initializing plugin incorrectly after unloading and
1.21 + loading plugins.
1.22 +
1.23 2004/08/20 1.17.2
1.24 - Fixed a memory leak the size of the gamedll when extracting a missing
1.25 gamedll from the cache file on Windows Steam servers. Found by Wei
1.26 Mingzhi.
1.27 - Made game directory lookup case-insensitive.
1.28 - - Added MOD recognition for CSV15 (Counter-Strike 1.5 for Steam).
1.29 - - Added MOD recognition for Adrenaline Gamer 6.5 and up.
1.30 - - Added MOD recognition and entities for The Terrorist Revenge 0.2.1.
1.31 - - Added MOD recognition and entities for Pirates, Vikings and Knights Beta 2.1.
1.32 + - Added Mod recognition for CSV15 (Counter-Strike 1.5 for Steam).
1.33 + - Added Mod recognition for Adrenaline Gamer 6.5 and up.
1.34 + - Added Mod recognition and entities for The Terrorist Revenge 0.2.1.
1.35 + - Added Mod recognition and entities for Pirates, Vikings and Knights Beta 2.1.
1.36 - Added more entities for Sven Coop 3.0.
1.37 - Added entities for Vampire Slayer "Chapter VI".
1.38 - Added entities for Earth Special Forces Beta 1.2.
1.39 - Added entities for Science & Industry 1.0.
1.40 - - Changed MOD recognition for Adrenaline Gamer 3.x. The 3.x version of the
1.41 - MOD is now being deprecated and support will be removed from a future
1.42 + - Changed Mod recognition for Adrenaline Gamer 3.x. The 3.x version of the
1.43 + Mod is now being deprecated and support will be removed from a future
1.44 version of Metamod. It can currently still be used by renaming the game
1.45 directory from "ag" to "ag3" or by explicitly specifying the gamedll.
1.46 - Improved parsing of plugins.ini file to not report errors on empty lines
1.47 @@ -32,15 +49,15 @@
1.48
1.49 2004/05/31 1.17.1
1.50 - Additional entities for DoD 1.1.
1.51 - - Added MOD recognition and entities for Hostile Intent 1.1.
1.52 - - Added MOD recognition and entities for Natural Selection Beta 3.0.
1.53 + - Added Mod recognition and entities for Hostile Intent 1.1.
1.54 + - Added Mod recognition and entities for Natural Selection Beta 3.0.
1.55 - Additional entities for Sven Coop 3.0.
1.56 - Additional entities for Digital Paintball 2.1.
1.57 - - Added MOD recognition for CS13, no new entities.
1.58 + - Added Mod recognition for CS13, no new entities.
1.59 - Additional entity for The Specialits Beta 2.1.
1.60 - Additional entities for StargateTC Beta 1.1.
1.61 - - Added MOD recognition and entities for Rocket Crowbar 2.
1.62 - - Added MOD recognition and entities for Counter-Strike:Condition Zero.
1.63 + - Added Mod recognition and entities for Rocket Crowbar 2.
1.64 + - Added Mod recognition and entities for Counter-Strike:Condition Zero.
1.65 - Additional entities for International Soccer Online 3.0
1.66 - Additional entities for Firearms 2.9 and one missing entity
1.67 for previous Firearms versions.
2.1 --- a/doc/html/supportedmods.html Sat Aug 21 16:13:14 2004 +0000
2.2 +++ b/doc/html/supportedmods.html Thu Nov 11 23:21:08 2004 +0000
2.3 @@ -325,6 +325,13 @@
2.4 <td></td>
2.5 </tr>
2.6 <tr>
2.7 + <td><a href="http://www.no1studios.com/1942/">Operations 1942</a></td>
2.8 + <td>v2.0</td>
2.9 + <td>2004/10/06</td>
2.10 + <td><a href="http://metamod.org/dl/metamod/ents/operations1942">[ents]</a></td> <!-- entlist -->
2.11 + <td></td>
2.12 +</tr>
2.13 +<tr>
2.14 <td><a href="http://www.planethalflife.com/jailbreak/">Open-Source Jailbreak</a></td>
2.15 <td>v0.95a</td>
2.16 <td>2001/05/26</td>
2.17 @@ -332,6 +339,13 @@
2.18 <td></td>
2.19 </tr>
2.20 <tr>
2.21 + <td><a href="http://www.geocities.com/bigman10in/outbreak/">Out Break</a></td>
2.22 + <td>v1.0</td>
2.23 + <td>2004/10/04</td>
2.24 + <td><a href="http://metamod.org/dl/metamod/ents/outbreak">[ents]</a></td> <!-- entlist -->
2.25 + <td></td>
2.26 +</tr>
2.27 +<tr>
2.28 <td><a href="http://www.planethalflife.com/oz/">Oz Deathmatch</a></td>
2.29 <td>v2.4.1</td>
2.30 <td>2001/12/21</td>
2.31 @@ -423,6 +437,13 @@
2.32 <td></td>
2.33 </tr>
2.34 <tr>
2.35 + <td><a href="http://www.theshiponline.com/">The Ship</a></td>
2.36 + <td>V0052</td>
2.37 + <td>2004/10/24</td>
2.38 + <td><a href="http://metamod.org/dl/metamod/ents/theship">[ents]</a></td> <!-- entlist -->
2.39 + <td></td>
2.40 +</tr>
2.41 +<tr>
2.42 <td><a href="http://www.planethalflife.com/si/">Science & Industry</a></td>
2.43 <td>v1.0</td>
2.44 <td>2004/07/24</td>
2.45 @@ -507,6 +528,13 @@
2.46 <td></td>
2.47 </tr>
2.48 <tr>
2.49 + <td><a href="http://www.thetrenches.net">The Trenches</a></td>
2.50 + <td>Beta 1.0</td>
2.51 + <td>2004/10/24</td>
2.52 + <td><a href="http://metamod.org/dl/metamod/ents/thetrenches">[ents]</a></td> <!-- entlist -->
2.53 + <td></td>
2.54 +</tr>
2.55 +<tr>
2.56 <td><a href="http://www.entertheunderworld.com/">Underworld Bloodline</a></td>
2.57 <td>v2.0</td>
2.58 <td>2003/11/15</td>
2.59 @@ -550,8 +578,8 @@
2.60 </tr>
2.61 <tr>
2.62 <td><a href="http://www.planethalflife.com/wizardwars/">Wizard Wars</a></td>
2.63 - <td>v1.0</td>
2.64 - <td>2001/07/30</td>
2.65 + <td>v1.2</td>
2.66 + <td>2004/11/11</td>
2.67 <td><a href="http://metamod.org/dl/metamod/ents/wizardwars">[ents]</a></td> <!-- entlist -->
2.68 <td></td>
2.69 </tr>
2.70 @@ -562,6 +590,13 @@
2.71 <td><a href="http://metamod.org/dl/metamod/ents/wormshl">[ents]</a></td> <!-- entlist -->
2.72 <td></td>
2.73 </tr>
2.74 +<tr>
2.75 + <td><a href="http://www.zombiepanic.org">Zombie Panic</a></td>
2.76 + <td>Beta 0.91c</td>
2.77 + <td>2004/11/08</td>
2.78 + <td><a href="http://metamod.org/dl/metamod/ents/zombiepanic">[ents]</a></td> <!-- entlist -->
2.79 + <td></td>
2.80 +</tr>
2.81 </table>
2.82 </body>
2.83 </html>
3.1 --- a/doc/txt/supportedmods.txt Sat Aug 21 16:13:14 2004 +0000
3.2 +++ b/doc/txt/supportedmods.txt Thu Nov 11 23:21:08 2004 +0000
3.3 @@ -152,10 +152,17 @@
3.4 | (www.planethalflife.com/ | Beta 1.5 | 11/26 | |
3.5 | outlawsmod) | | | |
3.6 |------------------------------+----------+--------+---------------------|
3.7 +| Operations 1942 | v2.0 | 2004/ | |
3.8 +| (www.no1studios.com/1942) | | 10/06 | |
3.9 +|------------------------------+----------+--------+---------------------|
3.10 | Open-Source Jailbreak | | 2001/ | |
3.11 | (www.planethalflife.com/ | v0.95a | 05/26 | |
3.12 | jailbreak) | | | |
3.13 |------------------------------+----------+--------+---------------------|
3.14 +| Out Break | | 2004/ | |
3.15 +| (www.geocities.com/ | v1.0 | 10/04 | |
3.16 +| bigman10in/outbreak) | | | |
3.17 +|------------------------------+----------+--------+---------------------|
3.18 | Oz Deathmatch | v2.4.1 | 2001/ | |
3.19 | (www.planethalflife.com/oz) | | 12/21 | |
3.20 |------------------------------+----------+--------+---------------------|
3.21 @@ -197,6 +204,9 @@
3.22 | (www.telefragged.com/ | v1.2 | 09/19 | |
3.23 | thefatal/scihunt.shtml) | | | |
3.24 |------------------------------+----------+--------+---------------------|
3.25 +| The Ship | V0052 | 2004/ | |
3.26 +| (www.theshiponline.com) | | 10/24 | |
3.27 +|------------------------------+----------+--------+---------------------|
3.28 | Science & Industry | v1.0 | 2004/ | |
3.29 | (www.planethalflife.com/si) | | 07/24 | |
3.30 |------------------------------+----------+--------+---------------------|
3.31 @@ -237,6 +247,9 @@
3.32 | The Specialists | Beta 2.0 | 2003/ | |
3.33 | (www.specialistsmod.net) | | 07/31 | |
3.34 |------------------------------+----------+--------+---------------------|
3.35 +| The Trenches | Beta 1.0 | 2004/ | |
3.36 +| (www.thetrenches.net) | | 10/24 | |
3.37 +|------------------------------+----------+--------+---------------------|
3.38 | Underworld Bloodline | v2.0 | 2003/ | |
3.39 | (www.entertheunderworld.com) | | 11/15 | |
3.40 |------------------------------+----------+--------+---------------------|
3.41 @@ -258,10 +271,13 @@
3.42 | (www.angelfire.com/ab4/ww/ | v0.3 | 08/13 | |
3.43 | index.htm) | | | |
3.44 |------------------------------+----------+--------+---------------------|
3.45 -| Wizard Wars | | 2001/ | |
3.46 -| (www.planethalflife.com/ | v1.0 | 07/30 | |
3.47 +| Wizard Wars | | 2004/ | |
3.48 +| (www.planethalflife.com/ | v1.2 | 11/11 | |
3.49 | wizardwars) | | | |
3.50 |------------------------------+----------+--------+---------------------|
3.51 | WormsHL | Beta 3.0 | 2003/ | |
3.52 | (www.wormshl.com) | | 05/02 | |
3.53 +|------------------------------+----------+--------+---------------------|
3.54 +| Zombie Panic | Beta | 2004/ | |
3.55 +| (www.zombiepanic.org) | 0.91c | 11/08 | |
3.56 +------------------------------------------------------------------------+
4.1 --- a/metamod/commands_meta.cpp Sat Aug 21 16:13:14 2004 +0000
4.2 +++ b/metamod/commands_meta.cpp Thu Nov 11 23:21:08 2004 +0000
4.3 @@ -438,6 +438,8 @@
4.4 META_CONS("Reloaded plugin '%s'", findp->desc);
4.5 else if(meta_errno == ME_DELAYED)
4.6 META_CONS("Reload delayed for plugin '%s'", findp->desc);
4.7 + else if(meta_errno == ME_NOTALLOWED)
4.8 + META_CONS("Reload not allowed for plugin '%s' now, only allowed %s", findp->desc, findp->str_loadable(SL_ALLOWED));
4.9 else
4.10 META_CONS("Reload failed for plugin '%s'", findp->desc);
4.11 }
5.1 --- a/metamod/ents/naturalselection Sat Aug 21 16:13:14 2004 +0000
5.2 +++ b/metamod/ents/naturalselection Thu Nov 11 23:21:08 2004 +0000
5.3 @@ -141,3 +141,12 @@
5.4 // Gamedir changed to nsp for Beta version
5.5 //
5.6 item_catalyst
5.7 +
5.8 +// Version 3.0 beta5
5.9 +//
5.10 +// From: "[MoD] Cha0s C0ntr0L" <[email protected]>
5.11 +// Date: Thu, 09 Sep 2004 22:42:45 +0000
5.12 +//
5.13 +// Gamedir changed to ns again
5.14 +//
5.15 +item_ammopack
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/metamod/ents/operations1942 Thu Nov 11 23:21:08 2004 +0000
6.3 @@ -0,0 +1,57 @@
6.4 +// vim: set ft=cpp :
6.5 +
6.6 +// Operations 1942
6.7 +// http://www.no1studios.com/1942/
6.8 +//
6.9 +// Game directory: ops1942
6.10 +// Win32 DLL name: spirit.dll
6.11 +// Linux DSO name: spirit_i386.so
6.12 +//
6.13 +
6.14 +// Version 2.0
6.15 +//
6.16 +// From: "Pierre-Marie Baty" <[email protected]>
6.17 +// Date: Tue, 5 Oct 2004 14:22:57 +0200
6.18 +//
6.19 +calc_position
6.20 +calc_ratio
6.21 +calc_subvelocity
6.22 +calc_velocity_path
6.23 +calc_velocity_polar
6.24 +env_beamtrail
6.25 +env_decal
6.26 +env_dlight
6.27 +env_elight
6.28 +env_footsteps
6.29 +env_particle
6.30 +env_quakefx
6.31 +env_shockwave
6.32 +env_sky
6.33 +func_searchlight
6.34 +func_shine
6.35 +hud_sprite
6.36 +info_compile_parameters
6.37 +info_movewith
6.38 +info_texlights
6.39 +inout_register
6.40 +lightfader
6.41 +locus_alias
6.42 +locus_beam
6.43 +locus_variable
6.44 +monster_bullsquid
6.45 +monster_generic_dead
6.46 +monster_target
6.47 +motion_manager
6.48 +motion_thread
6.49 +player_freeze
6.50 +scripted_tanksequence
6.51 +scripted_trainsequence
6.52 +trigger_bounce
6.53 +trigger_changecvar
6.54 +trigger_command
6.55 +trigger_hevcharge
6.56 +trigger_inout
6.57 +trigger_motion
6.58 +trigger_onsight
6.59 +trigger_rottest
6.60 +watcher_count
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/metamod/ents/outbreak Thu Nov 11 23:21:08 2004 +0000
7.3 @@ -0,0 +1,27 @@
7.4 +// vim: set ft=cpp :
7.5 +
7.6 +// Out Break
7.7 +// http://www.geocities.com/bigman10in/outbreak/
7.8 +//
7.9 +// Game directory: outbreak
7.10 +// Win32 DLL name: hl.dll
7.11 +// Linux DSO name: None
7.12 +
7.13 +// Version: 1.0
7.14 +//
7.15 +// From: Scott Bell <[email protected]>
7.16 +// Date: Sat, 14 Aug 2004 20:43:47 -0700 (PDT)
7.17 +//
7.18 +info_next_map
7.19 +info_player_team1
7.20 +info_player_team2
7.21 +item_body
7.22 +item_corpse
7.23 +item_megavirus
7.24 +item_radio
7.25 +monster_missle
7.26 +monster_morter
7.27 +monster_shotgun
7.28 +weapon_energy
7.29 +weapon_hammer
7.30 +weapon_supershotgun
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/metamod/ents/theship Thu Nov 11 23:21:08 2004 +0000
8.3 @@ -0,0 +1,44 @@
8.4 +// vim: set ft=cpp :
8.5 +
8.6 +// The Ship
8.7 +// http://www.theshiponline.com/
8.8 +//
8.9 +// Game directory: Ship
8.10 +// Win32 DLL name: ship.dll
8.11 +// Linux DSO name: ship_i386.so
8.12 +
8.13 +// Version V0052
8.14 +//
8.15 +// From: Ed Wilson
8.16 +// Date: Tue, 19 Oct 2004 06:24:57 -0700
8.17 +//
8.18 +authenticationmanager
8.19 +bankinterest
8.20 +func_bankteller
8.21 +func_corruptsecurity
8.22 +func_needs
8.23 +func_needs_boredom
8.24 +func_needs_dirty
8.25 +func_needs_drink
8.26 +func_needs_eat
8.27 +func_needs_fatigue
8.28 +func_needs_lonely
8.29 +func_needs_pee
8.30 +func_needs_poo
8.31 +func_securityzone
8.32 +func_sickbay_bed
8.33 +func_sickbay_psych
8.34 +func_wardrobe
8.35 +jailer
8.36 +judge
8.37 +misterx
8.38 +monster_player
8.39 +my_monster
8.40 +poison_injected
8.41 +sanity
8.42 +securitymanager
8.43 +shipAI_shipmate
8.44 +trip_beam
8.45 +weapon_pushhands
8.46 +weapon_syringe
8.47 +weapon_umbrella
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
9.2 +++ b/metamod/ents/thetrenches Thu Nov 11 23:21:08 2004 +0000
9.3 @@ -0,0 +1,50 @@
9.4 +// vim: set ft=cpp :
9.5 +
9.6 +// The Trenches
9.7 +// http://www.thetrenches.net/
9.8 +//
9.9 +// Game directory: tt
9.10 +// Win32 DLL name: tt.dll
9.11 +// Linux DSO name: tt_i386.so
9.12 +
9.13 +// Version Beta 1.0
9.14 +//
9.15 +// From: BAILOPAN
9.16 +// Date: Mon, 11 Oct 2004 22:46:50 -0500
9.17 +//
9.18 +ammo_CEnfield
9.19 +ammo_GMauserG98
9.20 +env_weather
9.21 +func_trenchcap1
9.22 +func_trenchcap2
9.23 +func_trenchcap3
9.24 +func_trenchcap4
9.25 +info_tt_gameplay
9.26 +particle_weatherfx
9.27 +push_point1
9.28 +push_point2
9.29 +push_point3
9.30 +push_point4
9.31 +push_point5
9.32 +trenches_allied_start
9.33 +trenches_axis_start
9.34 +trenches_central_start
9.35 +weapon_BritGrenMelee
9.36 +weapon_BritGrenNade
9.37 +weapon_CEnfield
9.38 +weapon_CEnfieldMelee
9.39 +weapon_CEnfieldNade
9.40 +weapon_GMauserG98
9.41 +weapon_GMauserG98Melee
9.42 +weapon_GMauserG98Nade
9.43 +weapon_GermGrenMelee
9.44 +weapon_GermGrenNade
9.45 +
9.46 +//
9.47 +// From: "Damaged Soul" <[email protected]>
9.48 +// Date: Mon, 18 Oct 2004 04:30:06 -0400
9.49 +//
9.50 +env_fog
9.51 +env_model
9.52 +env_particle
9.53 +info_player_observer
10.1 --- a/metamod/ents/wizardwars Sat Aug 21 16:13:14 2004 +0000
10.2 +++ b/metamod/ents/wizardwars Thu Nov 11 23:21:08 2004 +0000
10.3 @@ -2,6 +2,10 @@
10.4
10.5 // Wizard Wars
10.6 // http://www.planethalflife.com/wizardwars/
10.7 +//
10.8 +// Game directory: ww
10.9 +// Win32 Game DLL: hl.dll
10.10 +// Linux Game DSO: mp_i386.so
10.11
10.12 // Wizard Wars beta 2
10.13 monster_balllightning
10.14 @@ -163,3 +167,77 @@
10.15 weapon_updraftspell
10.16 weapon_wyvernspell
10.17 ww_monstermaker
10.18 +
10.19 +// Version 1.2
10.20 +//
10.21 +// Date: Sun, 31 Oct 2004 13:45:08 -0800
10.22 +// From: Justin 'Kukyona' O'Dell <[email protected]>
10.23 +//
10.24 +bird
10.25 +cocklebur
10.26 +func_nobuild
10.27 +func_nogrenades
10.28 +i_w_g
10.29 +i_w_t
10.30 +info_ww_teamcheck
10.31 +info_ww_teamset
10.32 +info_wwgoal
10.33 +info_wwgoal_timer
10.34 +item_wwgoal
10.35 +proj_iceshard
10.36 +proj_missile
10.37 +proj_stone
10.38 +skull
10.39 +spore
10.40 +thornbush
10.41 +ww_ammo_satchels
10.42 +ww_ammo_spellbook
10.43 +ww_bearbite
10.44 +ww_emitter
10.45 +ww_satchel
10.46 +ww_satchel_archmage
10.47 +ww_satchel_death
10.48 +ww_satchel_dragon
10.49 +ww_satchel_earth
10.50 +ww_satchel_fire
10.51 +ww_satchel_ice
10.52 +ww_satchel_life
10.53 +ww_satchel_lightning
10.54 +ww_satchel_nature
10.55 +ww_satchel_wind
10.56 +ww_seal
10.57 +ww_seal_death
10.58 +ww_seal_dragon
10.59 +ww_seal_earth
10.60 +ww_seal_fire
10.61 +ww_seal_ice
10.62 +ww_seal_life
10.63 +ww_seal_lightning
10.64 +ww_seal_nature
10.65 +ww_seal_wind
10.66 +ww_sentrycrystal
10.67 +ww_spell_beanstalk
10.68 +ww_spell_bird
10.69 +ww_spell_deathray
10.70 +ww_spell_doublemissile
10.71 +ww_spell_dragonbreath
10.72 +ww_spell_fireball
10.73 +ww_spell_flamelick
10.74 +ww_spell_forceblast
10.75 +ww_spell_freezeray
10.76 +ww_spell_iceshard
10.77 +ww_spell_levitate
10.78 +ww_spell_lightningbolt
10.79 +ww_spell_missile
10.80 +ww_spell_pebbleblast
10.81 +ww_spell_seal
10.82 +ww_spell_shield
10.83 +ww_spell_skull
10.84 +ww_spell_spotbolt
10.85 +ww_spell_stone
10.86 +ww_spell_thornblast
10.87 +ww_spell_updraft
10.88 +ww_spell_whiteray
10.89 +ww_spell_wyvern
10.90 +ww_staff
10.91 +wyvern
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
11.2 +++ b/metamod/ents/zombiepanic Thu Nov 11 23:21:08 2004 +0000
11.3 @@ -0,0 +1,19 @@
11.4 +// vim: set ft=cpp :
11.5 +
11.6 +// Zombie Panic
11.7 +// http://www.zombiepanic.org/
11.8 +//
11.9 +// Game directory: zp
11.10 +// Win32 DLL name: mp.dll
11.11 +// Linux DSO name: none
11.12 +
11.13 +// Version 0.91a Beta
11.14 +//
11.15 +// From: BAILOPAN
11.16 +// Date: Sun, 31 Oct 2004 22:41:00 -0500
11.17 +//
11.18 +ammo_556AR
11.19 +ammo_556box
11.20 +ammo_M16grenades
11.21 +trigger_endround
11.22 +weapon_556AR
12.1 --- a/metamod/games.h Sat Aug 21 16:13:14 2004 +0000
12.2 +++ b/metamod/games.h Thu Nov 11 23:21:08 2004 +0000
12.3 @@ -86,7 +86,9 @@
12.4 {"oel", "hl"MODARCH".so", "hl.dll", "OeL Half-Life"},
12.5 {"og", "og"MODARCH".so", "og.dll", "Over Ground"},
12.6 {"ol", "ol"MODARCH".so", "hl.dll", "Outlawsmod"},
12.7 + {"ops1942", "spirit"MODARCH".so", "spirit.dll", "Operations 1942"},
12.8 {"osjb", "osjb"MODARCH".so", "jail.dll", "Open-Source Jailbreak"},
12.9 + {"outbreak", "none", "hl.dll", "Out Break"},
12.10 {"oz", "mp"MODARCH".so", "mp.dll", "Oz Deathmatch"},
12.11 {"paintball", "pb"MODARCH".so", "mp.dll", "Paintball"},
12.12 {"penemy", "pe"MODARCH".so", "pe.dll", "Public Enemy"},
12.13 @@ -100,6 +102,7 @@
12.14 {"rockcrowbar", "rc"MODARCH".so", "rc.dll", "Rocket Crowbar"},
12.15 {"rspecies", "hl"MODARCH".so", "hl.dll", "Rival Species"},
12.16 {"scihunt", "shunt.so", "shunt.dll", "Scientist Hunt"},
12.17 + {"Ship", "ship"MODARCH".so", "ship.dll", "The Ship"},
12.18 {"si", "si"MODARCH".so", "si.dll", "Science & Industry"},
12.19 {"snow", "hl"MODARCH".so", "snow.dll", "Snow-War"},
12.20 {"stargatetc", "hl"MODARCH".so", "hl.dll", "StargateTC"},
12.21 @@ -112,6 +115,7 @@
12.22 {"trainhunters", "th"MODARCH".so", "th.dll", "Train Hunters"},
12.23 {"trevenge", "trevenge.so", "trevenge.dll", "The Terrorist Revenge"},
12.24 {"TS", "ts"MODARCH".so", "mp.dll", "The Specialists"},
12.25 + {"tt", "tt"MODARCH".so", "tt.dll", "The Trenches"},
12.26 {"underworld", "uw"MODARCH".so", "uw.dll", "Underworld Bloodline"},
12.27 {"valve", "hl"MODARCH".so", "hl.dll", "Half-Life Deathmatch"},
12.28 {"vs", "vs"MODARCH".so", "mp.dll", "VampireSlayer"},
12.29 @@ -120,3 +124,4 @@
12.30 {"weapon_wars", "ww"MODARCH".so", "hl.dll", "Weapon Wars"},
12.31 {"wizwars", "mp"MODARCH".so", "hl.dll", "Wizard Wars"},
12.32 {"wormshl", "wormshl_i586.so", "wormshl.dll", "WormsHL"},
12.33 + {"zp", "none", "mp.dll", "Zombie Panic"},
13.1 --- a/metamod/linkgame.cpp Sat Aug 21 16:13:14 2004 +0000
13.2 +++ b/metamod/linkgame.cpp Thu Nov 11 23:21:08 2004 +0000
13.3 @@ -91,6 +91,8 @@
13.4 LINK_ENTITY_TO_GAME(ammo_50ae);
13.5 LINK_ENTITY_TO_GAME(ammo_50cal);
13.6 LINK_ENTITY_TO_GAME(ammo_556);
13.7 +LINK_ENTITY_TO_GAME(ammo_556AR);
13.8 +LINK_ENTITY_TO_GAME(ammo_556box);
13.9 LINK_ENTITY_TO_GAME(ammo_556nato);
13.10 LINK_ENTITY_TO_GAME(ammo_556natobox);
13.11 LINK_ENTITY_TO_GAME(ammo_57mm);
13.12 @@ -108,10 +110,13 @@
13.13 LINK_ENTITY_TO_GAME(ammo_AK47clip);
13.14 LINK_ENTITY_TO_GAME(ammo_ARgrenades);
13.15 LINK_ENTITY_TO_GAME(ammo_BALLS);
13.16 +LINK_ENTITY_TO_GAME(ammo_CEnfield);
13.17 LINK_ENTITY_TO_GAME(ammo_Deagle);
13.18 LINK_ENTITY_TO_GAME(ammo_FISHINGROD);
13.19 LINK_ENTITY_TO_GAME(ammo_FOOT);
13.20 LINK_ENTITY_TO_GAME(ammo_FTclip);
13.21 +LINK_ENTITY_TO_GAME(ammo_GMauserG98);
13.22 +LINK_ENTITY_TO_GAME(ammo_M16grenades);
13.23 LINK_ENTITY_TO_GAME(ammo_adrenaline);
13.24 LINK_ENTITY_TO_GAME(ammo_ak101);
13.25 LINK_ENTITY_TO_GAME(ammo_ak105);
13.26 @@ -379,11 +384,13 @@
13.27 LINK_ENTITY_TO_GAME(arrow);
13.28 LINK_ENTITY_TO_GAME(asl_charge_flare);
13.29 LINK_ENTITY_TO_GAME(aura);
13.30 +LINK_ENTITY_TO_GAME(authenticationmanager);
13.31 LINK_ENTITY_TO_GAME(autogl_gren);
13.32 LINK_ENTITY_TO_GAME(ball_launcher);
13.33 LINK_ENTITY_TO_GAME(ball_lightning);
13.34 LINK_ENTITY_TO_GAME(balle);
13.35 LINK_ENTITY_TO_GAME(banana);
13.36 +LINK_ENTITY_TO_GAME(bankinterest);
13.37 LINK_ENTITY_TO_GAME(barneymine);
13.38 LINK_ENTITY_TO_GAME(base_drive_ent);
13.39 LINK_ENTITY_TO_GAME(basecurse);
13.40 @@ -395,6 +402,7 @@
13.41 LINK_ENTITY_TO_GAME(bfg10k);
13.42 LINK_ENTITY_TO_GAME(big_bang);
13.43 LINK_ENTITY_TO_GAME(big_disk);
13.44 +LINK_ENTITY_TO_GAME(bird);
13.45 LINK_ENTITY_TO_GAME(blade);
13.46 LINK_ENTITY_TO_GAME(blaster_beam);
13.47 LINK_ENTITY_TO_GAME(blaster_bolt);
13.48 @@ -418,6 +426,11 @@
13.49 LINK_ENTITY_TO_GAME(burning_attack);
13.50 LINK_ENTITY_TO_GAME(button_aiwallplug);
13.51 LINK_ENTITY_TO_GAME(button_target);
13.52 +LINK_ENTITY_TO_GAME(calc_position);
13.53 +LINK_ENTITY_TO_GAME(calc_ratio);
13.54 +LINK_ENTITY_TO_GAME(calc_subvelocity);
13.55 +LINK_ENTITY_TO_GAME(calc_velocity_path);
13.56 +LINK_ENTITY_TO_GAME(calc_velocity_polar);
13.57 LINK_ENTITY_TO_GAME(candy);
13.58 LINK_ENTITY_TO_GAME(cannon_ball);
13.59 LINK_ENTITY_TO_GAME(capture_point);
13.60 @@ -435,6 +448,7 @@
13.61 LINK_ENTITY_TO_GAME(charged_bolt);
13.62 LINK_ENTITY_TO_GAME(cine_blood);
13.63 LINK_ENTITY_TO_GAME(cm_rocket_01);
13.64 +LINK_ENTITY_TO_GAME(cocklebur);
13.65 LINK_ENTITY_TO_GAME(conc_charge);
13.66 LINK_ENTITY_TO_GAME(control_forklift);
13.67 LINK_ENTITY_TO_GAME(controller_charge_ball);
13.68 @@ -608,6 +622,7 @@
13.69 LINK_ENTITY_TO_GAME(env_ClusterExplosion);
13.70 LINK_ENTITY_TO_GAME(env_animsprite);
13.71 LINK_ENTITY_TO_GAME(env_beam);
13.72 +LINK_ENTITY_TO_GAME(env_beamtrail);
13.73 LINK_ENTITY_TO_GAME(env_beverage);
13.74 LINK_ENTITY_TO_GAME(env_blood);
13.75 LINK_ENTITY_TO_GAME(env_blowercannon);
13.76 @@ -615,13 +630,17 @@
13.77 LINK_ENTITY_TO_GAME(env_bubbles);
13.78 LINK_ENTITY_TO_GAME(env_customize);
13.79 LINK_ENTITY_TO_GAME(env_debris);
13.80 +LINK_ENTITY_TO_GAME(env_decal);
13.81 +LINK_ENTITY_TO_GAME(env_dlight);
13.82 LINK_ENTITY_TO_GAME(env_electrified_wire);
13.83 +LINK_ENTITY_TO_GAME(env_elight);
13.84 LINK_ENTITY_TO_GAME(env_explosion);
13.85 LINK_ENTITY_TO_GAME(env_fade);
13.86 LINK_ENTITY_TO_GAME(env_fadeone);
13.87 LINK_ENTITY_TO_GAME(env_fire);
13.88 LINK_ENTITY_TO_GAME(env_flag);
13.89 LINK_ENTITY_TO_GAME(env_fog);
13.90 +LINK_ENTITY_TO_GAME(env_footsteps);
13.91 LINK_ENTITY_TO_GAME(env_fountain);
13.92 LINK_ENTITY_TO_GAME(env_funnel);
13.93 LINK_ENTITY_TO_GAME(env_gamma);
13.94 @@ -636,19 +655,23 @@
13.95 LINK_ENTITY_TO_GAME(env_model);
13.96 LINK_ENTITY_TO_GAME(env_mp3);
13.97 LINK_ENTITY_TO_GAME(env_music);
13.98 +LINK_ENTITY_TO_GAME(env_particle);
13.99 LINK_ENTITY_TO_GAME(env_particleemitter);
13.100 LINK_ENTITY_TO_GAME(env_particles);
13.101 LINK_ENTITY_TO_GAME(env_particles_custom);
13.102 LINK_ENTITY_TO_GAME(env_particule);
13.103 LINK_ENTITY_TO_GAME(env_precip);
13.104 LINK_ENTITY_TO_GAME(env_push);
13.105 +LINK_ENTITY_TO_GAME(env_quakefx);
13.106 LINK_ENTITY_TO_GAME(env_rain);
13.107 LINK_ENTITY_TO_GAME(env_render);
13.108 LINK_ENTITY_TO_GAME(env_rocketshooter);
13.109 LINK_ENTITY_TO_GAME(env_rope);
13.110 LINK_ENTITY_TO_GAME(env_sentence);
13.111 LINK_ENTITY_TO_GAME(env_shake);
13.112 +LINK_ENTITY_TO_GAME(env_shockwave);
13.113 LINK_ENTITY_TO_GAME(env_shooter);
13.114 +LINK_ENTITY_TO_GAME(env_sky);
13.115 LINK_ENTITY_TO_GAME(env_smoker);
13.116 LINK_ENTITY_TO_GAME(env_snow);
13.117 LINK_ENTITY_TO_GAME(env_sound);
13.118 @@ -662,6 +685,7 @@
13.119 LINK_ENTITY_TO_GAME(env_timer);
13.120 LINK_ENTITY_TO_GAME(env_vgui);
13.121 LINK_ENTITY_TO_GAME(env_warpball);
13.122 +LINK_ENTITY_TO_GAME(env_weather);
13.123 LINK_ENTITY_TO_GAME(env_xenmaker);
13.124 LINK_ENTITY_TO_GAME(equipment_parachute);
13.125 LINK_ENTITY_TO_GAME(event_player_die);
13.126 @@ -723,6 +747,7 @@
13.127 LINK_ENTITY_TO_GAME(func_airstrike_area);
13.128 LINK_ENTITY_TO_GAME(func_ammoprovider);
13.129 LINK_ENTITY_TO_GAME(func_ammostripper);
13.130 +LINK_ENTITY_TO_GAME(func_bankteller);
13.131 LINK_ENTITY_TO_GAME(func_base);
13.132 LINK_ENTITY_TO_GAME(func_bomb_target);
13.133 LINK_ENTITY_TO_GAME(func_breakable);
13.134 @@ -733,6 +758,7 @@
13.135 LINK_ENTITY_TO_GAME(func_capturepoint);
13.136 LINK_ENTITY_TO_GAME(func_clouds);
13.137 LINK_ENTITY_TO_GAME(func_conveyor);
13.138 +LINK_ENTITY_TO_GAME(func_corruptsecurity);
13.139 LINK_ENTITY_TO_GAME(func_ctb);
13.140 LINK_ENTITY_TO_GAME(func_destroy_objective);
13.141 LINK_ENTITY_TO_GAME(func_disctoggle);
13.142 @@ -773,6 +799,15 @@
13.143 LINK_ENTITY_TO_GAME(func_monsterclip);
13.144 LINK_ENTITY_TO_GAME(func_mortar_field);
13.145 LINK_ENTITY_TO_GAME(func_music);
13.146 +LINK_ENTITY_TO_GAME(func_needs);
13.147 +LINK_ENTITY_TO_GAME(func_needs_boredom);
13.148 +LINK_ENTITY_TO_GAME(func_needs_dirty);
13.149 +LINK_ENTITY_TO_GAME(func_needs_drink);
13.150 +LINK_ENTITY_TO_GAME(func_needs_eat);
13.151 +LINK_ENTITY_TO_GAME(func_needs_fatigue);
13.152 +LINK_ENTITY_TO_GAME(func_needs_lonely);
13.153 +LINK_ENTITY_TO_GAME(func_needs_pee);
13.154 +LINK_ENTITY_TO_GAME(func_needs_poo);
13.155 LINK_ENTITY_TO_GAME(func_nobuild);
13.156 LINK_ENTITY_TO_GAME(func_nogrenades);
13.157 LINK_ENTITY_TO_GAME(func_op4mortarcontroller);
13.158 @@ -793,8 +828,13 @@
13.159 LINK_ENTITY_TO_GAME(func_resource);
13.160 LINK_ENTITY_TO_GAME(func_rot_button);
13.161 LINK_ENTITY_TO_GAME(func_rotating);
13.162 +LINK_ENTITY_TO_GAME(func_searchlight);
13.163 +LINK_ENTITY_TO_GAME(func_securityzone);
13.164 LINK_ENTITY_TO_GAME(func_seethrough);
13.165 LINK_ENTITY_TO_GAME(func_seethroughdoor);
13.166 +LINK_ENTITY_TO_GAME(func_shine);
13.167 +LINK_ENTITY_TO_GAME(func_sickbay_bed);
13.168 +LINK_ENTITY_TO_GAME(func_sickbay_psych);
13.169 LINK_ENTITY_TO_GAME(func_snow);
13.170 LINK_ENTITY_TO_GAME(func_tank);
13.171 LINK_ENTITY_TO_GAME(func_tank_of);
13.172 @@ -821,6 +861,10 @@
13.173 LINK_ENTITY_TO_GAME(func_tracktrain);
13.174 LINK_ENTITY_TO_GAME(func_train);
13.175 LINK_ENTITY_TO_GAME(func_traincontrols);
13.176 +LINK_ENTITY_TO_GAME(func_trenchcap1);
13.177 +LINK_ENTITY_TO_GAME(func_trenchcap2);
13.178 +LINK_ENTITY_TO_GAME(func_trenchcap3);
13.179 +LINK_ENTITY_TO_GAME(func_trenchcap4);
13.180 LINK_ENTITY_TO_GAME(func_use);
13.181 LINK_ENTITY_TO_GAME(func_vehicle);
13.182 LINK_ENTITY_TO_GAME(func_vehiclecontrols);
13.183 @@ -829,6 +873,7 @@
13.184 LINK_ENTITY_TO_GAME(func_vip_safetyzone);
13.185 LINK_ENTITY_TO_GAME(func_wall);
13.186 LINK_ENTITY_TO_GAME(func_wall_toggle);
13.187 +LINK_ENTITY_TO_GAME(func_wardrobe);
13.188 LINK_ENTITY_TO_GAME(func_water);
13.189 LINK_ENTITY_TO_GAME(func_water_up);
13.190 LINK_ENTITY_TO_GAME(func_weaponcheck);
13.191 @@ -926,12 +971,15 @@
13.192 LINK_ENTITY_TO_GAME(hornet);
13.193 LINK_ENTITY_TO_GAME(hospital);
13.194 LINK_ENTITY_TO_GAME(hostage_entity);
13.195 +LINK_ENTITY_TO_GAME(hud_sprite);
13.196 LINK_ENTITY_TO_GAME(human_flashgrenade);
13.197 LINK_ENTITY_TO_GAME(hvr_blkop_rocket);
13.198 LINK_ENTITY_TO_GAME(hvr_rocket);
13.199 LINK_ENTITY_TO_GAME(i_p_t);
13.200 LINK_ENTITY_TO_GAME(i_t_g);
13.201 LINK_ENTITY_TO_GAME(i_t_t);
13.202 +LINK_ENTITY_TO_GAME(i_w_g);
13.203 +LINK_ENTITY_TO_GAME(i_w_t);
13.204 LINK_ENTITY_TO_GAME(impact_sprite);
13.205 LINK_ENTITY_TO_GAME(impail_arrow);
13.206 LINK_ENTITY_TO_GAME(impailer);
13.207 @@ -973,6 +1021,7 @@
13.208 LINK_ENTITY_TO_GAME(info_chicken);
13.209 LINK_ENTITY_TO_GAME(info_chip);
13.210 LINK_ENTITY_TO_GAME(info_civ_start);
13.211 +LINK_ENTITY_TO_GAME(info_compile_parameters);
13.212 LINK_ENTITY_TO_GAME(info_css);
13.213 LINK_ENTITY_TO_GAME(info_ctb_controller);
13.214 LINK_ENTITY_TO_GAME(info_ctfdetect);
13.215 @@ -1054,8 +1103,10 @@
13.216 LINK_ENTITY_TO_GAME(info_monster_start);
13.217 LINK_ENTITY_TO_GAME(info_morbid);
13.218 LINK_ENTITY_TO_GAME(info_morbid_start);
13.219 +LINK_ENTITY_TO_GAME(info_movewith);
13.220 LINK_ENTITY_TO_GAME(info_msdetect);
13.221 LINK_ENTITY_TO_GAME(info_multiple);
13.222 +LINK_ENTITY_TO_GAME(info_next_map);
13.223 LINK_ENTITY_TO_GAME(info_node);
13.224 LINK_ENTITY_TO_GAME(info_node_air);
13.225 LINK_ENTITY_TO_GAME(info_nomines);
13.226 @@ -1176,6 +1227,7 @@
13.227 LINK_ENTITY_TO_GAME(info_teamplaydetect);
13.228 LINK_ENTITY_TO_GAME(info_teamspawn);
13.229 LINK_ENTITY_TO_GAME(info_teleport_destination);
13.230 +LINK_ENTITY_TO_GAME(info_texlights);
13.231 LINK_ENTITY_TO_GAME(info_tf_teamcheck);
13.232 LINK_ENTITY_TO_GAME(info_tf_teamset);
13.233 LINK_ENTITY_TO_GAME(info_tfdetect);
13.234 @@ -1184,21 +1236,28 @@
13.235 LINK_ENTITY_TO_GAME(info_throw_in);
13.236 LINK_ENTITY_TO_GAME(info_transistor);
13.237 LINK_ENTITY_TO_GAME(info_transport_node);
13.238 +LINK_ENTITY_TO_GAME(info_tt_gameplay);
13.239 LINK_ENTITY_TO_GAME(info_upko_start);
13.240 LINK_ENTITY_TO_GAME(info_usa_start);
13.241 LINK_ENTITY_TO_GAME(info_vgui_start);
13.242 LINK_ENTITY_TO_GAME(info_vip_start);
13.243 LINK_ENTITY_TO_GAME(info_wanteddetect);
13.244 LINK_ENTITY_TO_GAME(info_waypoint);
13.245 +LINK_ENTITY_TO_GAME(info_ww_teamcheck);
13.246 +LINK_ENTITY_TO_GAME(info_ww_teamset);
13.247 LINK_ENTITY_TO_GAME(info_wwdetect);
13.248 +LINK_ENTITY_TO_GAME(info_wwgoal);
13.249 +LINK_ENTITY_TO_GAME(info_wwgoal_timer);
13.250 LINK_ENTITY_TO_GAME(info_zone);
13.251 LINK_ENTITY_TO_GAME(info_zone_caisse);
13.252 LINK_ENTITY_TO_GAME(infodecal);
13.253 +LINK_ENTITY_TO_GAME(inout_register);
13.254 LINK_ENTITY_TO_GAME(item_NVG);
13.255 LINK_ENTITY_TO_GAME(item_acme);
13.256 LINK_ENTITY_TO_GAME(item_airtank);
13.257 LINK_ENTITY_TO_GAME(item_ammo);
13.258 LINK_ENTITY_TO_GAME(item_ammoicon);
13.259 +LINK_ENTITY_TO_GAME(item_ammopack);
13.260 LINK_ENTITY_TO_GAME(item_antidote);
13.261 LINK_ENTITY_TO_GAME(item_antidotee);
13.262 LINK_ENTITY_TO_GAME(item_armor);
13.263 @@ -1226,6 +1285,7 @@
13.264 LINK_ENTITY_TO_GAME(item_baril_rouge);
13.265 LINK_ENTITY_TO_GAME(item_battery);
13.266 LINK_ENTITY_TO_GAME(item_beans);
13.267 +LINK_ENTITY_TO_GAME(item_body);
13.268 LINK_ENTITY_TO_GAME(item_bonustime);
13.269 LINK_ENTITY_TO_GAME(item_bonustime2);
13.270 LINK_ENTITY_TO_GAME(item_bonustime3);
13.271 @@ -1249,6 +1309,7 @@
13.272 LINK_ENTITY_TO_GAME(item_claymore);
13.273 LINK_ENTITY_TO_GAME(item_cloaker);
13.274 LINK_ENTITY_TO_GAME(item_concussion);
13.275 +LINK_ENTITY_TO_GAME(item_corpse);
13.276 LINK_ENTITY_TO_GAME(item_ctf_flag);
13.277 LINK_ENTITY_TO_GAME(item_ctfaccelerator);
13.278 LINK_ENTITY_TO_GAME(item_ctfbackpack);
13.279 @@ -1309,6 +1370,7 @@
13.280 LINK_ENTITY_TO_GAME(item_longjump);
13.281 LINK_ENTITY_TO_GAME(item_mask);
13.282 LINK_ENTITY_TO_GAME(item_medboiler);
13.283 +LINK_ENTITY_TO_GAME(item_megavirus);
13.284 LINK_ENTITY_TO_GAME(item_metal);
13.285 LINK_ENTITY_TO_GAME(item_mine);
13.286 LINK_ENTITY_TO_GAME(item_newspaper);
13.287 @@ -1325,6 +1387,7 @@
13.288 LINK_ENTITY_TO_GAME(item_powerarmor);
13.289 LINK_ENTITY_TO_GAME(item_powerup);
13.290 LINK_ENTITY_TO_GAME(item_quad);
13.291 +LINK_ENTITY_TO_GAME(item_radio);
13.292 LINK_ENTITY_TO_GAME(item_random);
13.293 LINK_ENTITY_TO_GAME(item_regeneration);
13.294 LINK_ENTITY_TO_GAME(item_resource);
13.295 @@ -1361,9 +1424,12 @@
13.296 LINK_ENTITY_TO_GAME(item_wagonwheel);
13.297 LINK_ENTITY_TO_GAME(item_weapon);
13.298 LINK_ENTITY_TO_GAME(item_wheelside);
13.299 +LINK_ENTITY_TO_GAME(item_wwgoal);
13.300 LINK_ENTITY_TO_GAME(jail_execute);
13.301 LINK_ENTITY_TO_GAME(jail_team_master);
13.302 +LINK_ENTITY_TO_GAME(jailer);
13.303 LINK_ENTITY_TO_GAME(javelin);
13.304 +LINK_ENTITY_TO_GAME(judge);
13.305 LINK_ENTITY_TO_GAME(jumppad_sign);
13.306 LINK_ENTITY_TO_GAME(kamehameha);
13.307 LINK_ENTITY_TO_GAME(kb_fireworklauncher);
13.308 @@ -1388,6 +1454,10 @@
13.309 LINK_ENTITY_TO_GAME(light_environment);
13.310 LINK_ENTITY_TO_GAME(light_glow);
13.311 LINK_ENTITY_TO_GAME(light_spot);
13.312 +LINK_ENTITY_TO_GAME(lightfader);
13.313 +LINK_ENTITY_TO_GAME(locus_alias);
13.314 +LINK_ENTITY_TO_GAME(locus_beam);
13.315 +LINK_ENTITY_TO_GAME(locus_variable);
13.316 LINK_ENTITY_TO_GAME(m61_grenade);
13.317 LINK_ENTITY_TO_GAME(m72_rocket);
13.318 LINK_ENTITY_TO_GAME(magicattack);
13.319 @@ -1429,6 +1499,7 @@
13.320 LINK_ENTITY_TO_GAME(mini_grunt);
13.321 LINK_ENTITY_TO_GAME(mini_rocket);
13.322 LINK_ENTITY_TO_GAME(mission_modifier);
13.323 +LINK_ENTITY_TO_GAME(misterx);
13.324 LINK_ENTITY_TO_GAME(molotov);
13.325 LINK_ENTITY_TO_GAME(momentary_door);
13.326 LINK_ENTITY_TO_GAME(momentary_jail_door);
13.327 @@ -1479,6 +1550,7 @@
13.328 LINK_ENTITY_TO_GAME(monster_bomb);
13.329 LINK_ENTITY_TO_GAME(monster_buffalo);
13.330 LINK_ENTITY_TO_GAME(monster_bullchicken);
13.331 +LINK_ENTITY_TO_GAME(monster_bullsquid);
13.332 LINK_ENTITY_TO_GAME(monster_burnmine);
13.333 LINK_ENTITY_TO_GAME(monster_c4);
13.334 LINK_ENTITY_TO_GAME(monster_cat);
13.335 @@ -1559,6 +1631,7 @@
13.336 LINK_ENTITY_TO_GAME(monster_gargantua);
13.337 LINK_ENTITY_TO_GAME(monster_gator);
13.338 LINK_ENTITY_TO_GAME(monster_generic);
13.339 +LINK_ENTITY_TO_GAME(monster_generic_dead);
13.340 LINK_ENTITY_TO_GAME(monster_geneworm);
13.341 LINK_ENTITY_TO_GAME(monster_giantplant);
13.342 LINK_ENTITY_TO_GAME(monster_gman);
13.343 @@ -1631,8 +1704,10 @@
13.344 LINK_ENTITY_TO_GAME(monster_microraptor);
13.345 LINK_ENTITY_TO_GAME(monster_mine);
13.346 LINK_ENTITY_TO_GAME(monster_miniturret);
13.347 +LINK_ENTITY_TO_GAME(monster_missle);
13.348 LINK_ENTITY_TO_GAME(monster_monkey);
13.349 LINK_ENTITY_TO_GAME(monster_mortar);
13.350 +LINK_ENTITY_TO_GAME(monster_morter);
13.351 LINK_ENTITY_TO_GAME(monster_mouton);
13.352 LINK_ENTITY_TO_GAME(monster_myself);
13.353 LINK_ENTITY_TO_GAME(monster_myself_dead);
13.354 @@ -1690,6 +1765,7 @@
13.355 LINK_ENTITY_TO_GAME(monster_shockroach);
13.356 LINK_ENTITY_TO_GAME(monster_shocktrooper);
13.357 LINK_ENTITY_TO_GAME(monster_shocktrooper_repel);
13.358 +LINK_ENTITY_TO_GAME(monster_shotgun);
13.359 LINK_ENTITY_TO_GAME(monster_sitting_civilian);
13.360 LINK_ENTITY_TO_GAME(monster_sitting_cleansuit_scientist);
13.361 LINK_ENTITY_TO_GAME(monster_sitting_colonel);
13.362 @@ -1721,6 +1797,7 @@
13.363 LINK_ENTITY_TO_GAME(monster_super_snark);
13.364 LINK_ENTITY_TO_GAME(monster_tac);
13.365 LINK_ENTITY_TO_GAME(monster_tank);
13.366 +LINK_ENTITY_TO_GAME(monster_target);
13.367 LINK_ENTITY_TO_GAME(monster_targetrocket);
13.368 LINK_ENTITY_TO_GAME(monster_tentacle);
13.369 LINK_ENTITY_TO_GAME(monster_tentaclemaw);
13.370 @@ -1764,6 +1841,8 @@
13.371 LINK_ENTITY_TO_GAME(monstermaker);
13.372 LINK_ENTITY_TO_GAME(mortar_shell);
13.373 LINK_ENTITY_TO_GAME(mortarshell);
13.374 +LINK_ENTITY_TO_GAME(motion_manager);
13.375 +LINK_ENTITY_TO_GAME(motion_thread);
13.376 LINK_ENTITY_TO_GAME(movementchamber);
13.377 LINK_ENTITY_TO_GAME(moving_camera);
13.378 LINK_ENTITY_TO_GAME(multi_alias);
13.379 @@ -1859,6 +1938,7 @@
13.380 LINK_ENTITY_TO_GAME(para_roundtimer);
13.381 LINK_ENTITY_TO_GAME(particle);
13.382 LINK_ENTITY_TO_GAME(particle_shooter);
13.383 +LINK_ENTITY_TO_GAME(particle_weatherfx);
13.384 LINK_ENTITY_TO_GAME(path_corner);
13.385 LINK_ENTITY_TO_GAME(path_monster);
13.386 LINK_ENTITY_TO_GAME(path_track);
13.387 @@ -1901,6 +1981,7 @@
13.388 LINK_ENTITY_TO_GAME(player_beartrapstrip);
13.389 LINK_ENTITY_TO_GAME(player_corpse);
13.390 LINK_ENTITY_TO_GAME(player_flame);
13.391 +LINK_ENTITY_TO_GAME(player_freeze);
13.392 LINK_ENTITY_TO_GAME(player_giveitems);
13.393 LINK_ENTITY_TO_GAME(player_glasses);
13.394 LINK_ENTITY_TO_GAME(player_helmet);
13.395 @@ -1913,6 +1994,7 @@
13.396 LINK_ENTITY_TO_GAME(player_weaponstrip);
13.397 LINK_ENTITY_TO_GAME(playerhornet);
13.398 LINK_ENTITY_TO_GAME(point_win);
13.399 +LINK_ENTITY_TO_GAME(poison_injected);
13.400 LINK_ENTITY_TO_GAME(potatoc);
13.401 LINK_ENTITY_TO_GAME(power_ballbag);
13.402 LINK_ENTITY_TO_GAME(power_coco);
13.403 @@ -1937,14 +2019,17 @@
13.404 LINK_ENTITY_TO_GAME(proj_flyingskull);
13.405 LINK_ENTITY_TO_GAME(proj_healhurtsatchel);
13.406 LINK_ENTITY_TO_GAME(proj_icepoke);
13.407 +LINK_ENTITY_TO_GAME(proj_iceshard);
13.408 LINK_ENTITY_TO_GAME(proj_lightningcloud);
13.409 LINK_ENTITY_TO_GAME(proj_lightningsatchel);
13.410 LINK_ENTITY_TO_GAME(proj_magicmissle);
13.411 LINK_ENTITY_TO_GAME(proj_meteor);
13.412 LINK_ENTITY_TO_GAME(proj_mindmissle);
13.413 +LINK_ENTITY_TO_GAME(proj_missile);
13.414 LINK_ENTITY_TO_GAME(proj_poisonsatchel);
13.415 LINK_ENTITY_TO_GAME(proj_rollingstone);
13.416 LINK_ENTITY_TO_GAME(proj_sporepod);
13.417 +LINK_ENTITY_TO_GAME(proj_stone);
13.418 LINK_ENTITY_TO_GAME(proj_suctionsatchel);
13.419 LINK_ENTITY_TO_GAME(proj_tcrystal);
13.420 LINK_ENTITY_TO_GAME(proj_throwingbone);
13.421 @@ -1973,6 +2058,11 @@
13.422 LINK_ENTITY_TO_GAME(pt_trigger_zone);
13.423 LINK_ENTITY_TO_GAME(pulsefrag);
13.424 LINK_ENTITY_TO_GAME(punch_tripmine);
13.425 +LINK_ENTITY_TO_GAME(push_point1);
13.426 +LINK_ENTITY_TO_GAME(push_point2);
13.427 +LINK_ENTITY_TO_GAME(push_point3);
13.428 +LINK_ENTITY_TO_GAME(push_point4);
13.429 +LINK_ENTITY_TO_GAME(push_point5);
13.430 LINK_ENTITY_TO_GAME(quake_nail);
13.431 LINK_ENTITY_TO_GAME(quake_rocket);
13.432 LINK_ENTITY_TO_GAME(race_controller);
13.433 @@ -2009,6 +2099,7 @@
13.434 LINK_ENTITY_TO_GAME(rs_teamslot);
13.435 LINK_ENTITY_TO_GAME(rs_victorypoints);
13.436 LINK_ENTITY_TO_GAME(sams_shower);
13.437 +LINK_ENTITY_TO_GAME(sanity);
13.438 LINK_ENTITY_TO_GAME(satelite_laser);
13.439 LINK_ENTITY_TO_GAME(scan);
13.440 LINK_ENTITY_TO_GAME(scatterattack);
13.441 @@ -2022,14 +2113,18 @@
13.442 LINK_ENTITY_TO_GAME(scripted_action);
13.443 LINK_ENTITY_TO_GAME(scripted_sentence);
13.444 LINK_ENTITY_TO_GAME(scripted_sequence);
13.445 +LINK_ENTITY_TO_GAME(scripted_tanksequence);
13.446 +LINK_ENTITY_TO_GAME(scripted_trainsequence);
13.447 LINK_ENTITY_TO_GAME(sdcurse);
13.448 LINK_ENTITY_TO_GAME(secondary_point);
13.449 +LINK_ENTITY_TO_GAME(securitymanager);
13.450 LINK_ENTITY_TO_GAME(sensorychamber);
13.451 LINK_ENTITY_TO_GAME(sgvortex);
13.452 LINK_ENTITY_TO_GAME(shell_bazooka);
13.453 LINK_ENTITY_TO_GAME(shell_piat);
13.454 LINK_ENTITY_TO_GAME(shell_pschreck);
13.455 LINK_ENTITY_TO_GAME(shenlong);
13.456 +LINK_ENTITY_TO_GAME(shipAI_shipmate);
13.457 LINK_ENTITY_TO_GAME(shock_beam);
13.458 LINK_ENTITY_TO_GAME(shotgun_crate);
13.459 LINK_ENTITY_TO_GAME(shotgun_forklift);
13.460 @@ -2039,6 +2134,7 @@
13.461 LINK_ENTITY_TO_GAME(shrink_timer);
13.462 LINK_ENTITY_TO_GAME(shrinker_project);
13.463 LINK_ENTITY_TO_GAME(siegeturret);
13.464 +LINK_ENTITY_TO_GAME(skull);
13.465 LINK_ENTITY_TO_GAME(skunk_fart);
13.466 LINK_ENTITY_TO_GAME(slAGruntTakeCoverFromEnemy);
13.467 LINK_ENTITY_TO_GAME(slAGruntThreatDisplay);
13.468 @@ -2197,6 +2293,7 @@
13.469 LINK_ENTITY_TO_GAME(tf_weapon_superng);
13.470 LINK_ENTITY_TO_GAME(tf_weapon_supershotgun);
13.471 LINK_ENTITY_TO_GAME(tf_weapon_tranq);
13.472 +LINK_ENTITY_TO_GAME(thornbush);
13.473 LINK_ENTITY_TO_GAME(throwing_knife);
13.474 LINK_ENTITY_TO_GAME(thrown_katana);
13.475 LINK_ENTITY_TO_GAME(thrown_knife);
13.476 @@ -2236,6 +2333,9 @@
13.477 LINK_ENTITY_TO_GAME(transport_apc);
13.478 LINK_ENTITY_TO_GAME(transport_blackhawk);
13.479 LINK_ENTITY_TO_GAME(treasure_chest);
13.480 +LINK_ENTITY_TO_GAME(trenches_allied_start);
13.481 +LINK_ENTITY_TO_GAME(trenches_axis_start);
13.482 +LINK_ENTITY_TO_GAME(trenches_central_start);
13.483 LINK_ENTITY_TO_GAME(trigger);
13.484 LINK_ENTITY_TO_GAME(trigger_GoalLine);
13.485 LINK_ENTITY_TO_GAME(trigger_PenaltyBox);
13.486 @@ -2247,16 +2347,19 @@
13.487 LINK_ENTITY_TO_GAME(trigger_autosave);
13.488 LINK_ENTITY_TO_GAME(trigger_ball);
13.489 LINK_ENTITY_TO_GAME(trigger_baril);
13.490 +LINK_ENTITY_TO_GAME(trigger_bounce);
13.491 LINK_ENTITY_TO_GAME(trigger_camera);
13.492 LINK_ENTITY_TO_GAME(trigger_capturetimer);
13.493 LINK_ENTITY_TO_GAME(trigger_captureupdate);
13.494 LINK_ENTITY_TO_GAME(trigger_cdaudio);
13.495 LINK_ENTITY_TO_GAME(trigger_changealias);
13.496 +LINK_ENTITY_TO_GAME(trigger_changecvar);
13.497 LINK_ENTITY_TO_GAME(trigger_changelevel);
13.498 LINK_ENTITY_TO_GAME(trigger_changetarget);
13.499 LINK_ENTITY_TO_GAME(trigger_changevalue);
13.500 LINK_ENTITY_TO_GAME(trigger_coldbreath);
13.501 LINK_ENTITY_TO_GAME(trigger_comet);
13.502 +LINK_ENTITY_TO_GAME(trigger_command);
13.503 LINK_ENTITY_TO_GAME(trigger_control);
13.504 LINK_ENTITY_TO_GAME(trigger_coop);
13.505 LINK_ENTITY_TO_GAME(trigger_counter);
13.506 @@ -2269,6 +2372,7 @@
13.507 LINK_ENTITY_TO_GAME(trigger_die);
13.508 LINK_ENTITY_TO_GAME(trigger_discerturn);
13.509 LINK_ENTITY_TO_GAME(trigger_discreturn);
13.510 +LINK_ENTITY_TO_GAME(trigger_endround);
13.511 LINK_ENTITY_TO_GAME(trigger_endsection);
13.512 LINK_ENTITY_TO_GAME(trigger_env_hurt);
13.513 LINK_ENTITY_TO_GAME(trigger_execcommand);
13.514 @@ -2278,10 +2382,12 @@
13.515 LINK_ENTITY_TO_GAME(trigger_golem);
13.516 LINK_ENTITY_TO_GAME(trigger_gravity);
13.517 LINK_ENTITY_TO_GAME(trigger_gunmanteleport);
13.518 +LINK_ENTITY_TO_GAME(trigger_hevcharge);
13.519 LINK_ENTITY_TO_GAME(trigger_hold);
13.520 LINK_ENTITY_TO_GAME(trigger_hurt);
13.521 LINK_ENTITY_TO_GAME(trigger_hurt_bleu);
13.522 LINK_ENTITY_TO_GAME(trigger_hurt_rouge);
13.523 +LINK_ENTITY_TO_GAME(trigger_inout);
13.524 LINK_ENTITY_TO_GAME(trigger_jail);
13.525 LINK_ENTITY_TO_GAME(trigger_jail_release);
13.526 LINK_ENTITY_TO_GAME(trigger_jetpack);
13.527 @@ -2294,12 +2400,14 @@
13.528 LINK_ENTITY_TO_GAME(trigger_loadhazard);
13.529 LINK_ENTITY_TO_GAME(trigger_mine);
13.530 LINK_ENTITY_TO_GAME(trigger_monsterjump);
13.531 +LINK_ENTITY_TO_GAME(trigger_motion);
13.532 LINK_ENTITY_TO_GAME(trigger_multiple);
13.533 LINK_ENTITY_TO_GAME(trigger_music);
13.534 LINK_ENTITY_TO_GAME(trigger_noclaymore);
13.535 LINK_ENTITY_TO_GAME(trigger_npcarea);
13.536 LINK_ENTITY_TO_GAME(trigger_objectcapture);
13.537 LINK_ENTITY_TO_GAME(trigger_once);
13.538 +LINK_ENTITY_TO_GAME(trigger_onsight);
13.539 LINK_ENTITY_TO_GAME(trigger_particles);
13.540 LINK_ENTITY_TO_GAME(trigger_playerfreeze);
13.541 LINK_ENTITY_TO_GAME(trigger_point_controle);
13.542 @@ -2313,6 +2421,7 @@
13.543 LINK_ENTITY_TO_GAME(trigger_relay);
13.544 LINK_ENTITY_TO_GAME(trigger_respawn);
13.545 LINK_ENTITY_TO_GAME(trigger_rndbased);
13.546 +LINK_ENTITY_TO_GAME(trigger_rottest);
13.547 LINK_ENTITY_TO_GAME(trigger_rs_hurt);
13.548 LINK_ENTITY_TO_GAME(trigger_script);
13.549 LINK_ENTITY_TO_GAME(trigger_secret);
13.550 @@ -2370,6 +2479,7 @@
13.551 LINK_ENTITY_TO_GAME(vote_llama);
13.552 LINK_ENTITY_TO_GAME(vscrossbow_bolt);
13.553 LINK_ENTITY_TO_GAME(watcher);
13.554 +LINK_ENTITY_TO_GAME(watcher_count);
13.555 LINK_ENTITY_TO_GAME(weapmortar);
13.556 LINK_ENTITY_TO_GAME(weapon_1100);
13.557 LINK_ENTITY_TO_GAME(weapon_1911);
13.558 @@ -2377,15 +2487,26 @@
13.559 LINK_ENTITY_TO_GAME(weapon_357);
13.560 LINK_ENTITY_TO_GAME(weapon_40gl);
13.561 LINK_ENTITY_TO_GAME(weapon_50cal);
13.562 +LINK_ENTITY_TO_GAME(weapon_556AR);
13.563 LINK_ENTITY_TO_GAME(weapon_90mm);
13.564 LINK_ENTITY_TO_GAME(weapon_92d);
13.565 LINK_ENTITY_TO_GAME(weapon_9mmAR);
13.566 LINK_ENTITY_TO_GAME(weapon_9mmhandgun);
13.567 LINK_ENTITY_TO_GAME(weapon_9mmm41a);
13.568 +LINK_ENTITY_TO_GAME(weapon_BritGrenMelee);
13.569 +LINK_ENTITY_TO_GAME(weapon_BritGrenNade);
13.570 LINK_ENTITY_TO_GAME(weapon_BrownBess);
13.571 +LINK_ENTITY_TO_GAME(weapon_CEnfield);
13.572 +LINK_ENTITY_TO_GAME(weapon_CEnfieldMelee);
13.573 +LINK_ENTITY_TO_GAME(weapon_CEnfieldNade);
13.574 LINK_ENTITY_TO_GAME(weapon_Charleville);
13.575 LINK_ENTITY_TO_GAME(weapon_FT);
13.576 LINK_ENTITY_TO_GAME(weapon_G11);
13.577 +LINK_ENTITY_TO_GAME(weapon_GMauserG98);
13.578 +LINK_ENTITY_TO_GAME(weapon_GMauserG98Melee);
13.579 +LINK_ENTITY_TO_GAME(weapon_GMauserG98Nade);
13.580 +LINK_ENTITY_TO_GAME(weapon_GermGrenMelee);
13.581 +LINK_ENTITY_TO_GAME(weapon_GermGrenNade);
13.582 LINK_ENTITY_TO_GAME(weapon_Knife);
13.583 LINK_ENTITY_TO_GAME(weapon_Pennsylvania);
13.584 LINK_ENTITY_TO_GAME(weapon_PistolA);
13.585 @@ -2600,6 +2721,7 @@
13.586 LINK_ENTITY_TO_GAME(weapon_emag);
13.587 LINK_ENTITY_TO_GAME(weapon_empcannon);
13.588 LINK_ENTITY_TO_GAME(weapon_emsniper);
13.589 +LINK_ENTITY_TO_GAME(weapon_energy);
13.590 LINK_ENTITY_TO_GAME(weapon_enfield);
13.591 LINK_ENTITY_TO_GAME(weapon_excal);
13.592 LINK_ENTITY_TO_GAME(weapon_experimental);
13.593 @@ -2902,6 +3024,7 @@
13.594 LINK_ENTITY_TO_GAME(weapon_psg);
13.595 LINK_ENTITY_TO_GAME(weapon_psg1);
13.596 LINK_ENTITY_TO_GAME(weapon_pt);
13.597 +LINK_ENTITY_TO_GAME(weapon_pushhands);
13.598 LINK_ENTITY_TO_GAME(weapon_python);
13.599 LINK_ENTITY_TO_GAME(weapon_quakegun);
13.600 LINK_ENTITY_TO_GAME(weapon_radio);
13.601 @@ -3065,6 +3188,7 @@
13.602 LINK_ENTITY_TO_GAME(weapon_swarm_gargflame);
13.603 LINK_ENTITY_TO_GAME(weapon_swipe);
13.604 LINK_ENTITY_TO_GAME(weapon_sword);
13.605 +LINK_ENTITY_TO_GAME(weapon_syringe);
13.606 LINK_ENTITY_TO_GAME(weapon_tacgun);
13.607 LINK_ENTITY_TO_GAME(weapon_tavor);
13.608 LINK_ENTITY_TO_GAME(weapon_tdagger);
13.609 @@ -3098,6 +3222,7 @@
13.610 LINK_ENTITY_TO_GAME(weapon_tucan);
13.611 LINK_ENTITY_TO_GAME(weapon_twosword);
13.612 LINK_ENTITY_TO_GAME(weapon_umbra);
13.613 +LINK_ENTITY_TO_GAME(weapon_umbrella);
13.614 LINK_ENTITY_TO_GAME(weapon_ump45);
13.615 LINK_ENTITY_TO_GAME(weapon_updraftspell);
13.616 LINK_ENTITY_TO_GAME(weapon_us_grenade);
13.617 @@ -3147,7 +3272,58 @@
13.618 LINK_ENTITY_TO_GAME(world_capturelocation);
13.619 LINK_ENTITY_TO_GAME(world_items);
13.620 LINK_ENTITY_TO_GAME(worldspawn);
13.621 +LINK_ENTITY_TO_GAME(ww_ammo_satchels);
13.622 +LINK_ENTITY_TO_GAME(ww_ammo_spellbook);
13.623 +LINK_ENTITY_TO_GAME(ww_bearbite);
13.624 +LINK_ENTITY_TO_GAME(ww_emitter);
13.625 LINK_ENTITY_TO_GAME(ww_monstermaker);
13.626 +LINK_ENTITY_TO_GAME(ww_satchel);
13.627 +LINK_ENTITY_TO_GAME(ww_satchel_archmage);
13.628 +LINK_ENTITY_TO_GAME(ww_satchel_death);
13.629 +LINK_ENTITY_TO_GAME(ww_satchel_dragon);
13.630 +LINK_ENTITY_TO_GAME(ww_satchel_earth);
13.631 +LINK_ENTITY_TO_GAME(ww_satchel_fire);
13.632 +LINK_ENTITY_TO_GAME(ww_satchel_ice);
13.633 +LINK_ENTITY_TO_GAME(ww_satchel_life);
13.634 +LINK_ENTITY_TO_GAME(ww_satchel_lightning);
13.635 +LINK_ENTITY_TO_GAME(ww_satchel_nature);
13.636 +LINK_ENTITY_TO_GAME(ww_satchel_wind);
13.637 +LINK_ENTITY_TO_GAME(ww_seal);
13.638 +LINK_ENTITY_TO_GAME(ww_seal_death);
13.639 +LINK_ENTITY_TO_GAME(ww_seal_dragon);
13.640 +LINK_ENTITY_TO_GAME(ww_seal_earth);
13.641 +LINK_ENTITY_TO_GAME(ww_seal_fire);
13.642 +LINK_ENTITY_TO_GAME(ww_seal_ice);
13.643 +LINK_ENTITY_TO_GAME(ww_seal_life);
13.644 +LINK_ENTITY_TO_GAME(ww_seal_lightning);
13.645 +LINK_ENTITY_TO_GAME(ww_seal_nature);
13.646 +LINK_ENTITY_TO_GAME(ww_seal_wind);
13.647 +LINK_ENTITY_TO_GAME(ww_sentrycrystal);
13.648 +LINK_ENTITY_TO_GAME(ww_spell_beanstalk);
13.649 +LINK_ENTITY_TO_GAME(ww_spell_bird);
13.650 +LINK_ENTITY_TO_GAME(ww_spell_deathray);
13.651 +LINK_ENTITY_TO_GAME(ww_spell_doublemissile);
13.652 +LINK_ENTITY_TO_GAME(ww_spell_dragonbreath);
13.653 +LINK_ENTITY_TO_GAME(ww_spell_fireball);
13.654 +LINK_ENTITY_TO_GAME(ww_spell_flamelick);
13.655 +LINK_ENTITY_TO_GAME(ww_spell_forceblast);
13.656 +LINK_ENTITY_TO_GAME(ww_spell_freezeray);
13.657 +LINK_ENTITY_TO_GAME(ww_spell_iceshard);
13.658 +LINK_ENTITY_TO_GAME(ww_spell_levitate);
13.659 +LINK_ENTITY_TO_GAME(ww_spell_lightningbolt);
13.660 +LINK_ENTITY_TO_GAME(ww_spell_missile);
13.661 +LINK_ENTITY_TO_GAME(ww_spell_pebbleblast);
13.662 +LINK_ENTITY_TO_GAME(ww_spell_seal);
13.663 +LINK_ENTITY_TO_GAME(ww_spell_shield);
13.664 +LINK_ENTITY_TO_GAME(ww_spell_skull);
13.665 +LINK_ENTITY_TO_GAME(ww_spell_spotbolt);
13.666 +LINK_ENTITY_TO_GAME(ww_spell_stone);
13.667 +LINK_ENTITY_TO_GAME(ww_spell_thornblast);
13.668 +LINK_ENTITY_TO_GAME(ww_spell_updraft);
13.669 +LINK_ENTITY_TO_GAME(ww_spell_whiteray);
13.670 +LINK_ENTITY_TO_GAME(ww_spell_wyvern);
13.671 +LINK_ENTITY_TO_GAME(ww_staff);
13.672 +LINK_ENTITY_TO_GAME(wyvern);
13.673 LINK_ENTITY_TO_GAME(xbow_teather);
13.674 LINK_ENTITY_TO_GAME(xen_hair);
13.675 LINK_ENTITY_TO_GAME(xen_hull);
14.1 --- a/metamod/log_meta.h Sat Aug 21 16:13:14 2004 +0000
14.2 +++ b/metamod/log_meta.h Thu Nov 11 23:21:08 2004 +0000
14.3 @@ -65,10 +65,15 @@
14.4 // for times when it might be called as a single-statement result of an
14.5 // else (or other flow control).
14.6 //
14.7 +// As suggested by Jussi Kivilinna: Use "if(meta_debug.value < level); else
14.8 +// DO(something);" style because "meta_debug.value < level" is in most common
14.9 +// case "false". Check disasm, contitional jumps are predicted not to be
14.10 +// taken by CPU.
14.11 +//
14.12 // Yes, it's all a bit of a hack.
14.13
14.14 #define META_DEBUG(level, args) \
14.15 - do { if(meta_debug.value >= level) ALERT(at_logged, "[META] (debug:%d) %s\n", level, UTIL_VarArgs args ); } while(0)
14.16 + do { if(meta_debug.value < level) break; else ALERT(at_logged, "[META] (debug:%d) %s\n", level, UTIL_VarArgs args ); } while(0)
14.17
14.18 // max buffer size for printed messages
14.19 #define MAX_LOGMSG_LEN 1024
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
15.2 +++ b/metamod/mklinkgame.pl Thu Nov 11 23:21:08 2004 +0000
15.3 @@ -0,0 +1,122 @@
15.4 +#!/usr/bin/perl
15.5 +
15.6 +$build = 0;
15.7 +
15.8 +#if file is 0 byte or DNE, build it
15.9 +if (!(-s "linkgame.cpp"))
15.10 +{
15.11 + $build = 1;
15.12 +} else {
15.13 + #otherwise see if it needs to be updated
15.14 + opendir(DIR, "ents/");
15.15 + @files = readdir(DIR);
15.16 + for ($i=0; $i<=$#files; $i++)
15.17 + {
15.18 + if (newer("ents/$files[$i]", "linkgame.cpp"))
15.19 + {
15.20 + $build = 1;
15.21 + }
15.22 + }
15.23 + closedir(DIR);
15.24 +}
15.25 +
15.26 +die("No build necessary\n") unless $build;
15.27 +
15.28 +print "Building linkgame.cpp...\n";
15.29 +
15.30 +($s,$m,$h,$d,$m,$y,$wd,$doy,$dst) = localtime(time());
15.31 +
15.32 +$lastyear = $y;
15.33 +
15.34 +open(OUT, ">linkgame.cpp");
15.35 +
15.36 +$hdr = <<EOC;
15.37 +// vi: set ts=4 sw=4 :
15.38 +// vim: set tw=75 :
15.39 +
15.40 +// linkgame.cpp - export entities from mod "games" back to the HL engine
15.41 +
15.42 +/*
15.43 + * Copyright (c) 2001-$lastyear Will Day <[email protected]>
15.44 + *
15.45 + * This file is part of Metamod.
15.46 + *
15.47 + * Metamod is free software; you can redistribute it and/or modify it
15.48 + * under the terms of the GNU General Public License as published by the
15.49 + * Free Software Foundation; either version 2 of the License, or (at
15.50 + * your option) any later version.
15.51 + *
15.52 + * Metamod is distributed in the hope that it will be useful, but
15.53 + * WITHOUT ANY WARRANTY; without even the implied warranty of
15.54 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15.55 + * General Public License for more details.
15.56 + *
15.57 + * You should have received a copy of the GNU General Public License
15.58 + * along with Metamod; if not, write to the Free Software Foundation,
15.59 + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15.60 + *
15.61 + * In addition, as a special exception, the author gives permission to
15.62 + * link the code of this program with the Half-Life Game Engine ("HL
15.63 + * Engine") and Modified Game Libraries ("MODs") developed by Valve,
15.64 + * L.L.C ("Valve"). You must obey the GNU General Public License in all
15.65 + * respects for all of the code used other than the HL Engine and MODs
15.66 + * from Valve. If you modify this file, you may extend this exception
15.67 + * to your version of the file, but you are not obligated to do so. If
15.68 + * you do not wish to do so, delete this exception statement from your
15.69 + * version.
15.70 + *
15.71 + */
15.72 +
15.73 +#include <extdll.h> // always
15.74 +
15.75 +#include "linkent.h" // LINK_ENTITY_TO_GAME
15.76 +
15.77 +// Entity list for gamedlls adapted from adminmod linkfunc.cpp.
15.78 +
15.79 +// NOTE: This list of entities is automatically generated via the script
15.80 +// "mklinkgame.sh". See the files in the directory "ents" for the actual
15.81 +// list of entities.
15.82 +EOC
15.83 +
15.84 +print OUT $hdr;
15.85 +
15.86 +my @list;
15.87 +
15.88 +opendir(DIR, "ents/");
15.89 +@files = readdir(DIR);
15.90 +closedir(DIR);
15.91 +
15.92 +for ($i=0; $i<=$#files; $i++)
15.93 +{
15.94 + open(FILE, "ents/".$files[$i]);
15.95 + while(<FILE>)
15.96 + {
15.97 + chomp;
15.98 + if (!($_ =~/^\s+$/) and !/^\/\//)
15.99 + {
15.100 + push(@list,$_);
15.101 + }
15.102 + }
15.103 + close(FILE);
15.104 +}
15.105 +
15.106 +@list = sort(@list);
15.107 +$prev = "\\";
15.108 +@out = grep($_ ne $prev && ($prev = $_), @list);
15.109 +
15.110 +for($i=0;$i<=$#out;$i++)
15.111 +{
15.112 + print OUT "LINK_ENTITY_TO_GAME($out[$i]);\n";
15.113 +}
15.114 +
15.115 +close(OUT);
15.116 +
15.117 +sub newer
15.118 +{
15.119 + my($file1,$file2)=(@_);
15.120 + if ((stat($file1))[9] > (stat($file2))[9])
15.121 + {
15.122 + return 1;
15.123 + }
15.124 + return 0;
15.125 +}
16.1 --- a/metamod/mplugin.cpp Sat Aug 21 16:13:14 2004 +0000
16.2 +++ b/metamod/mplugin.cpp Thu Nov 11 23:21:08 2004 +0000
16.3 @@ -396,14 +396,34 @@
16.4 return(NULL);
16.5 }
16.6
16.7 +
16.8 +// Check if a passed string starts with a known platform postfix.
16.9 +// It does not check beyond the period in order to work for both
16.10 +// Linux and Win32.
16.11 +static mBOOL is_platform_postfix(char* pf)
16.12 +{
16.13 + if ( NULL == pf ) return mFALSE;
16.14 +
16.15 + if ( 0 == strncmp(pf, "_i386.", 6) ) return mTRUE;
16.16 + if ( 0 == strncmp(pf, "_i486.", 6) ) return mTRUE;
16.17 + if ( 0 == strncmp(pf, "_i586.", 6) ) return mTRUE;
16.18 + if ( 0 == strncmp(pf, "_i686.", 6) ) return mTRUE;
16.19 + if ( 0 == strncmp(pf, "_amd64.", 7) ) return mTRUE;
16.20 +
16.21 + return mFALSE;
16.22 +}
16.23 +
16.24 +
16.25 // Check if a given plugin is the same but possibly for a
16.26 // different platform. A match is considered to be found if
16.27 // 1. the filename without the path is the same, or
16.28 // 2a. for an attached plugin the logtag is the same, or
16.29 // 2b. the description is the same, or
16.30 // 3. a significant part of the filename is the same.
16.31 -// A significant part of a plugin name is currently defined to
16.32 -// the the part up to the last underscore, if one exists.
16.33 +// A significant part of a plugin name is currently defined to:
16.34 +// the part up to a known platform postfix as determined by
16.35 +// the is_platform_postfix() function (see above), or
16.36 +// the part up to the last dot, if one exists.
16.37 // meta_errno values:
16.38 // - none
16.39 mBOOL MPlugin::platform_match(MPlugin* other) {
16.40 @@ -419,9 +439,9 @@
16.41 if(*desc != '\0' && strcasecmp(desc,other->desc) == 0) return mTRUE;
16.42
16.43 end=strrchr(file, '_');
16.44 - if(end == NULL) end=strrchr(file, '.');
16.45 + if(end == NULL || !is_platform_postfix(end)) end=strrchr(file, '.');
16.46 other_end=strrchr(other->file, '_');
16.47 - if(other_end == NULL) other_end=strrchr(other->file, '.');
16.48 + if(other_end == NULL || !is_platform_postfix(other_end)) other_end=strrchr(other->file, '.');
16.49
16.50 if(end == NULL || other_end == NULL) return mFALSE;
16.51
16.52 @@ -944,9 +964,32 @@
16.53
16.54 // Reload a plugin; unload and load again.
16.55 // meta_errno values:
16.56 +// - ME_NOTALLOWED plugin not loadable after startup
16.57 +// - errno's from check_input()
16.58 // - errno's from unload()
16.59 // - errno's from load()
16.60 mBOOL MPlugin::reload(PLUG_LOADTIME now, PL_UNLOAD_REASON reason) {
16.61 + if(!check_input()) {
16.62 + // details logged, meta_errno set in check_input()
16.63 + RETURN_ERRNO(mFALSE, ME_ARGUMENT);
16.64 + }
16.65 + // Are we allowed to load this plugin at this time?
16.66 + // If we cannot load the plugin after unloading it, we keep it.
16.67 + if(info->loadable < now) {
16.68 + if(info->loadable > PT_STARTUP) {
16.69 + META_DEBUG(2, ("dll: Delaying reload plugin '%s'; would not be able to reattach now: allowed=%s; now=%s", desc, str_loadable(), str_loadtime(now, SL_SIMPLE)));
16.70 + // caller should give message to user
16.71 + // try to reload again at next opportunity
16.72 + RETURN_ERRNO(mFALSE, ME_DELAYED);
16.73 + }
16.74 + else {
16.75 + META_DEBUG(2, ("dll: Failed reload plugin '%s'; would not be able to reattach now: allowed=%s; now=%s", desc, str_loadable(), str_loadtime(now, SL_SIMPLE)));
16.76 + // don't try to reload again later
16.77 + action=PA_NONE;
16.78 + RETURN_ERRNO(mFALSE, ME_NOTALLOWED);
16.79 + }
16.80 + }
16.81 +
16.82 if(!unload(now, reason)) {
16.83 META_ERROR("dll: Failed to unload plugin '%s' for reloading", desc);
16.84 // meta_errno should be set already in unload()
16.85 @@ -1043,6 +1086,12 @@
16.86
16.87 if(gamedll_funcs.dllapi_table) free(gamedll_funcs.dllapi_table);
16.88 if(gamedll_funcs.newapi_table) free(gamedll_funcs.newapi_table);
16.89 + if(dllapi_table) free(dllapi_table);
16.90 + if(dllapi_post_table) free(dllapi_post_table);
16.91 + if(newapi_table) free(newapi_table);
16.92 + if(newapi_post_table) free(newapi_post_table);
16.93 + if(engine_table) free(engine_table);
16.94 + if(engine_post_table) free(engine_post_table);
16.95
16.96 status=PL_EMPTY;
16.97 action=PA_NULL;
16.98 @@ -1055,6 +1104,8 @@
16.99 newapi_post_table=NULL;
16.100 engine_table=NULL;
16.101 engine_post_table=NULL;
16.102 + gamedll_funcs.dllapi_table = NULL;
16.103 + gamedll_funcs.newapi_table = NULL;
16.104 return(mTRUE);
16.105 }
16.106
17.1 --- a/metamod/vers_meta.h Sat Aug 21 16:13:14 2004 +0000
17.2 +++ b/metamod/vers_meta.h Thu Nov 11 23:21:08 2004 +0000
17.3 @@ -48,8 +48,8 @@
17.4 # endif /* _MSC_VER */
17.5 #endif /* not OPT_TYPE */
17.6
17.7 -#define VDATE "2004/08/20"
17.8 -#define VVERSION "1.17.2"
17.9 -#define RC_VERS_DWORD 1,17,2,0 // Version Windows DLL Resources in res_meta.rc
17.10 +#define VDATE "2004/11/12"
17.11 +#define VVERSION "1.17.3"
17.12 +#define RC_VERS_DWORD 1,17,3,0 // Version Windows DLL Resources in res_meta.rc
17.13
17.14 #endif /* VERS_META_H */