From e20874a9aa4a5d25ae6608536a56d549b82b3dc9 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Sat, 9 Feb 2013 18:18:26 +0000
Subject: * Update MSVC project file * Add /msvc/strfsav* and *.pcx to ignore
 list * Fix for Strife crushAndRaise, silentCrushAndRaise types identified by 
  Gez and verified with the disassembly - these types do not inflict  
 crushing damage in Strife.

Subversion-branch: /branches/v2-branch
Subversion-revision: 2558
---
 src/strife/p_ceilng.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/strife/p_ceilng.c')

diff --git a/src/strife/p_ceilng.c b/src/strife/p_ceilng.c
index ec07eeaf..fce4dce2 100644
--- a/src/strife/p_ceilng.c
+++ b/src/strife/p_ceilng.c
@@ -169,6 +169,7 @@ void T_MoveCeiling (ceiling_t* ceiling)
 // * Fast crushers were made 2x as fast.
 // * lowerAndCrush was apparently "fixed" to actually crush, and was also
 //   altered to lower all the way to the floor rather than remain 8 above.
+// * silentCrushAndRaise and crushAndRaise no longer crush.
 int
 EV_DoCeiling
 ( line_t*       line,
@@ -231,7 +232,10 @@ EV_DoCeiling
 
         case silentCrushAndRaise:
         case crushAndRaise:
-            ceiling->crush = true;
+            // [STRIFE] haleyjd 20130209: Turns out these types do NOT crush
+            // in Strife... yeah, that makes a lot of sense. Thanks to Gez for
+            // having detected this difference.
+            //ceiling->crush = true;
             ceiling->topheight = sec->ceilingheight;
 
         case lowerToFloor:
-- 
cgit v1.2.3