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

- P_DaggerAlert() now puts the emitter into its Pain.Dagger state if it has one, but will still 

use the regular Pain state if not.

SVN r4034 (trunk)
This commit is contained in:
Randy Heit 2013-01-23 03:46:12 +00:00
parent 5f4bcaac3d
commit 8b6b55ce40
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/g_strife/a_strifeweapons.cpp
View File

@ -53,7 +53,7 @@ void P_DaggerAlert (AActor *target, AActor *emitter)
emitter->flags4 |= MF4_INCOMBAT; emitter->flags4 |= MF4_INCOMBAT;
emitter->target = target; emitter->target = target;
FState * painstate = emitter->FindState(NAME_Pain); FState *painstate = emitter->FindState(NAME_Pain, NAME_Dagger);
if (painstate != NULL) if (painstate != NULL)
{ {
emitter->SetState (painstate); emitter->SetState (painstate);

1
src/namedef.h
View File

@ -221,6 +221,7 @@ xx(Rocket)
xx(Plasma) xx(Plasma)
xx(BFG) xx(BFG)
//xx(Railgun) //xx(Railgun)
xx(Dagger)
// Damage types // Damage types
//xx(Fire) already defined above //xx(Fire) already defined above