Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get_user_attacker fixes

Browse Source 
version bump
This commit is contained in:
David Anderson 2005-11-19 21:24:49 +00:00
parent 803852ee0c
commit 71926e6d03
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
amxmodx/amxmodx.cpp
View File

@ -763,11 +763,23 @@ static cell AMX_NATIVE_CALL get_user_attacker(AMX *amx, cell *params) /* 2 param
{
pPlayer = GET_PLAYER_POINTER(enemy);
weapon = pPlayer->current;
}
else if (g_grenades.find(enemy, &pPlayer, weapon))
} else if (g_grenades.find(enemy, &pPlayer, weapon)) {
enemy = pPlayer->pEdict;
else
enemy = NULL;
} else {
enemy = enemy->v.owner;
if (!FNullEnt(enemy) && (enemy->v.flags & (FL_CLIENT | FL_FAKECLIENT)))
{
pPlayer = GET_PLAYER_POINTER(enemy);
weapon = pPlayer->current;
} else {
switch (*params / sizeof(cell))
{
case 3: *get_amxaddr(amx, params[3]) = 0;
case 2: *get_amxaddr(amx, params[2]) = 0;
}
return ENTINDEX(pPlayer->pEdict->v.dmg_inflictor);
}
}
if (enemy)
{

2
amxmodx/amxmodx.h
View File

@ -68,7 +68,7 @@
#include "amxxlog.h"
#define AMXXLOG_Log g_log.Log
#define AMX_VERSION "1.60"
#define AMX_VERSION "1.61"
extern AMX_NATIVE_INFO core_Natives[];
extern AMX_NATIVE_INFO time_Natives[];

8
amxmodx/version.rc
View File

@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,6,0,0
PRODUCTVERSION 1,6,0,0
FILEVERSION 1,6,1,0
PRODUCTVERSION 1,6,1,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -45,12 +45,12 @@ BEGIN
BEGIN
VALUE "Comments", "AMX Mod X"
VALUE "FileDescription", "AMX Mod X"
VALUE "FileVersion", "1.60"
VALUE "FileVersion", "1.61"
VALUE "InternalName", "amxmodx"
VALUE "LegalCopyright", "Copyright (c) 2004-2005, AMX Mod X Dev Team"
VALUE "OriginalFilename", "amxmodx_mm.dll"
VALUE "ProductName", "AMX Mod X"
VALUE "ProductVersion", "1.60"
VALUE "ProductVersion", "1.61"
END
END
BLOCK "VarFileInfo"