summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSamuel Villareal2010-09-19 19:31:37 +0000
committerSamuel Villareal2010-09-19 19:31:37 +0000
commit76d654bb85659ba65cfa843ee24973fba60269cc (patch)
tree6a02c72bc9af638ef4f438c9a095f8a473136d1b /src
parent3e2b2b4889f9f8d7de1ee056be6240ca05ec6dfe (diff)
downloadchocolate-doom-76d654bb85659ba65cfa843ee24973fba60269cc.tar.gz
chocolate-doom-76d654bb85659ba65cfa843ee24973fba60269cc.tar.bz2
chocolate-doom-76d654bb85659ba65cfa843ee24973fba60269cc.zip
+ Line types 194 and 211 added
Subversion-branch: /branches/strife-branch Subversion-revision: 2121
Diffstat (limited to 'src')
-rw-r--r--src/strife/p_switch.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/src/strife/p_switch.c b/src/strife/p_switch.c
index 8c8a6cca..d190da09 100644
--- a/src/strife/p_switch.c
+++ b/src/strife/p_switch.c
@@ -48,6 +48,7 @@
#include "r_state.h"
#include "m_bbox.h" // villsa [STRIFE]
+void P_FreePrisoners(void); // villsa [STRIFE]
//
// CHANGE THE TEXTURE OF A WALL SWITCH TO ITS OPPOSITE
@@ -441,6 +442,9 @@ static void P_MoveWall(line_t *line, mobj_t *thing)
line->bbox[BOXTOP] = y;
}
+// villsa [STRIFE]
+static char speciallinemsg[92];
+
//
// P_UseSpecialLine
// Called when a thing uses a special line.
@@ -829,12 +833,33 @@ boolean P_UseSpecialLine(mobj_t* thing, line_t* line, int side)
P_Thrust(thing->player, thing->angle + ANG180, 125*FRACUNIT/16);
break;
+ case 194:
+ // villsa [STRIFE] free prisoners
+ if(EV_DoDoor(line, open))
+ {
+ P_ChangeSwitchTexture(line, 0);
+ P_FreePrisoners();
+ return true;
+ }
+ break;
+
case 207:
// villsa [STRIFE] remote sliding door
if(EV_RemoteSlidingDoor(line, thing))
P_ChangeSwitchTexture(line, 1);
break; // haleyjd
+ case 211:
+ // villsa [STRIFE] play VOC## sound
+ if(&players[consoleplayer] == thing->player &&
+ thing->player->powers[pw_communicator])
+ {
+ DEH_snprintf(speciallinemsg, sizeof(speciallinemsg), "voc%i", line->tag);
+ I_StartVoice(speciallinemsg);
+ line->special = 0;
+ }
+ break;
+
case 226:
// villsa [STRIFE] complete training area
if(!EV_DoFloor(line, lowerFloor))