yquake2/rogue
0
0
Fork 0
mirror of https://github.com/yquake2/rogue.git synced 2024-11-22 20:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Restored blocked code for gladiator

Browse source
This commit is contained in:
BjossiAlfreds 2019-09-27 21:59:03 +00:00
parent f24de8d323
commit 72922a60cc
3 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/monster/gladiator/gladiator.c
View file

@ -466,6 +466,27 @@ gladiator_die(edict_t *self, edict_t *inflictor /* unused */, edict_t *attacker
self->monsterinfo.currentmove = &gladiator_move_death;
}
qboolean
gladiator_blocked(edict_t *self, float dist)
{
if (!self)
{
return false;
}
if (blocked_checkshot(self, 0.25 + (0.05 * skill->value) ))
{
return true;
}
if (blocked_checkplat(self, dist))
{
return true;
}
return false;
}
/*
* QUAKED monster_gladiator (1 .5 0) (-32 -32 -24) (32 32 64) Ambush Trigger_Spawn Sight
*/
@ -516,6 +537,7 @@ SP_monster_gladiator(edict_t *self)
self->monsterinfo.sight = gladiator_sight;
self->monsterinfo.idle = gladiator_idle;
self->monsterinfo.search = gladiator_search;
self->monsterinfo.blocked = gladiator_blocked;
gi.linkentity(self);
self->monsterinfo.currentmove = &gladiator_move_stand;

1
src/savegame/tables/gamefunc_decs.h
View file

@ -587,6 +587,7 @@ extern void gunner_search ( edict_t * self ) ;
extern void gunner_sight ( edict_t * self , edict_t * other ) ;
extern void gunner_idlesound ( edict_t * self ) ;
extern void SP_monster_gladiator ( edict_t * self ) ;
qboolean gladiator_blocked ( edict_t *self , float dist ) ;
extern void gladiator_die ( edict_t * self , edict_t * inflictor , edict_t * attacker , int damage , vec3_t point ) ;
extern void gladiator_dead ( edict_t * self ) ;
extern void gladiator_pain ( edict_t * self , edict_t * other , float kick , int damage ) ;

1
src/savegame/tables/gamefunc_list.h
View file

@ -587,6 +587,7 @@
{"gunner_sight", (byte *)gunner_sight},
{"gunner_idlesound", (byte *)gunner_idlesound},
{"SP_monster_gladiator", (byte *)SP_monster_gladiator},
{"gladiator_blocked", (byte *)gladiator_blocked},
{"gladiator_die", (byte *)gladiator_die},
{"gladiator_dead", (byte *)gladiator_dead},
{"gladiator_pain", (byte *)gladiator_pain},