summaryrefslogtreecommitdiff
path: root/src/strife
diff options
context:
space:
mode:
authorSamuel Villareal2010-09-19 18:37:37 +0000
committerSamuel Villareal2010-09-19 18:37:37 +0000
commit109a4d929d04b26e9ceadb1c545ddbc6dce154b3 (patch)
treed49104d78aeb5f00d9ac9f46f458424dbb1ab8f3 /src/strife
parent16031793fc8c4e39bb027b39a7702154a33051f2 (diff)
downloadchocolate-doom-109a4d929d04b26e9ceadb1c545ddbc6dce154b3.tar.gz
chocolate-doom-109a4d929d04b26e9ceadb1c545ddbc6dce154b3.tar.bz2
chocolate-doom-109a4d929d04b26e9ceadb1c545ddbc6dce154b3.zip
+ Fixed a minor fluke with type 165 in EV_VerticalDoor
+ Types 165 and 205 supported in P_UseSpecialLine Subversion-branch: /branches/strife-branch Subversion-revision: 2119
Diffstat (limited to 'src/strife')
-rw-r--r--src/strife/p_doors.c2
-rw-r--r--src/strife/p_switch.c28
2 files changed, 17 insertions, 13 deletions
diff --git a/src/strife/p_doors.c b/src/strife/p_doors.c
index 45df9060..2fed1f27 100644
--- a/src/strife/p_doors.c
+++ b/src/strife/p_doors.c
@@ -622,7 +622,7 @@ void EV_VerticalDoor(line_t* line, mobj_t* thing)
case 165:
player->message = DEH_String("That doesn't seem to work");
S_StartSound(NULL, sfx_oof);
- break;
+ return;
case 166: // DR Hand Print door
if(!player->cards[key_SeveredHand])
diff --git a/src/strife/p_switch.c b/src/strife/p_switch.c
index b9e0fee1..b90f8794 100644
--- a/src/strife/p_switch.c
+++ b/src/strife/p_switch.c
@@ -495,18 +495,22 @@ P_UseSpecialLine
switch (line->special)
{
// MANUALS
- case 1: // Vertical Door
- case 26: // Blue Door/Locked
- case 27: // Yellow Door /Locked
- case 28: // Red Door /Locked
-
- case 31: // Manual door open
- case 32: // Blue locked door open
- case 33: // Red locked door open
- case 34: // Yellow locked door open
-
- case 117: // Blazing door raise
- case 118: // Blazing door open
+ case 1: // Vertical Door
+ case 26: // Blue Door/Locked
+ case 27: // Yellow Door /Locked
+ case 28: // Red Door /Locked
+
+ case 31: // Manual door open
+ case 32: // Blue locked door open
+ case 33: // Red locked door open
+ case 34: // Yellow locked door open
+
+ case 117: // Blazing door raise
+ case 118: // Blazing door open
+
+ case 165: // That doesn't seem to work
+
+ case 205: // Available in retail only
EV_VerticalDoor (line, thing);
break;