zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lorefix' of https://github.com/MajorCooke/zdoom

This commit is contained in:
Christoph Oelckers 2015-01-06 15:55:22 +01:00
parent 2095f5ddf4 f374cf514d
commit dac2ae6411
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/g_strife/a_loremaster.cpp
View File

@ -23,7 +23,7 @@ int ALoreShot::DoSpecialDamage (AActor *target, int damage, FName damagetype)
{ {
FVector3 thrust; FVector3 thrust;
if (this->target != NULL) if (this->target != NULL && !(this->target->flags7 & MF7_DONTTHRUST))
{ {
thrust.X = float(this->target->x - target->x); thrust.X = float(this->target->x - target->x);
thrust.Y = float(this->target->y - target->y); thrust.Y = float(this->target->y - target->y);