1.1 --- a/doc/Changelog Thu Nov 11 23:21:08 2004 +0000
1.2 +++ b/doc/Changelog Fri Feb 18 20:52:34 2005 +0000
1.3 @@ -1,5 +1,16 @@
1.4 # vim: set tw=75 ft=none :
1.5
1.6 +2005/02/20 1.17.4
1.7 + - Added Mod recognition and entities for Brain Bread 1.2
1.8 + - Changed Mod recognition and added entities for Snow-War 2.0
1.9 + - Added additional entity for Science & Industry 1.0.
1.10 + - Mod recognition and entities for Gangsta Wars 2.7. This update removes
1.11 + support for Gangsta Wars 2.6 since 2.7 is incompatible with 2.6.
1.12 + - Added entities for Rival Species 1.2.
1.13 + - Fixed a potential memory leak on plugins loading.
1.14 + - Fixed a memory initialization issue.
1.15 + - Fixed an indexing bug that could cause errors in meta list.
1.16 +
1.17 2004/11/10 1.17.3
1.18 - Added Mod recognition and entities for Zombie Panic Beta 0.91c.
1.19 - Added Mod recognition and entities for Out Break 1.0.
2.1 --- a/doc/html/supportedmods.html Thu Nov 11 23:21:08 2004 +0000
2.2 +++ b/doc/html/supportedmods.html Fri Feb 18 20:52:34 2005 +0000
2.3 @@ -80,6 +80,13 @@
2.4 <td></td>
2.5 </tr>
2.6 <tr>
2.7 + <td><a href="http://www.ironoak.de/BB/">Brain Bread</a></td>
2.8 + <td>v1.2</td>
2.9 + <td>2005/02/04</td>
2.10 + <td><a href="http://metamod.org/dl/metamod/ents/brainbread">[ents]</a></td> <!-- entlist -->
2.11 + <td></td>
2.12 +</tr>
2.13 +<tr>
2.14 <td><a href="http://www.planethalflife.com/bumpercars/">Bumper Cars</a></td>
2.15 <td>Alpha</td>
2.16 <td>2003/05/02</td>
2.17 @@ -199,9 +206,9 @@
2.18 <td></td>
2.19 </tr>
2.20 <tr>
2.21 - <td>GangstaWars</td>
2.22 - <td>v2.6</td>
2.23 - <td>2001/../..</td>
2.24 + <td>Gangsta Wars</td>
2.25 + <td>v2.7</td>
2.26 + <td>2005/02/14</td>
2.27 <td><a href="http://metamod.org/dl/metamod/ents/gangsta">[ents]</a></td> <!-- entlist -->
2.28 <td></td>
2.29 </tr>
2.30 @@ -424,8 +431,8 @@
2.31 </tr>
2.32 <tr>
2.33 <td><a href="http://www.rivalspecies.com/">Rival Species</a></td>
2.34 - <td>v1.0</td>
2.35 - <td>2003/05/02</td>
2.36 + <td>v1.2</td>
2.37 + <td>2005/02/17</td>
2.38 <td><a href="http://metamod.org/dl/metamod/ents/rivalspecies">[ents]</a></td> <!-- entlist -->
2.39 <td></td>
2.40 </tr>
2.41 @@ -451,9 +458,9 @@
2.42 <td></td>
2.43 </tr>
2.44 <tr>
2.45 - <td><a href="http://www.planethalflife.com/snowwar/">Snow-War</a></td>
2.46 - <td>v1.0</td>
2.47 - <td>2001/12/29</td>
2.48 + <td><a href="http://snowwar.hlgaming.com">Snow-War</a></td>
2.49 + <td>2.0</td>
2.50 + <td>2005/02/04</td>
2.51 <td><a href="http://metamod.org/dl/metamod/ents/snowwar">[ents]</a></td> <!-- entlist -->
2.52 <td></td>
2.53 </tr>
3.1 --- a/doc/txt/supportedmods.txt Thu Nov 11 23:21:08 2004 +0000
3.2 +++ b/doc/txt/supportedmods.txt Fri Feb 18 20:52:34 2005 +0000
3.3 @@ -39,6 +39,9 @@
3.4 | Bot | - | 2001 | |
3.5 | | | /../.. | |
3.6 |------------------------------+----------+--------+---------------------|
3.7 +| Brain Bread | v1.2 | 2005/ | |
3.8 +| (www.ironoak.de/BB) | | 02/04 | |
3.9 +|------------------------------+----------+--------+---------------------|
3.10 | Bumper Cars | | 2003/ | |
3.11 | (www.planethalflife.com/ | Alpha | 05/02 | |
3.12 | bumpercars) | | | |
3.13 @@ -92,8 +95,8 @@
3.14 | Frontline Force | v1.3 | 2001/ | |
3.15 | (www.frontlineforce.com) | | 06/10 | |
3.16 |------------------------------+----------+--------+---------------------|
3.17 -| GangstaWars | v2.6 | 2001 | |
3.18 -| | | /../.. | |
3.19 +| Gangsta Wars | v2.7 | 2005/ | |
3.20 +| | | 02/14 | |
3.21 |------------------------------+----------+--------+---------------------|
3.22 | Gangwars | Beta 1.0 | 2002/ | |
3.23 | (www.gangwars.net) | | 04/21 | |
3.24 @@ -197,8 +200,8 @@
3.25 | (www.planethalflife.com/ | v1.9 | 11/26 | |
3.26 | rocketcrowbar) | | | |
3.27 |------------------------------+----------+--------+---------------------|
3.28 -| Rival Species | v1.0 | 2003/ | |
3.29 -| (www.rivalspecies.com) | | 05/02 | |
3.30 +| Rival Species | v1.2 | 2005/ | |
3.31 +| (www.rivalspecies.com) | | 02/17 | |
3.32 |------------------------------+----------+--------+---------------------|
3.33 | Scientist Hunt | | 2001/ | |
3.34 | (www.telefragged.com/ | v1.2 | 09/19 | |
3.35 @@ -210,9 +213,8 @@
3.36 | Science & Industry | v1.0 | 2004/ | |
3.37 | (www.planethalflife.com/si) | | 07/24 | |
3.38 |------------------------------+----------+--------+---------------------|
3.39 -| Snow-War | | 2001/ | |
3.40 -| (www.planethalflife.com/ | v1.0 | 12/29 | |
3.41 -| snowwar) | | | |
3.42 +| Snow-War | 2.0 | 2005/ | |
3.43 +| (snowwar.hlgaming.com) | | 02/04 | |
3.44 |------------------------------+----------+--------+---------------------|
3.45 | StargateTC | Beta 1.1 | 2004/ | |
3.46 | (www.stargatetc.com) | | 07/01 | |
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/metamod/ents/brainbread Fri Feb 18 20:52:34 2005 +0000
4.3 @@ -0,0 +1,56 @@
4.4 +// vim: set ft=cpp :
4.5 +
4.6 +// Brain Bread
4.7 +// http://www.ironoak.de/BB/
4.8 +//
4.9 +// Game directory: brainbread
4.10 +// Win32 DLL name: bb.dll
4.11 +// Linux DSO name: bb_i386.so
4.12 +
4.13 +// Version 1.2
4.14 +//
4.15 +// From: a203xi <[email protected]>
4.16 +// Date: Wed, 26 Jan 2005 19:01:56 -0800
4.17 +//
4.18 +bb_ammo
4.19 +bb_custommission
4.20 +bb_equipment
4.21 +bb_escape_final
4.22 +bb_escape_radar
4.23 +bb_escapeair
4.24 +bb_funk
4.25 +bb_healthkit
4.26 +bb_mapmission
4.27 +bb_mission_zone
4.28 +bb_objectives
4.29 +bb_spawn_player
4.30 +bb_spawn_zombie
4.31 +bb_tank
4.32 +bb_waypoint
4.33 +bb_zombie_player
4.34 +mapobject_jaguar
4.35 +mapobject_npc_crow
4.36 +pe_light
4.37 +pe_light_ref
4.38 +pe_objectclip
4.39 +pe_radar_mark
4.40 +weapon_44sw
4.41 +weapon_ak47
4.42 +weapon_benelli
4.43 +weapon_beretta
4.44 +weapon_beretta_a
4.45 +weapon_deagle
4.46 +weapon_flame
4.47 +weapon_glock_auto_a
4.48 +weapon_hand
4.49 +weapon_knife
4.50 +weapon_m16
4.51 +weapon_microuzi
4.52 +weapon_microuzi_a
4.53 +weapon_minigun
4.54 +weapon_p225
4.55 +weapon_sawed
4.56 +weapon_stoner
4.57 +weapon_tavor
4.58 +weapon_usp
4.59 +weapon_winchester
5.1 --- a/metamod/ents/gangsta Thu Nov 11 23:21:08 2004 +0000
5.2 +++ b/metamod/ents/gangsta Fri Feb 18 20:52:34 2005 +0000
5.3 @@ -1,6 +1,14 @@
5.4 // vim: set ft=cpp :
5.5
5.6 -// Gansta Wars 2.6
5.7 +// Gangsta Wars
5.8 +// http://www.zone.ee/gangstawars/
5.9 +//
5.10 +// Game directory: gangstawars
5.11 +// Win32 DLL name: hl.dll
5.12 +// Linux DSO name: gangsta_i386.so
5.13 +
5.14 +// Version 2.6
5.15 +//
5.16 bot_waypoint
5.17 weapon_glock17
5.18 weapon_smkgrenade
5.19 @@ -47,7 +55,60 @@
5.20 turf_zone
5.21 weapon_uzi
5.22 ammo_uzi
5.23 -// (end gansta wars 2.6)
5.24
5.25 -// Gangstawars
5.26 -// http://gangstawars.thebackburner.com/
5.27 +// Version 2.7
5.28 +//
5.29 +// Win32 DLL name: gwars27.dll
5.30 +// Linux DSO name:
5.31 +//
5.32 +// From: "Ets nolastname" <[email protected]>
5.33 +// Date: Mon, 17 Jan 2005 19:37:26 +0200
5.34 +//
5.35 +ammo_ak47
5.36 +ammo_beretta
5.37 +ammo_psg1
5.38 +ammo_steyr_m40
5.39 +arms_dealer
5.40 +bot
5.41 +dealer
5.42 +load_wpt
5.43 +remove_all_wpts
5.44 +remove_wpt
5.45 +save_wpt
5.46 +sell_ak101
5.47 +sell_ak47
5.48 +sell_baretta
5.49 +sell_beretta
5.50 +sell_dblshot
5.51 +sell_dbshot
5.52 +sell_glock17
5.53 +sell_longslide
5.54 +sell_mac
5.55 +sell_mac10
5.56 +sell_molotov_cocktail
5.57 +sell_mossberg
5.58 +sell_psg1
5.59 +sell_steyr_m40
5.60 +sell_tec9
5.61 +sell_tommy
5.62 +sell_tommygun
5.63 +sell_uzi
5.64 +show_wpt
5.65 +tag_camp
5.66 +tag_crouch_jump
5.67 +tag_door
5.68 +tag_duck
5.69 +tag_jump
5.70 +tag_run
5.71 +tag_snipe
5.72 +tag_walk
5.73 +weapon_ak47
5.74 +weapon_beretta
5.75 +weapon_flashbang
5.76 +weapon_knife
5.77 +weapon_mac10
5.78 +weapon_molotov_cocktail
5.79 +weapon_psg1
5.80 +weapon_smokegrenade
5.81 +weapon_steyr_m40
5.82 +weapon_tommy
6.1 --- a/metamod/ents/rivalspecies Thu Nov 11 23:21:08 2004 +0000
6.2 +++ b/metamod/ents/rivalspecies Fri Feb 18 20:52:34 2005 +0000
6.3 @@ -83,3 +83,28 @@
6.4 weapon_st_throw
6.5 world_artefact
6.6 world_capturelocation
6.7 +
6.8 +// Version 1.2
6.9 +//
6.10 +// From: "Stuart Thayn" <[email protected]>
6.11 +// Date: Mon, 7 Feb 2005 15:20:53 -0700
6.12 +//
6.13 +ammo_rs_grenade
6.14 +followbot
6.15 +hlight
6.16 +info_player_team_at
6.17 +info_player_team_bt
6.18 +info_player_team_gf
6.19 +info_player_team_iw
6.20 +info_player_team_st
6.21 +info_player_team_we
6.22 +model_entity
6.23 +rs_fog
6.24 +rs_if
6.25 +rs_message
6.26 +rs_particle_emitter
6.27 +rs_timer
6.28 +rs_val
6.29 +vehicle
6.30 +weapon_rs_meta
6.31 +world_areacontrol
7.1 --- a/metamod/ents/science-industry Thu Nov 11 23:21:08 2004 +0000
7.2 +++ b/metamod/ents/science-industry Fri Feb 18 20:52:34 2005 +0000
7.3 @@ -66,3 +66,8 @@
7.4 trigger_deliveryzone
7.5 weapon_empcannon
7.6 weapon_resource
7.7 +
7.8 +// From: "Caleb 'Ghoul' Delnay" <[email protected]>
7.9 +// Date: Wed, 8 Dec 2004 19:46:01 -0500 (EST)
7.10 +//
7.11 +timed_grenade
8.1 --- a/metamod/ents/snowwar Thu Nov 11 23:21:08 2004 +0000
8.2 +++ b/metamod/ents/snowwar Fri Feb 18 20:52:34 2005 +0000
8.3 @@ -1,13 +1,17 @@
8.4 // vim: set ft=cpp :
8.5
8.6 // Snow-War
8.7 -// http://www.planethalflife.com/snowwar/
8.8 +// http://snowwar.hlgaming.com
8.9 +//
8.10 +// Game directory: snow
8.11 +// Win32 DLL name: snow.dll
8.12 +// Linux DSO name: snow_i386.so
8.13
8.14 // Version 1.0
8.15 //
8.16 // From: <[email protected]>
8.17 // Date: Sat, 29 Dec 2001 12:04:43 -0500
8.18 -
8.19 +//
8.20 ctf_flag
8.21 ctf_flagzone
8.22 grapple_hook
8.23 @@ -22,3 +26,15 @@
8.24 snowball
8.25 trip_beam
8.26 weapon_snowball
8.27 +
8.28 +// Version 2.0
8.29 +//
8.30 +// From: Teemu Polvi <[email protected]>
8.31 +// Date: Sun, 19 Dec 2004 16:58:35 +0200
8.32 +//
8.33 +env_fog
8.34 +env_snow
8.35 +kotm_crown
8.36 +kotm_hill
8.37 +power_bag
8.38 +power_pogo
9.1 --- a/metamod/games.h Thu Nov 11 23:21:08 2004 +0000
9.2 +++ b/metamod/games.h Fri Feb 18 20:52:34 2005 +0000
9.3 @@ -4,7 +4,7 @@
9.4 // games.h - list of supported game mods and their data
9.5
9.6 /*
9.7 - * Copyright (c) 2001-2004 Will Day <[email protected]>
9.8 + * Copyright (c) 2001-2005 Will Day <[email protected]>
9.9 *
9.10 * This file is part of Metamod.
9.11 *
9.12 @@ -51,6 +51,7 @@
9.13 {"asheep", "hl"MODARCH".so", "hl.dll", "Azure Sheep"},
9.14 {"bg", "bg"MODARCH".so", "bg.dll", "The Battle Grounds"},
9.15 {"bot", "bot"MODARCH".so", "bot.dll", "Bot"},
9.16 + {"brainbread", "bb"MODARCH".so", "bb.dll", "Brain Bread"},
9.17 {"bumpercars", "hl"MODARCH".so", "hl.dll", "Bumper Cars"},
9.18 {"buzzybots", "bb"MODARCH".so", "bb.dll", "BuzzyBots"},
9.19 {"cs13", "cs"MODARCH".so", "mp.dll", "Counter-Strike 1.3"},
9.20 @@ -68,7 +69,7 @@
9.21 {"firearms25", "fa"MODARCH".so", "firearms.dll", "Retro Firearms"},
9.22 {"freeze", "mp"MODARCH".so", "mp.dll", "Freeze"},
9.23 {"frontline", "front"MODARCH".so", "frontline.dll", "Frontline Force"},
9.24 - {"gangstawars", "gansta"MODARCH".so", "hl.dll", "GangstaWars"},
9.25 + {"gangstawars", "gangsta"MODARCH".so", "gwars27.dll", "Gangsta Wars"},
9.26 {"gangwars", "mp"MODARCH".so", "mp.dll", "Gangwars"},
9.27 {"gearbox", "opfor"MODARCH".so", "opfor.dll", "Opposing Force"},
9.28 {"globalwarfare", "gw"MODARCH".so", "mp.dll", "Global Warfare"},
9.29 @@ -104,7 +105,7 @@
9.30 {"scihunt", "shunt.so", "shunt.dll", "Scientist Hunt"},
9.31 {"Ship", "ship"MODARCH".so", "ship.dll", "The Ship"},
9.32 {"si", "si"MODARCH".so", "si.dll", "Science & Industry"},
9.33 - {"snow", "hl"MODARCH".so", "snow.dll", "Snow-War"},
9.34 + {"snow", "snow"MODARCH".so", "snow.dll", "Snow-War"},
9.35 {"stargatetc", "hl"MODARCH".so", "hl.dll", "StargateTC"},
9.36 {"svencoop", "hl"MODARCH".so", "hl.dll", "Sven Coop"},
9.37 {"swarm", "swarm"MODARCH".so", "swarm.dll", "Swarm"},
10.1 --- a/metamod/linkgame.cpp Thu Nov 11 23:21:08 2004 +0000
10.2 +++ b/metamod/linkgame.cpp Fri Feb 18 20:52:34 2005 +0000
10.3 @@ -4,7 +4,7 @@
10.4 // linkgame.cpp - export entities from mod "games" back to the HL engine
10.5
10.6 /*
10.7 - * Copyright (c) 2001-2004 Will Day <[email protected]>
10.8 + * Copyright (c) 2001-2005 Will Day <[email protected]>
10.9 *
10.10 * This file is part of Metamod.
10.11 *
10.12 @@ -309,6 +309,7 @@
10.13 LINK_ENTITY_TO_GAME(ammo_rockets);
10.14 LINK_ENTITY_TO_GAME(ammo_rpgclip);
10.15 LINK_ENTITY_TO_GAME(ammo_rs202m2);
10.16 +LINK_ENTITY_TO_GAME(ammo_rs_grenade);
10.17 LINK_ENTITY_TO_GAME(ammo_rs_psi);
10.18 LINK_ENTITY_TO_GAME(ammo_ruger);
10.19 LINK_ENTITY_TO_GAME(ammo_sa80clip);
10.20 @@ -344,6 +345,7 @@
10.21 LINK_ENTITY_TO_GAME(ammo_st_special2);
10.22 LINK_ENTITY_TO_GAME(ammo_sten);
10.23 LINK_ENTITY_TO_GAME(ammo_sterling);
10.24 +LINK_ENTITY_TO_GAME(ammo_steyr_m40);
10.25 LINK_ENTITY_TO_GAME(ammo_stg24);
10.26 LINK_ENTITY_TO_GAME(ammo_stoner);
10.27 LINK_ENTITY_TO_GAME(ammo_stonerscope);
10.28 @@ -381,6 +383,7 @@
10.29 LINK_ENTITY_TO_GAME(antifriction_grenade);
10.30 LINK_ENTITY_TO_GAME(arcade_points);
10.31 LINK_ENTITY_TO_GAME(armoury_entity);
10.32 +LINK_ENTITY_TO_GAME(arms_dealer);
10.33 LINK_ENTITY_TO_GAME(arrow);
10.34 LINK_ENTITY_TO_GAME(asl_charge_flare);
10.35 LINK_ENTITY_TO_GAME(aura);
10.36 @@ -394,6 +397,22 @@
10.37 LINK_ENTITY_TO_GAME(barneymine);
10.38 LINK_ENTITY_TO_GAME(base_drive_ent);
10.39 LINK_ENTITY_TO_GAME(basecurse);
10.40 +LINK_ENTITY_TO_GAME(bb_ammo);
10.41 +LINK_ENTITY_TO_GAME(bb_custommission);
10.42 +LINK_ENTITY_TO_GAME(bb_equipment);
10.43 +LINK_ENTITY_TO_GAME(bb_escape_final);
10.44 +LINK_ENTITY_TO_GAME(bb_escape_radar);
10.45 +LINK_ENTITY_TO_GAME(bb_escapeair);
10.46 +LINK_ENTITY_TO_GAME(bb_funk);
10.47 +LINK_ENTITY_TO_GAME(bb_healthkit);
10.48 +LINK_ENTITY_TO_GAME(bb_mapmission);
10.49 +LINK_ENTITY_TO_GAME(bb_mission_zone);
10.50 +LINK_ENTITY_TO_GAME(bb_objectives);
10.51 +LINK_ENTITY_TO_GAME(bb_spawn_player);
10.52 +LINK_ENTITY_TO_GAME(bb_spawn_zombie);
10.53 +LINK_ENTITY_TO_GAME(bb_tank);
10.54 +LINK_ENTITY_TO_GAME(bb_waypoint);
10.55 +LINK_ENTITY_TO_GAME(bb_zombie_player);
10.56 LINK_ENTITY_TO_GAME(beam);
10.57 LINK_ENTITY_TO_GAME(beam_attack);
10.58 LINK_ENTITY_TO_GAME(beamshot);
10.59 @@ -519,6 +538,7 @@
10.60 LINK_ENTITY_TO_GAME(deal_columbian_start);
10.61 LINK_ENTITY_TO_GAME(deal_italian_start);
10.62 LINK_ENTITY_TO_GAME(deal_swat_start);
10.63 +LINK_ENTITY_TO_GAME(dealer);
10.64 LINK_ENTITY_TO_GAME(death_ball);
10.65 LINK_ENTITY_TO_GAME(deathball);
10.66 LINK_ENTITY_TO_GAME(deathsoul);
10.67 @@ -734,6 +754,7 @@
10.68 LINK_ENTITY_TO_GAME(flying_crowbar);
10.69 LINK_ENTITY_TO_GAME(fog);
10.70 LINK_ENTITY_TO_GAME(follow_ent);
10.71 +LINK_ENTITY_TO_GAME(followbot);
10.72 LINK_ENTITY_TO_GAME(follower_basic);
10.73 LINK_ENTITY_TO_GAME(football);
10.74 LINK_ENTITY_TO_GAME(frag_grenade);
10.75 @@ -952,6 +973,7 @@
10.76 LINK_ENTITY_TO_GAME(hi_spawn_nato);
10.77 LINK_ENTITY_TO_GAME(hi_spawn_observer);
10.78 LINK_ENTITY_TO_GAME(hi_spawn_tango);
10.79 +LINK_ENTITY_TO_GAME(hlight);
10.80 LINK_ENTITY_TO_GAME(hltr_assaut_boutton);
10.81 LINK_ENTITY_TO_GAME(hltr_hostage);
10.82 LINK_ENTITY_TO_GAME(hltr_object);
10.83 @@ -1149,10 +1171,16 @@
10.84 LINK_ENTITY_TO_GAME(info_player_start_reverse);
10.85 LINK_ENTITY_TO_GAME(info_player_team1);
10.86 LINK_ENTITY_TO_GAME(info_player_team2);
10.87 +LINK_ENTITY_TO_GAME(info_player_team_at);
10.88 +LINK_ENTITY_TO_GAME(info_player_team_bt);
10.89 LINK_ENTITY_TO_GAME(info_player_team_ce);
10.90 LINK_ENTITY_TO_GAME(info_player_team_cm);
10.91 +LINK_ENTITY_TO_GAME(info_player_team_gf);
10.92 +LINK_ENTITY_TO_GAME(info_player_team_iw);
10.93 LINK_ENTITY_TO_GAME(info_player_team_s);
10.94 LINK_ENTITY_TO_GAME(info_player_team_sm);
10.95 +LINK_ENTITY_TO_GAME(info_player_team_st);
10.96 +LINK_ENTITY_TO_GAME(info_player_team_we);
10.97 LINK_ENTITY_TO_GAME(info_player_teamspawn);
10.98 LINK_ENTITY_TO_GAME(info_player_torri);
10.99 LINK_ENTITY_TO_GAME(info_player_unas);
10.100 @@ -1437,6 +1465,8 @@
10.101 LINK_ENTITY_TO_GAME(knife);
10.102 LINK_ENTITY_TO_GAME(knife_bolt);
10.103 LINK_ENTITY_TO_GAME(knife_throw);
10.104 +LINK_ENTITY_TO_GAME(kotm_crown);
10.105 +LINK_ENTITY_TO_GAME(kotm_hill);
10.106 LINK_ENTITY_TO_GAME(kwSpikeProjectile);
10.107 LINK_ENTITY_TO_GAME(lance_proj);
10.108 LINK_ENTITY_TO_GAME(laser_aimer);
10.109 @@ -1455,6 +1485,7 @@
10.110 LINK_ENTITY_TO_GAME(light_glow);
10.111 LINK_ENTITY_TO_GAME(light_spot);
10.112 LINK_ENTITY_TO_GAME(lightfader);
10.113 +LINK_ENTITY_TO_GAME(load_wpt);
10.114 LINK_ENTITY_TO_GAME(locus_alias);
10.115 LINK_ENTITY_TO_GAME(locus_beam);
10.116 LINK_ENTITY_TO_GAME(locus_variable);
10.117 @@ -1466,6 +1497,7 @@
10.118 LINK_ENTITY_TO_GAME(mapobject_asiancar);
10.119 LINK_ENTITY_TO_GAME(mapobject_bluecar);
10.120 LINK_ENTITY_TO_GAME(mapobject_copcar);
10.121 +LINK_ENTITY_TO_GAME(mapobject_jaguar);
10.122 LINK_ENTITY_TO_GAME(mapobject_npc_bum);
10.123 LINK_ENTITY_TO_GAME(mapobject_npc_bum1);
10.124 LINK_ENTITY_TO_GAME(mapobject_npc_bum2);
10.125 @@ -1500,6 +1532,7 @@
10.126 LINK_ENTITY_TO_GAME(mini_rocket);
10.127 LINK_ENTITY_TO_GAME(mission_modifier);
10.128 LINK_ENTITY_TO_GAME(misterx);
10.129 +LINK_ENTITY_TO_GAME(model_entity);
10.130 LINK_ENTITY_TO_GAME(molotov);
10.131 LINK_ENTITY_TO_GAME(momentary_door);
10.132 LINK_ENTITY_TO_GAME(momentary_jail_door);
10.133 @@ -1996,9 +2029,11 @@
10.134 LINK_ENTITY_TO_GAME(point_win);
10.135 LINK_ENTITY_TO_GAME(poison_injected);
10.136 LINK_ENTITY_TO_GAME(potatoc);
10.137 +LINK_ENTITY_TO_GAME(power_bag);
10.138 LINK_ENTITY_TO_GAME(power_ballbag);
10.139 LINK_ENTITY_TO_GAME(power_coco);
10.140 LINK_ENTITY_TO_GAME(power_gloves);
10.141 +LINK_ENTITY_TO_GAME(power_pogo);
10.142 LINK_ENTITY_TO_GAME(power_shield);
10.143 LINK_ENTITY_TO_GAME(power_shoes);
10.144 LINK_ENTITY_TO_GAME(powerstruggle);
10.145 @@ -2074,6 +2109,8 @@
10.146 LINK_ENTITY_TO_GAME(random_weapon);
10.147 LINK_ENTITY_TO_GAME(redflag_follow);
10.148 LINK_ENTITY_TO_GAME(reetou_proj);
10.149 +LINK_ENTITY_TO_GAME(remove_all_wpts);
10.150 +LINK_ENTITY_TO_GAME(remove_wpt);
10.151 LINK_ENTITY_TO_GAME(resourcetower);
10.152 LINK_ENTITY_TO_GAME(respawn_chest);
10.153 LINK_ENTITY_TO_GAME(return_axe);
10.154 @@ -2094,13 +2131,20 @@
10.155 LINK_ENTITY_TO_GAME(rpg_rocket);
10.156 LINK_ENTITY_TO_GAME(rr_shell);
10.157 LINK_ENTITY_TO_GAME(rs_effect);
10.158 +LINK_ENTITY_TO_GAME(rs_fog);
10.159 LINK_ENTITY_TO_GAME(rs_grenade);
10.160 +LINK_ENTITY_TO_GAME(rs_if);
10.161 +LINK_ENTITY_TO_GAME(rs_message);
10.162 +LINK_ENTITY_TO_GAME(rs_particle_emitter);
10.163 LINK_ENTITY_TO_GAME(rs_roundend);
10.164 LINK_ENTITY_TO_GAME(rs_teamslot);
10.165 +LINK_ENTITY_TO_GAME(rs_timer);
10.166 +LINK_ENTITY_TO_GAME(rs_val);
10.167 LINK_ENTITY_TO_GAME(rs_victorypoints);
10.168 LINK_ENTITY_TO_GAME(sams_shower);
10.169 LINK_ENTITY_TO_GAME(sanity);
10.170 LINK_ENTITY_TO_GAME(satelite_laser);
10.171 +LINK_ENTITY_TO_GAME(save_wpt);
10.172 LINK_ENTITY_TO_GAME(scan);
10.173 LINK_ENTITY_TO_GAME(scatterattack);
10.174 LINK_ENTITY_TO_GAME(scattersplit);
10.175 @@ -2118,6 +2162,24 @@
10.176 LINK_ENTITY_TO_GAME(sdcurse);
10.177 LINK_ENTITY_TO_GAME(secondary_point);
10.178 LINK_ENTITY_TO_GAME(securitymanager);
10.179 +LINK_ENTITY_TO_GAME(sell_ak101);
10.180 +LINK_ENTITY_TO_GAME(sell_ak47);
10.181 +LINK_ENTITY_TO_GAME(sell_baretta);
10.182 +LINK_ENTITY_TO_GAME(sell_beretta);
10.183 +LINK_ENTITY_TO_GAME(sell_dblshot);
10.184 +LINK_ENTITY_TO_GAME(sell_dbshot);
10.185 +LINK_ENTITY_TO_GAME(sell_glock17);
10.186 +LINK_ENTITY_TO_GAME(sell_longslide);
10.187 +LINK_ENTITY_TO_GAME(sell_mac);
10.188 +LINK_ENTITY_TO_GAME(sell_mac10);
10.189 +LINK_ENTITY_TO_GAME(sell_molotov_cocktail);
10.190 +LINK_ENTITY_TO_GAME(sell_mossberg);
10.191 +LINK_ENTITY_TO_GAME(sell_psg1);
10.192 +LINK_ENTITY_TO_GAME(sell_steyr_m40);
10.193 +LINK_ENTITY_TO_GAME(sell_tec9);
10.194 +LINK_ENTITY_TO_GAME(sell_tommy);
10.195 +LINK_ENTITY_TO_GAME(sell_tommygun);
10.196 +LINK_ENTITY_TO_GAME(sell_uzi);
10.197 LINK_ENTITY_TO_GAME(sensorychamber);
10.198 LINK_ENTITY_TO_GAME(sgvortex);
10.199 LINK_ENTITY_TO_GAME(shell_bazooka);
10.200 @@ -2130,6 +2192,7 @@
10.201 LINK_ENTITY_TO_GAME(shotgun_forklift);
10.202 LINK_ENTITY_TO_GAME(shotgun_hev);
10.203 LINK_ENTITY_TO_GAME(shotgun_sci);
10.204 +LINK_ENTITY_TO_GAME(show_wpt);
10.205 LINK_ENTITY_TO_GAME(shrapnel);
10.206 LINK_ENTITY_TO_GAME(shrink_timer);
10.207 LINK_ENTITY_TO_GAME(shrinker_project);
10.208 @@ -2200,6 +2263,14 @@
10.209 LINK_ENTITY_TO_GAME(swarm_spawnpt_human);
10.210 LINK_ENTITY_TO_GAME(swarm_team_alien);
10.211 LINK_ENTITY_TO_GAME(swarm_team_human);
10.212 +LINK_ENTITY_TO_GAME(tag_camp);
10.213 +LINK_ENTITY_TO_GAME(tag_crouch_jump);
10.214 +LINK_ENTITY_TO_GAME(tag_door);
10.215 +LINK_ENTITY_TO_GAME(tag_duck);
10.216 +LINK_ENTITY_TO_GAME(tag_jump);
10.217 +LINK_ENTITY_TO_GAME(tag_run);
10.218 +LINK_ENTITY_TO_GAME(tag_snipe);
10.219 +LINK_ENTITY_TO_GAME(tag_walk);
10.220 LINK_ENTITY_TO_GAME(tango_nomad);
10.221 LINK_ENTITY_TO_GAME(tango_sentinel);
10.222 LINK_ENTITY_TO_GAME(tango_sniper);
10.223 @@ -2299,6 +2370,7 @@
10.224 LINK_ENTITY_TO_GAME(thrown_knife);
10.225 LINK_ENTITY_TO_GAME(thrown_object);
10.226 LINK_ENTITY_TO_GAME(thrown_sledge);
10.227 +LINK_ENTITY_TO_GAME(timed_grenade);
10.228 LINK_ENTITY_TO_GAME(timedevent);
10.229 LINK_ENTITY_TO_GAME(timer);
10.230 LINK_ENTITY_TO_GAME(timer_add);
10.231 @@ -2486,6 +2558,7 @@
10.232 LINK_ENTITY_TO_GAME(weapon_30cal);
10.233 LINK_ENTITY_TO_GAME(weapon_357);
10.234 LINK_ENTITY_TO_GAME(weapon_40gl);
10.235 +LINK_ENTITY_TO_GAME(weapon_44sw);
10.236 LINK_ENTITY_TO_GAME(weapon_50cal);
10.237 LINK_ENTITY_TO_GAME(weapon_556AR);
10.238 LINK_ENTITY_TO_GAME(weapon_90mm);
10.239 @@ -2809,6 +2882,7 @@
10.240 LINK_ENTITY_TO_GAME(weapon_guardian);
10.241 LINK_ENTITY_TO_GAME(weapon_hache);
10.242 LINK_ENTITY_TO_GAME(weapon_hammer);
10.243 +LINK_ENTITY_TO_GAME(weapon_hand);
10.244 LINK_ENTITY_TO_GAME(weapon_handcannon);
10.245 LINK_ENTITY_TO_GAME(weapon_handgrenade);
10.246 LINK_ENTITY_TO_GAME(weapon_handgrenade_ex);
10.247 @@ -2943,6 +3017,7 @@
10.248 LINK_ENTITY_TO_GAME(weapon_mk23);
10.249 LINK_ENTITY_TO_GAME(weapon_model98);
10.250 LINK_ENTITY_TO_GAME(weapon_molotov);
10.251 +LINK_ENTITY_TO_GAME(weapon_molotov_cocktail);
10.252 LINK_ENTITY_TO_GAME(weapon_mop);
10.253 LINK_ENTITY_TO_GAME(weapon_mortar);
10.254 LINK_ENTITY_TO_GAME(weapon_mortier);
10.255 @@ -3049,6 +3124,7 @@
10.256 LINK_ENTITY_TO_GAME(weapon_rpg);
10.257 LINK_ENTITY_TO_GAME(weapon_rpg7);
10.258 LINK_ENTITY_TO_GAME(weapon_rs202m2);
10.259 +LINK_ENTITY_TO_GAME(weapon_rs_meta);
10.260 LINK_ENTITY_TO_GAME(weapon_ruche);
10.261 LINK_ENTITY_TO_GAME(weapon_ruger);
10.262 LINK_ENTITY_TO_GAME(weapon_rumgun);
10.263 @@ -3062,6 +3138,7 @@
10.264 LINK_ENTITY_TO_GAME(weapon_sako);
10.265 LINK_ENTITY_TO_GAME(weapon_satchel);
10.266 LINK_ENTITY_TO_GAME(weapon_satelitelaser);
10.267 +LINK_ENTITY_TO_GAME(weapon_sawed);
10.268 LINK_ENTITY_TO_GAME(weapon_sawedoff);
10.269 LINK_ENTITY_TO_GAME(weapon_sawgun);
10.270 LINK_ENTITY_TO_GAME(weapon_sbarrel);
10.271 @@ -3169,6 +3246,7 @@
10.272 LINK_ENTITY_TO_GAME(weapon_star);
10.273 LINK_ENTITY_TO_GAME(weapon_sten);
10.274 LINK_ENTITY_TO_GAME(weapon_sterling);
10.275 +LINK_ENTITY_TO_GAME(weapon_steyr_m40);
10.276 LINK_ENTITY_TO_GAME(weapon_stg24);
10.277 LINK_ENTITY_TO_GAME(weapon_stickgrenade);
10.278 LINK_ENTITY_TO_GAME(weapon_stickgrenade_ex);
10.279 @@ -3208,6 +3286,7 @@
10.280 LINK_ENTITY_TO_GAME(weapon_toad);
10.281 LINK_ENTITY_TO_GAME(weapon_tokarev);
10.282 LINK_ENTITY_TO_GAME(weapon_tomahawk);
10.283 +LINK_ENTITY_TO_GAME(weapon_tommy);
10.284 LINK_ENTITY_TO_GAME(weapon_tommygun);
10.285 LINK_ENTITY_TO_GAME(weapon_tornadospell);
10.286 LINK_ENTITY_TO_GAME(weapon_transistor);
10.287 @@ -3268,6 +3347,7 @@
10.288 LINK_ENTITY_TO_GAME(webgunprojectile);
10.289 LINK_ENTITY_TO_GAME(wheel);
10.290 LINK_ENTITY_TO_GAME(whiskey_whisk);
10.291 +LINK_ENTITY_TO_GAME(world_areacontrol);
10.292 LINK_ENTITY_TO_GAME(world_artefact);
10.293 LINK_ENTITY_TO_GAME(world_capturelocation);
10.294 LINK_ENTITY_TO_GAME(world_items);
11.1 --- a/metamod/mlist.cpp Thu Nov 11 23:21:08 2004 +0000
11.2 +++ b/metamod/mlist.cpp Fri Feb 18 20:52:34 2005 +0000
11.3 @@ -322,7 +322,9 @@
11.4 }
11.5 META_DEBUG(1, ("ini: Plugin in line %d overrides existing plugin with lower platform specific level %d, ours %d",
11.6 ln, pmatch->pfspecific, plist[n].pfspecific));
11.7 + int _index = pmatch->index;
11.8 memset(pmatch, 0, sizeof(MPlugin));
11.9 + pmatch->index = _index;
11.10 }
11.11 plist[n].action=PA_LOAD;
11.12 META_LOG("ini: Read plugin config for: %s", plist[n].desc);
11.13 @@ -389,7 +391,9 @@
11.14 if(PA_LOAD == pl_found->action) {
11.15 META_DEBUG(1, ("ini: Plugin in line %d overrides loading of plugin with lower platform specific level %d, ours %d",
11.16 ln, pl_found->pfspecific, pl_temp.pfspecific));
11.17 + int _index = pl_found->index;
11.18 memset(pl_found, 0, sizeof(MPlugin));
11.19 + pl_found->index = _index;
11.20 }
11.21 else {
11.22 META_DEBUG(1, ("ini: Plugin in line %d should override existing plugin with lower platform specific level %d, ours %d. Unable to comply.",
12.1 --- a/metamod/mplugin.cpp Thu Nov 11 23:21:08 2004 +0000
12.2 +++ b/metamod/mplugin.cpp Fri Feb 18 20:52:34 2005 +0000
12.3 @@ -726,7 +726,7 @@
12.4 // Make copy of gameDLL's function tables for each plugin, so we don't
12.5 // risk the plugins screwing with the tables everyone uses.
12.6 if(GameDLL.funcs.dllapi_table && !gamedll_funcs.dllapi_table) {
12.7 - gamedll_funcs.dllapi_table = (DLL_FUNCTIONS *) malloc(sizeof(DLL_FUNCTIONS));
12.8 + gamedll_funcs.dllapi_table = (DLL_FUNCTIONS *) calloc(1, sizeof(DLL_FUNCTIONS));
12.9 if(!gamedll_funcs.dllapi_table) {
12.10 META_ERROR("dll: Failed attach plugin '%s': Failed malloc() for dllapi_table");
12.11 RETURN_ERRNO(mFALSE, ME_NOMEM);
12.12 @@ -764,7 +764,8 @@
12.13 // a function isn't an option since we have varying types.
12.14 #define GET_FUNC_TABLE_FROM_PLUGIN(pfnGetFuncs, STR_GetFuncs, struct_field, API_TYPE, TABLE_TYPE, vers_pass, vers_int, vers_want) \
12.15 if(meta_table.pfnGetFuncs) { \
12.16 - struct_field = (TABLE_TYPE*) calloc(1, sizeof(TABLE_TYPE)); \
12.17 + if (!struct_field) \
12.18 + struct_field = (TABLE_TYPE*) calloc(1, sizeof(TABLE_TYPE)); \
12.19 if(meta_table.pfnGetFuncs(struct_field, vers_pass)) { \
12.20 META_DEBUG(3, ("dll: Plugin '%s': Found %s", desc, STR_GetFuncs)); \
12.21 } \
12.22 @@ -776,6 +777,8 @@
12.23 } \
12.24 else { \
12.25 META_DEBUG(5, ("dll: Plugin '%s': No %s", desc, STR_GetFuncs)); \
12.26 + if (struct_field) \
12.27 + free(struct_field); \
12.28 struct_field=NULL; \
12.29 }
12.30
12.31 @@ -934,6 +937,7 @@
12.32 else if(action==PA_RELOAD) {
12.33 status=PL_VALID;
12.34 action=PA_LOAD;
12.35 + clear();
12.36 }
12.37 META_LOG("dll: Unloaded plugin '%s' for reason '%s'", desc, str_reason(reason));
12.38 return(mTRUE);
13.1 --- a/metamod/vers_meta.h Thu Nov 11 23:21:08 2004 +0000
13.2 +++ b/metamod/vers_meta.h Fri Feb 18 20:52:34 2005 +0000
13.3 @@ -5,7 +5,7 @@
13.4 // with metamod.
13.5
13.6 /*
13.7 - * Copyright (c) 2001-2003 Will Day <[email protected]>
13.8 + * Copyright (c) 2001-2005 Will Day <[email protected]>
13.9 *
13.10 * This file is part of Metamod.
13.11 *
13.12 @@ -48,8 +48,8 @@
13.13 # endif /* _MSC_VER */
13.14 #endif /* not OPT_TYPE */
13.15
13.16 -#define VDATE "2004/11/12"
13.17 -#define VVERSION "1.17.3"
13.18 -#define RC_VERS_DWORD 1,17,3,0 // Version Windows DLL Resources in res_meta.rc
13.19 +#define VDATE "2005/02/20"
13.20 +#define VVERSION "1.17.4"
13.21 +#define RC_VERS_DWORD 1,17,4,0 // Version Windows DLL Resources in res_meta.rc
13.22
13.23 #endif /* VERS_META_H */