From 3a00c4e3b05eed5c6c5c8e7f345347e88df32e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johnny=20Bergstr=C3=B6m?= Date: Fri, 27 Feb 2004 13:59:00 +0000 Subject: [PATCH] Removed money natives, cs set deaths native. --- dlls/fun/fun.cpp | 6 ++--- dlls/fun/fun.h | 1 - plugins/include/fun.inc | 50 +++++++++++++++-------------------------- 3 files changed, 20 insertions(+), 37 deletions(-) diff --git a/dlls/fun/fun.cpp b/dlls/fun/fun.cpp index f49d62b3..7c78fd28 100755 --- a/dlls/fun/fun.cpp +++ b/dlls/fun/fun.cpp @@ -616,11 +616,9 @@ AMX_NATIVE_INFO fun_Exports[] = { }; /******************************************************************************************/ -void PlayerPreThink( edict_t *pEntity) +void PlayerPreThink(edict_t *pEntity) { - int index = ENTINDEX(pEntity); - - if (silent[index]) { + if (silent[ENTINDEX(pEntity)]) { pEntity->v.flTimeStepSound = 999; RETURN_META(MRES_HANDLED); } diff --git a/dlls/fun/fun.h b/dlls/fun/fun.h index 2de3401f..20868c90 100755 --- a/dlls/fun/fun.h +++ b/dlls/fun/fun.h @@ -87,7 +87,6 @@ pfnmodule_engine_g* g_engModuleFunc; // These seem to be meta/amxmod related #define HITGROUP_RIGHTARM 5 #define HITGROUP_LEFTLEG 6 #define HITGROUP_RIGHTLEG 7 - // Fun-specific defines above // Globals below diff --git a/plugins/include/fun.inc b/plugins/include/fun.inc index bad06317..e952970b 100755 --- a/plugins/include/fun.inc +++ b/plugins/include/fun.inc @@ -1,14 +1,9 @@ /* Fun functions -* -* by the AMX Mod X Development Team -* -* This file is provided as is (no warranties). -*/ - -#if defined _fun_included - #endinput -#endif -#define _fun_included + * + * (c) 2004, the AMX Mod X Development Team + * + * This file is provided as is (no warranties). + */ /* (untested) Returns 1 if receiver hears sender via voice communication. */ native get_client_listen(receiver, sender); @@ -38,21 +33,21 @@ native set_user_origin(index, origin[3]); native set_user_rendering(index, fx = kRenderFxNone, r = 255, g = 255, b = 255, render = kRenderNormal, amount = 16); /* Gives item to player, name of item can start -* with weapon_, ammo_ and item_. This event -* is announced with proper message to all players. */ + * with weapon_, ammo_ and item_. This event + * is announced with proper message to all players. */ native give_item(index, const item[]); /* (not yet implemented, don't know how to use native) -* Sets hit zones for player. This event is announced -* with proper message to all players. -* Parts of body are as bits: -* 2 - head -* 4 - chest -* 8 - stomach -* 16 - left arm -* 32 - right arm -* 64 - left leg -* 128 - right leg */ + * Sets hit zones for player. This event is announced + * with proper message to all players. + * Parts of body are as bits: + * 2 - head + * 4 - chest + * 8 - stomach + * 16 - left arm + * 32 - right arm + * 64 - left leg + * 128 - right leg */ native set_hitzones(body = 255); /* backwards compatibility */ @@ -78,12 +73,6 @@ native set_user_gravity(index, Float:gravity = 1.0); /* Returns users gravity. */ native get_user_gravity(index); -/* Gives money to user. */ -native set_user_money(index, money, flash = 1); - -/* Returns users money. */ -native get_user_money(index); - /* Spawns entity. */ native spawn(index); @@ -91,9 +80,6 @@ native spawn(index); stock user_spawn(index) return spawn(index) -/* CS: Set deaths(should be removed to CS module later) (doesn't update info right away? fix later?) */ -native set_user_deaths_cs(index, newdeaths); - /* Sets player noclip. If you want to disable noclip set only first parameter. */ native set_user_noclip(index, noclip = 0); @@ -102,4 +88,4 @@ native get_user_noclip(index); /* Gives player silent footsteps. * if set = 0 it will return footsteps to normal */ -native set_user_footsteps(id, set = 1); \ No newline at end of file +native set_user_footsteps(id, set = 1);