diff --git a/default.fmf b/default.fmf index ceffb8d3..641bee0c 100755 --- a/default.fmf +++ b/default.fmf @@ -1,13 +1,10 @@ FTEMANIFEST 1 -game valve -name "Nuclide" -protocolname "Nuclide" -basegame logos -basegame valve -disablehomedir 1 -rtcbroker master.frag-net.com:27950 +GAME valve +NAME "Half-Life" +BASEGAME logos +BASEGAME valve -// hastily converted +// custom game menu variables -seta gameinfo_game "Nuclide" -seta gameinfo_gamedir "valve" -seta gameinfo_fallback_dir "" @@ -16,11 +13,16 @@ rtcbroker master.frag-net.com:27950 -seta gameinfo_url_info "www.icculus.org/~marco/" -seta gameinfo_version "1.0" -seta gameinfo_url_dl "" --seta gameinfo_type "" +-seta gameinfo_type "Both" -seta gameinfo_nomodels 0 -seta gameinfo_gamedll "progs.dat" -seta gameinfo_startmap "c0a0" --seta gameinfo_trainingmap "t0a0" +-seta gameinfo_trainingmap "map t0a0" -seta gameinfo_cldll 1 -seta gameinfo_hlversion "1110" -seta gameinfo_svonly "0" + +// you don't really want to change these +RTCBROKER master.frag-net.com:27950 +PROTOCOLNAME "Nuclide" +MAINCONFIG nuclide.cfg diff --git a/gearbox.fmf b/gearbox.fmf new file mode 100755 index 00000000..5307539e --- /dev/null +++ b/gearbox.fmf @@ -0,0 +1,29 @@ +FTEMANIFEST 1 +GAME gearbox +NAME "Opposing Force" +BASEGAME logos +BASEGAME valve +BASEGAME gearbox + +// custom game menu variables +-seta gameinfo_game "Opposing Force" +-seta gameinfo_gamedir "gearbox" +-seta gameinfo_fallback_dir "" +-seta gameinfo_mpentity "info_player_deathmatch" +-seta gameinfo_size "212803108" +-seta gameinfo_url_info "www.gearboxsoftware.com" +-seta gameinfo_version "1.0" +-seta gameinfo_url_dl "" +-seta gameinfo_type "Singleplayer" +-seta gameinfo_nomodels 0 +-seta gameinfo_gamedll "progs.dat" +-seta gameinfo_startmap "of0a0" +-seta gameinfo_trainingmap "map ofboot0" +-seta gameinfo_cldll 1 +-seta gameinfo_hlversion "1110" +-seta gameinfo_svonly "0" + +// you don't really want to change these +RTCBROKER master.frag-net.com:27950 +PROTOCOLNAME "Nuclide" +MAINCONFIG nuclide.cfg diff --git a/rewolf.fmf b/rewolf.fmf new file mode 100755 index 00000000..e77bd8cf --- /dev/null +++ b/rewolf.fmf @@ -0,0 +1,28 @@ +FTEMANIFEST 1 +GAME rewolf +NAME "Gunman Chronicles" +BASEGAME logos +BASEGAME rewolf + +// custom game menu variables +-seta gameinfo_game "Gunman Chronicles" +-seta gameinfo_gamedir "rewolf" +-seta gameinfo_fallback_dir "" +-seta gameinfo_mpentity "info_player_deathmatch" +-seta gameinfo_size "212803108" +-seta gameinfo_url_info "www.gunmanchronicles.com" +-seta gameinfo_version "1.0" +-seta gameinfo_url_dl "" +-seta gameinfo_type "Both" +-seta gameinfo_nomodels 0 +-seta gameinfo_gamedll "progs.dat" +-seta gameinfo_startmap "city1a" +-seta gameinfo_trainingmap "playvideo av:media/rewolf.bik" +-seta gameinfo_cldll 1 +-seta gameinfo_hlversion "1110" +-seta gameinfo_svonly "0" + +// you don't really want to change these +RTCBROKER master.frag-net.com:27950 +PROTOCOLNAME "Nuclide" +MAINCONFIG nuclide.cfg diff --git a/scihunt.fmf b/scihunt.fmf new file mode 100644 index 00000000..2a1f2bd2 --- /dev/null +++ b/scihunt.fmf @@ -0,0 +1,35 @@ +FTEMANIFEST 1 +GAME scihunt +NAME "Scientist Hunt" +BASEGAME logos +BASEGAME valve +BASEGAME scihunt + +// custom game menu variables +-seta gameinfo_game "Scientist Hunt" +-seta gameinfo_type "Multiplayer" +-seta gameinfo_gamedir "scihunt" +-seta gameinfo_fallback_dir "" +-seta gameinfo_mpentity "info_player_deathmatch" +-seta gameinfo_size "12869244" +-seta gameinfo_version "1.0" +-seta gameinfo_hlversion "1110" +-seta gameinfo_nomodels 0 +-seta gameinfo_gamedll "progs.dat" +-seta gameinfo_startmap "c1a0" +-seta gameinfo_trainingmap "map t0a0" +-seta gameinfo_cldll 1 +-seta gameinfo_svonly "0" +-seta gameinfo_url_info "www.richwhitehouse.com" +-seta gameinfo_url_dl "http://www.frag-net.com/mods/scihunt.fmf" + +// download/update packaging information +PACKAGE scihunt/pak0.pk3 0xc1cbd5c1 "http://www.frag-net.com/files/scihunt_pak0.pk3" + +// do we want this? I don't want to automatically update it +// UPDATEURL http://www.frag-net.com/mods/scihunt.fmf + +// you don't really want to change these +RTCBROKER master.frag-net.com:27950 +PROTOCOLNAME "Nuclide" +MAINCONFIG nuclide.cfg diff --git a/src/gs-entbase/server/basetrigger.cpp b/src/gs-entbase/server/basetrigger.cpp index 63fe006b..03904cf9 100644 --- a/src/gs-entbase/server/basetrigger.cpp +++ b/src/gs-entbase/server/basetrigger.cpp @@ -49,9 +49,15 @@ void CBaseTrigger :: UseTargets ( void ) } } - if (m_strMessage && eActivator.flags & FL_CLIENT) { - centerprint(eActivator, m_strMessage); - } + /* hack: check to see if this is a sound file */ + /*if (whichpack(m_strMessage)) { + print(m_strMessage); + print("\n"); + } else { + if (m_strMessage && eActivator.flags & FL_CLIENT) { + centerprint(eActivator, m_strMessage); + } + }*/ if ( m_strKillTarget ) { entity eKill = find( world, CBaseTrigger::m_strTargetName, m_strKillTarget ); diff --git a/src/menu-fn/m_main.cpp b/src/menu-fn/m_main.cpp index 924179f2..d30f674f 100644 --- a/src/menu-fn/m_main.cpp +++ b/src/menu-fn/m_main.cpp @@ -73,7 +73,7 @@ void btn_training(void) { localcmd("stopmusic\n"); localcmd("maxplayers 1\n"); - localcmd(sprintf("map %s\n", games[gameinfo_current].trainingmap)); + localcmd(sprintf("%s\n", games[gameinfo_current].trainingmap)); } void btn_configuration_start(void) { diff --git a/src/server/rewolf/monster_human_bandit.cpp b/src/server/rewolf/monster_human_bandit.cpp index b33a777e..d79f4201 100644 --- a/src/server/rewolf/monster_human_bandit.cpp +++ b/src/server/rewolf/monster_human_bandit.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class monster_human_bandit:CBaseMonster +class monster_human_bandit:CBaseNPC { void() monster_human_bandit; }; @@ -22,5 +22,7 @@ class monster_human_bandit:CBaseMonster void monster_human_bandit::monster_human_bandit(void) { model = "models/bandit.mdl"; - CBaseMonster::CBaseMonster(); + base_mins = [-16,-16,0]; + base_maxs = [16,16,72]; + CBaseNPC::CBaseNPC(); } diff --git a/src/server/rewolf/monster_human_chopper.cpp b/src/server/rewolf/monster_human_chopper.cpp index 6f527dd6..d1874546 100644 --- a/src/server/rewolf/monster_human_chopper.cpp +++ b/src/server/rewolf/monster_human_chopper.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class monster_human_chopper:CBaseEntity +class monster_human_chopper:CBaseNPC { void() monster_human_chopper; }; @@ -22,7 +22,7 @@ class monster_human_chopper:CBaseEntity void monster_human_chopper::monster_human_chopper(void) { model = "models/chopper.mdl"; - CBaseEntity::CBaseEntity(); - setmodel(this, m_oldModel); - setorigin(this, origin); + base_mins = [-16,-16,0]; + base_maxs = [16,16,72]; + CBaseNPC::CBaseNPC(); } diff --git a/src/server/rewolf/monster_human_demoman.cpp b/src/server/rewolf/monster_human_demoman.cpp index aa6cfa22..aeb490c0 100644 --- a/src/server/rewolf/monster_human_demoman.cpp +++ b/src/server/rewolf/monster_human_demoman.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class monster_human_demoman:CBaseMonster +class monster_human_demoman:CBaseNPC { void() monster_human_demoman; }; @@ -22,5 +22,7 @@ class monster_human_demoman:CBaseMonster void monster_human_demoman::monster_human_demoman(void) { model = "models/demolitionman.mdl"; - CBaseMonster::CBaseMonster(); + base_mins = [-16,-16,0]; + base_maxs = [16,16,72]; + CBaseNPC::CBaseNPC(); } diff --git a/src/server/rewolf/monster_human_gunman.cpp b/src/server/rewolf/monster_human_gunman.cpp index e5b6ae7a..e16673ef 100644 --- a/src/server/rewolf/monster_human_gunman.cpp +++ b/src/server/rewolf/monster_human_gunman.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class monster_human_gunman:CBaseMonster +class monster_human_gunman:CBaseNPC { void() monster_human_gunman; }; @@ -22,5 +22,7 @@ class monster_human_gunman:CBaseMonster void monster_human_gunman::monster_human_gunman(void) { model = "models/gunmantrooper.mdl"; - CBaseMonster::CBaseMonster(); + base_mins = [-16,-16,0]; + base_maxs = [16,16,72]; + CBaseNPC::CBaseNPC(); } diff --git a/src/server/rewolf/monster_human_unarmed.cpp b/src/server/rewolf/monster_human_unarmed.cpp index ddb43d1d..43dfe714 100644 --- a/src/server/rewolf/monster_human_unarmed.cpp +++ b/src/server/rewolf/monster_human_unarmed.cpp @@ -14,7 +14,7 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -class monster_human_unarmed:CBaseMonster +class monster_human_unarmed:CBaseNPC { void() monster_human_unarmed; }; @@ -22,5 +22,7 @@ class monster_human_unarmed:CBaseMonster void monster_human_unarmed::monster_human_unarmed(void) { model = "models/gunmantrooper.mdl"; - CBaseMonster::CBaseMonster(); + base_mins = [-16,-16,0]; + base_maxs = [16,16,72]; + CBaseNPC::CBaseNPC(); }