diff options
| author | James Haley | 2011-02-07 01:50:40 +0000 |
|---|---|---|
| committer | James Haley | 2011-02-07 01:50:40 +0000 |
| commit | 808f6fd842f581f31aa0d91617a759af46fdc732 (patch) | |
| tree | 9d9130b5f4e099cbe6a5a08c3bbd19f87dae3108 /src/strife/p_inter.c | |
| parent | 17333436188f63319625b007489c7b70029bfaba (diff) | |
| download | chocolate-doom-808f6fd842f581f31aa0d91617a759af46fdc732.tar.gz chocolate-doom-808f6fd842f581f31aa0d91617a759af46fdc732.tar.bz2 chocolate-doom-808f6fd842f581f31aa0d91617a759af46fdc732.zip | |
Added graphical intro loading screen, and -nograph parameter which
disables it. Made most D_DoomMain messages dependent on -devparm.
wipegamestate should start == 1, which is currently GS_UNKNOWN. Changed
-wart behavior. Verified *no* changes in Strife to p_sight.c.
Subversion-branch: /branches/strife-branch
Subversion-revision: 2251
Diffstat (limited to 'src/strife/p_inter.c')
| -rw-r--r-- | src/strife/p_inter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/strife/p_inter.c b/src/strife/p_inter.c index a2d1dcc2..10559d8f 100644 --- a/src/strife/p_inter.c +++ b/src/strife/p_inter.c @@ -1209,8 +1209,8 @@ void P_DamageMobj(mobj_t* target, mobj_t* inflictor, mobj_t* source, int damage) if (inflictor && !(target->flags & MF_NOCLIP) && (!source - || !source->player - || source->player->readyweapon != wp_flame)) + || !source->player + || source->player->readyweapon != wp_flame)) { ang = R_PointToAngle2(inflictor->x, inflictor->y, |