From d9f9c5256a3a0ab5e6d35bb450930fc8114b733c Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 26 Feb 2006 06:54:23 +0000 Subject: [PATCH] more revert to 1.00-era code --- dlls/ts/tsx/Utils.cpp | 20 ++++++++++++++++---- dlls/ts/tsx/msvc/tsx_amxx.vcproj | 10 ++++++++-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/ts/tsx/Utils.cpp b/dlls/ts/tsx/Utils.cpp index 6732968e..fd52f9bf 100755 --- a/dlls/ts/tsx/Utils.cpp +++ b/dlls/ts/tsx/Utils.cpp @@ -1,6 +1,6 @@ /* - * TSX - * Copyright (c) 2005 Melanie Maye + * TFCX + * Copyright (c) 2004 Lukasz Wlasinski * * * This program is free software; you can redistribute it and/or modify it @@ -58,7 +58,7 @@ weapon_t weaponData[] = { { 0,"Glock-20C","glock-20c",1 }, { 0,"UMP", "ump",1 }, { 0,"M61 Grenade","m61_grenade",1 }, - { 1,"Combat Knife","combat_knife", 2 }, + { 1,"Combat Knife","combat_knife",1 }, { 0,"MOSSBERG 500","mossberg_500",1 }, { 0,"M16A4","m16a4",1 }, { 0,"Ruger-MK1","ruger-mk1",1 }, @@ -68,8 +68,20 @@ weapon_t weaponData[] = { { 0,"M60E3","m60e3",1 }, { 0,"Sawed-off","sawed-off",1 }, // 33 { 1,"Katana", "katana",2 }, - { 1,"Seal Knife","seal_knife",2 }, // 35 + { 1,"Seal Knife","seal_knife",1 }, // 35 { 1,"Kung Fu","kung_fu",3 }, // Again new id 36 { 1,"Throwing Knife","throwing_knife",2 }, // new id 37 { 0,"breakable", "breakable", 1 }, }; + +bool ignoreBots (edict_t *pEnt, edict_t *pOther){ + if ( !rankBots && ( pEnt->v.flags & FL_FAKECLIENT || ( pOther && pOther->v.flags & FL_FAKECLIENT ) ) ) + return true; + return false; +} + +bool isModuleActive(){ + if ( !(int)CVAR_GET_FLOAT("tsstats_pause") ) + return true; + return false; +} \ No newline at end of file diff --git a/dlls/ts/tsx/msvc/tsx_amxx.vcproj b/dlls/ts/tsx/msvc/tsx_amxx.vcproj index 537e27d6..baba8217 100755 --- a/dlls/ts/tsx/msvc/tsx_amxx.vcproj +++ b/dlls/ts/tsx/msvc/tsx_amxx.vcproj @@ -215,10 +215,16 @@ + RelativePath="..\moduleconfig.cpp"> + RelativePath="..\NBase.cpp"> + + + +