markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed linux build once again

Browse source
This commit is contained in:
jeefo 2015-06-28 20:16:03 +03:00
commit 3eb7668aa9
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
project/makefile
View file

@ -52,7 +52,7 @@ endif
LINK += -m32 -lm -ldl LINK += -m32 -lm -ldl
CFLAGS += -DHAVE_STDINT_H -D__extern_always_inline=inline -Dstricmp=strcasecmp -Dstrcmpi=strcasecmp -fno-strict-aliasing -m32 -Wall -Werror -Wno-uninitialized -Wno-unused -Wno-switch -Wno-c++11-compat-deprecated-writable-strings CFLAGS += -DHAVE_STDINT_H -D__extern_always_inline=inline -D_strdup=strdup -Dstricmp=strcasecmp -Dstrcmpi=strcasecmp -fno-strict-aliasing -m32 -Wall -Werror -Wno-uninitialized -Wno-unused -Wno-switch -Wno-c++11-compat-deprecated-writable-strings
CPPFLAGS += -Wno-invalid-offsetof -fno-exceptions -fno-rtti CPPFLAGS += -Wno-invalid-offsetof -fno-exceptions -fno-rtti
BINARY = $(PROJECT).$(LIB_EXT) BINARY = $(PROJECT).$(LIB_EXT)

18
source/combat.cpp
View file

@ -52,36 +52,38 @@ bool Bot::IsEnemyHiddenByRendering (edict_t *enemy)
return false; return false;
entvars_t &v = enemy->v; entvars_t &v = enemy->v;
bool enemyHasGun = (v.weapons & WEAPON_SECONDARY) || (v.weapons & WEAPON_SECONDARY);
if ((v.renderfx == kRenderFxExplode || (v.effects & EF_NODRAW)) && !(v.oldbuttons & IN_ATTACK) || !enemyHasGun) bool enemyHasGun = (v.weapons & WEAPON_SECONDARY) || (v.weapons & WEAPON_SECONDARY);
bool enemyGunfire = (v.button & IN_ATTACK) || (v.oldbuttons & IN_ATTACK);
if ((v.renderfx == kRenderFxExplode || (v.effects & EF_NODRAW)) && (!enemyGunfire || !enemyHasGun))
return true; return true;
else if ((v.renderfx == kRenderFxExplode || (v.effects & EF_NODRAW)) && (v.oldbuttons & IN_ATTACK) && enemyHasGun) if ((v.renderfx == kRenderFxExplode || (v.effects & EF_NODRAW)) && enemyGunfire && enemyHasGun)
return false; return false;
else if (v.renderfx != kRenderFxHologram && v.renderfx != kRenderFxExplode && v.rendermode != kRenderNormal) if (v.renderfx != kRenderFxHologram && v.renderfx != kRenderFxExplode && v.rendermode != kRenderNormal)
{ {
if (v.renderfx == kRenderFxGlowShell) if (v.renderfx == kRenderFxGlowShell)
{ {
if (v.renderamt <= 20.0f && v.rendercolor.x <= 20.0f && v.rendercolor.y <= 20.f && v.rendercolor.z <= 20.f) if (v.renderamt <= 20.0f && v.rendercolor.x <= 20.0f && v.rendercolor.y <= 20.f && v.rendercolor.z <= 20.f)
{ {
if (!(v.oldbuttons & IN_ATTACK) || !enemyHasGun) if (!enemyGunfire || !enemyHasGun)
return true; return true;
return false; return false;
} }
else if (v.renderamt <= 60.0f && v.rendercolor.x <= 60.f && v.rendercolor.y <= 60.0f && v.rendercolor.z <= 60.0f) else if (!enemyGunfire && v.renderamt <= 60.0f && v.rendercolor.x <= 60.f && v.rendercolor.y <= 60.0f && v.rendercolor.z <= 60.0f)
return true; return true;
} }
else if (v.renderamt <= 20.0f) else if (v.renderamt <= 20.0f)
{ {
if (!(v.oldbuttons & IN_ATTACK) || !enemyHasGun) if (!enemyGunfire || !enemyHasGun)
return true; return true;
return false; return false;
} }
else if (v.renderamt <= 60.0f) else if (!enemyGunfire && v.renderamt <= 60.0f)
return true; return true;
} }
return false; return false;