summaryrefslogtreecommitdiff
path: root/src/strife
diff options
context:
space:
mode:
authorJames Haley2010-09-26 00:24:32 +0000
committerJames Haley2010-09-26 00:24:32 +0000
commite9e7b85ab932b70caea5c1f7a40561f36c953d32 (patch)
treee7609cdc79c72bec1ec4d7886691b35e2975fabc /src/strife
parentb563a6485a2840f324ad0bc7b45d3a8306a9f18b (diff)
downloadchocolate-doom-e9e7b85ab932b70caea5c1f7a40561f36c953d32.tar.gz
chocolate-doom-e9e7b85ab932b70caea5c1f7a40561f36c953d32.tar.bz2
chocolate-doom-e9e7b85ab932b70caea5c1f7a40561f36c953d32.zip
Implemented cross type 179 and fixed cross type 184. I *believe* that
all Strife linedef specials are now implemented, but of course I cannot be 100% certain. Subversion-branch: /branches/strife-branch Subversion-revision: 2140
Diffstat (limited to 'src/strife')
-rw-r--r--src/strife/p_doors.c4
-rw-r--r--src/strife/p_spec.c11
2 files changed, 8 insertions, 7 deletions
diff --git a/src/strife/p_doors.c b/src/strife/p_doors.c
index 37e79e37..71831c68 100644
--- a/src/strife/p_doors.c
+++ b/src/strife/p_doors.c
@@ -218,7 +218,9 @@ void T_VerticalDoor(vldoor_t* door)
// EV_DoLockedDoor
// Move a locked door up/down
//
-
+// [STRIFE] This game has a crap load of keys. And this function doesn't even
+// deal with all of them...
+//
int EV_DoLockedDoor(line_t* line, vldoor_e type, mobj_t* thing)
{
player_t* p;
diff --git a/src/strife/p_spec.c b/src/strife/p_spec.c
index 0d999d4f..af8bc568 100644
--- a/src/strife/p_spec.c
+++ b/src/strife/p_spec.c
@@ -943,8 +943,9 @@ P_CrossSpecialLine
line->special = 0;
break;
- case 179: // STRIFE-TODO: new Ceiling type?
- // EV_DoCeiling(line, 0);
+ case 179:
+ // haleyjd 09/25/10: [STRIFE] W1 Ceiling Lower to Floor
+ EV_DoCeiling(line, lowerToFloor);
line->special = 0;
break;
@@ -1359,10 +1360,8 @@ P_CrossSpecialLine
case 184:
// villsa [STRIFE] plat up wait down stay
- EV_DoPlat(line, upWaitDownStay, 0);
-
- // hmm.. looks like Rogue screwed up here..
- P_ChangeSwitchTexture(line, 1);
+ if(EV_DoPlat(line, upWaitDownStay, 0))
+ P_ChangeSwitchTexture(line, 1); // In P_CrossSpecialLine? Copypasta error?
break;
case 185: