summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Haley2010-09-12 07:08:25 +0000
committerJames Haley2010-09-12 07:08:25 +0000
commitc8c0b07f50c20b2e80cdc99005fbdd697f5add83 (patch)
tree21042ab384ea394a0e12116ce4ff332711437b34
parentd0e71af3ac0aa8da23b9b40d3da24a56911cbf67 (diff)
downloadchocolate-doom-c8c0b07f50c20b2e80cdc99005fbdd697f5add83.tar.gz
chocolate-doom-c8c0b07f50c20b2e80cdc99005fbdd697f5add83.tar.bz2
chocolate-doom-c8c0b07f50c20b2e80cdc99005fbdd697f5add83.zip
I munged up A_CrusaderAttack pretty good, but it's fixed now.
Subversion-branch: /branches/strife-branch Subversion-revision: 2074
-rw-r--r--src/strife/m_menu.c4
-rw-r--r--src/strife/p_enemy.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c
index d03f73be..d6e6b44c 100644
--- a/src/strife/m_menu.c
+++ b/src/strife/m_menu.c
@@ -1172,6 +1172,7 @@ void M_ChangeDetail(int choice)
}
*/
+// [STRIFE] Verified unmodified
void M_SizeDisplay(int choice)
{
switch(choice)
@@ -1236,7 +1237,8 @@ M_DrawThermo
}
-
+// haleyjd: These are from DOOM v0.5 and the prebeta! They drew those ugly red &
+// blue checkboxes... preserved for historical interest, as not in Strife.
void
M_DrawEmptyCell
( menu_t* menu,
diff --git a/src/strife/p_enemy.c b/src/strife/p_enemy.c
index f6c44c67..6d6dbb09 100644
--- a/src/strife/p_enemy.c
+++ b/src/strife/p_enemy.c
@@ -1527,6 +1527,7 @@ void A_CrusaderAttack(mobj_t* actor)
actor->angle += (ANG45 / 16);
P_SpawnFacingMissile(actor, actor->target, MT_C_MISSILE);
+ P_SetMobjState(actor, actor->info->seestate);
actor->reactiontime += 15;
}
else