summaryrefslogtreecommitdiff
path: root/src/doom/p_floor.c
diff options
context:
space:
mode:
authorFabian Greffrath2015-03-26 16:31:57 +0100
committerFabian Greffrath2015-03-26 16:31:57 +0100
commit27b5915111ffbdae97ce0c415157e104ee6f3493 (patch)
tree850fc62208b642b07047e0a9ea968c365d4dfd1f /src/doom/p_floor.c
parent350ac122030d198b187255b19b2519ef8267364a (diff)
parentad027ef6dbfeebabe0e6701eec968e9d474e497f (diff)
downloadchocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.tar.gz
chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.tar.bz2
chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.zip
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom into hexndemo
Diffstat (limited to 'src/doom/p_floor.c')
-rw-r--r--src/doom/p_floor.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/doom/p_floor.c b/src/doom/p_floor.c
index 1384ee6b..c120d616 100644
--- a/src/doom/p_floor.c
+++ b/src/doom/p_floor.c
@@ -493,6 +493,9 @@ EV_BuildStairs
floor->speed = speed;
height = sec->floorheight + stairsize;
floor->floordestheight = height;
+ // Initialize
+ floor->type = lowerFloor;
+ floor->crush = true;
texture = sec->floorpic;
@@ -536,6 +539,9 @@ EV_BuildStairs
floor->sector = sec;
floor->speed = speed;
floor->floordestheight = height;
+ // Initialize
+ floor->type = lowerFloor;
+ floor->crush = true;
ok = 1;
break;
}