summaryrefslogtreecommitdiff
path: root/src/strife
diff options
context:
space:
mode:
authorJames Haley2013-02-09 18:18:26 +0000
committerJames Haley2013-02-09 18:18:26 +0000
commite20874a9aa4a5d25ae6608536a56d549b82b3dc9 (patch)
treecfe4f0ea850b54ed8311819862f5ea6b927f9928 /src/strife
parent2bc56af7010e7f40d94dd664b51d86cfd4bd5fc8 (diff)
downloadchocolate-doom-e20874a9aa4a5d25ae6608536a56d549b82b3dc9.tar.gz
chocolate-doom-e20874a9aa4a5d25ae6608536a56d549b82b3dc9.tar.bz2
chocolate-doom-e20874a9aa4a5d25ae6608536a56d549b82b3dc9.zip
* 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
Diffstat (limited to 'src/strife')
-rw-r--r--src/strife/p_ceilng.c6
1 files changed, 5 insertions, 1 deletions
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: