diff --git a/src/p_saveg.c b/src/p_saveg.c
index aee160859b53c6531e71334aa1f2f24728b98dfd..be2763f279259eb85aa9603badee8c7572468a5a 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -2867,6 +2867,10 @@ static thinker_t* LoadBounceCheeseThinker(actionf_p1 thinker)
ht->floorwasheight = READFIXED(save_p);
ht->ceilingwasheight = READFIXED(save_p);
ht->low = READCHAR(save_p);
+
+ if (ht->sector)
+ ht->sector->ceilingdata = ht;
+
return &ht->thinker;
}
@@ -2884,6 +2888,13 @@ static thinker_t* LoadContinuousFallThinker(actionf_p1 thinker)
ht->floorstartheight = READFIXED(save_p);
ht->ceilingstartheight = READFIXED(save_p);
ht->destheight = READFIXED(save_p);
+
+ if (ht->sector)
+ {
+ ht->sector->ceilingdata = ht;
+ ht->sector->floordata = ht;
+ }
+
return &ht->thinker;
}
@@ -2901,6 +2912,13 @@ static thinker_t* LoadMarioBlockThinker(actionf_p1 thinker)
ht->floorstartheight = READFIXED(save_p);
ht->ceilingstartheight = READFIXED(save_p);
ht->tag = READINT16(save_p);
+
+ if (ht->sector)
+ {
+ ht->sector->ceilingdata = ht;
+ ht->sector->floordata = ht;
+ }
+
return &ht->thinker;
}
@@ -2935,6 +2953,13 @@ static thinker_t* LoadThwompThinker(actionf_p1 thinker)
ht->delay = READINT32(save_p);
ht->tag = READINT16(save_p);
ht->sound = READUINT16(save_p);
+
+ if (ht->sector)
+ {
+ ht->sector->ceilingdata = ht;
+ ht->sector->floordata = ht;
+ }
+
return &ht->thinker;
}
diff --git a/src/p_spec.c b/src/p_spec.c
index e84619c7fd0897dbc3b5e3c4f18cfcda3d586486..88a1bee900738fdbe8b30fc5c3878e5a78a94129 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -6042,7 +6042,7 @@ static void P_AddBlockThinker(sector_t *sec, line_t *sourceline)
* \sa P_SpawnSpecials, T_RaiseSector
* \author SSNTails <http://www.ssntails.org>
*/
-static void P_AddRaiseThinker(sector_t *sec, line_t *sourceline, boolean lower, boolean spindash)
+static void P_AddRaiseThinker(sector_t *sec, line_t *sourceline, fixed_t speed, fixed_t ceilingtop, fixed_t ceilingbottom, boolean lower, boolean spindash)
{
raise_t *raise;
@@ -6054,10 +6054,10 @@ static void P_AddRaiseThinker(sector_t *sec, line_t *sourceline, boolean lower,
raise->sourceline = sourceline;
raise->sector = sec;
- raise->ceilingtop = P_FindHighestCeilingSurrounding(sec);
- raise->ceilingbottom = P_FindLowestCeilingSurrounding(sec);
+ raise->ceilingtop = ceilingtop;
+ raise->ceilingbottom = ceilingbottom;
- raise->basespeed = FixedDiv(P_AproxDistance(sourceline->dx, sourceline->dy), 4*FRACUNIT);
+ raise->basespeed = speed;
if (lower)
raise->flags |= RF_REVERSE;
@@ -6892,7 +6892,6 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
case 153: // Dynamic Sinking Platform
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- lines[i].flags |= ML_BLOCKMONSTERS;
P_AddAirbob(lines[i].frontsector, lines + i, P_AproxDistance(lines[i].dx, lines[i].dy), false, !!(lines[i].flags & ML_NOCLIMB), true);
break;
@@ -6966,44 +6965,32 @@ void P_SpawnSpecials(boolean fromnetsave)
break;
case 190: // Rising Platform FOF (solid, opaque, shadows)
- P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_CUTLEVEL, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i], !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
- break;
-
case 191: // Rising Platform FOF (solid, opaque, no shadows)
- P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_NOSHADE|FF_CUTLEVEL, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i], !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
- break;
-
case 192: // Rising Platform TL block: FOF (solid, translucent)
- P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_NOSHADE|FF_TRANSLUCENT|FF_EXTRA|FF_CUTEXTRA, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i], !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
- break;
-
case 193: // Rising Platform FOF (solid, invisible)
- P_AddFakeFloorsByLine(i, FF_EXISTS|FF_SOLID|FF_NOSHADE, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i], !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
- break;
-
case 194: // Rising Platform 'Platform' - You can jump up through it
- // If line has no-climb set, don't give it shadows, otherwise do
- ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_PLATFORM|FF_BOTHPLANES|FF_ALLSIDES;
- if (lines[i].flags & ML_NOCLIMB)
- ffloorflags |= FF_NOSHADE;
-
- P_AddFakeFloorsByLine(i, ffloorflags, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i], !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
- break;
-
case 195: // Rising Platform Translucent "platform"
- // If line has no-climb set, don't give it shadows, otherwise do
- ffloorflags = FF_EXISTS|FF_SOLID|FF_RENDERALL|FF_PLATFORM|FF_TRANSLUCENT|FF_BOTHPLANES|FF_ALLSIDES|FF_EXTRA|FF_CUTEXTRA;
- if (lines[i].flags & ML_NOCLIMB)
+ {
+ fixed_t speed = FixedDiv(P_AproxDistance(lines[i].dx, lines[i].dy), 4*FRACUNIT);
+ fixed_t ceilingtop = P_FindHighestCeilingSurrounding(lines[i].frontsector);
+ fixed_t ceilingbottom = P_FindLowestCeilingSurrounding(lines[i].frontsector);
+
+ ffloorflags = FF_EXISTS|FF_SOLID;
+ if (lines[i].special != 193)
+ ffloorflags |= FF_RENDERALL;
+ if (lines[i].special <= 191)
+ ffloorflags |= FF_CUTLEVEL;
+ if (lines[i].special == 192 || lines[i].special == 195)
+ ffloorflags |= FF_TRANSLUCENT|FF_EXTRA|FF_CUTEXTRA;
+ if (lines[i].special >= 194)
+ ffloorflags |= FF_PLATFORM|FF_BOTHPLANES|FF_ALLSIDES;
+ if (lines[i].special != 190 && (lines[i].special <= 193 || lines[i].flags & ML_NOCLIMB))
ffloorflags |= FF_NOSHADE;
-
P_AddFakeFloorsByLine(i, ffloorflags, secthinkers);
- P_AddRaiseThinker(lines[i].frontsector, &lines[i], !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
+
+ P_AddRaiseThinker(lines[i].frontsector, &lines[i], speed, ceilingtop, ceilingbottom, !!(lines[i].flags & ML_BLOCKMONSTERS), !!(lines[i].flags & ML_NOCLIMB));
break;
+ }
case 200: // Double light effect
P_AddFakeFloorsByLine(i, FF_EXISTS|FF_CUTSPRITES|FF_DOUBLESHADOW, secthinkers);
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index c042d141c10362f1ef643ed844a8e31d6bc2d176..ec7bfc1c4573776d438baf27fe1f388f838869c0 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -372,7 +372,9 @@ static boolean IgnoreMouse(void)
return false;
if (menuactive)
return !M_MouseNeeded();
- if (paused || con_destlines || chat_on || gamestate != GS_LEVEL)
+ if (paused || con_destlines || chat_on)
+ return true;
+ if (gamestate != GS_LEVEL && gamestate != GS_INTERMISSION && gamestate != GS_CUTSCENE)
return true;
return false;
}