zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Retain the Scroll_Texture_(Left|Right|Up|Down) specials on lines for the sake of 

compat_useblocking. This is not going to be extended to all specials that spawn a thinker at
  load time, because some of them can be placed on a line later using SetLineSpecial and used
  directly.

SVN r4037 (trunk)
This commit is contained in:
Randy Heit 2013-01-23 04:11:19 +00:00
parent 11862ac06b
commit 10e185a6e3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/p_spec.cpp
View File

@ -1837,24 +1837,28 @@ static void P_SpawnScrollers(void)
break; break;
case Scroll_Texture_Left: case Scroll_Texture_Left:
l->special = special; // Restore the special, for compat_useblocking's benefit.
s = int(lines[i].sidedef[0] - sides); s = int(lines[i].sidedef[0] - sides);
new DScroller (DScroller::sc_side, l->args[0] * (FRACUNIT/64), 0, new DScroller (DScroller::sc_side, l->args[0] * (FRACUNIT/64), 0,
-1, s, accel, SCROLLTYPE(l->args[1])); -1, s, accel, SCROLLTYPE(l->args[1]));
break; break;
case Scroll_Texture_Right: case Scroll_Texture_Right:
l->special = special;
s = int(lines[i].sidedef[0] - sides); s = int(lines[i].sidedef[0] - sides);
new DScroller (DScroller::sc_side, l->args[0] * (-FRACUNIT/64), 0, new DScroller (DScroller::sc_side, l->args[0] * (-FRACUNIT/64), 0,
-1, s, accel, SCROLLTYPE(l->args[1])); -1, s, accel, SCROLLTYPE(l->args[1]));
break; break;
case Scroll_Texture_Up: case Scroll_Texture_Up:
l->special = special;
s = int(lines[i].sidedef[0] - sides); s = int(lines[i].sidedef[0] - sides);
new DScroller (DScroller::sc_side, 0, l->args[0] * (FRACUNIT/64), new DScroller (DScroller::sc_side, 0, l->args[0] * (FRACUNIT/64),
-1, s, accel, SCROLLTYPE(l->args[1])); -1, s, accel, SCROLLTYPE(l->args[1]));
break; break;
case Scroll_Texture_Down: case Scroll_Texture_Down:
l->special = special;
s = int(lines[i].sidedef[0] - sides); s = int(lines[i].sidedef[0] - sides);
new DScroller (DScroller::sc_side, 0, l->args[0] * (-FRACUNIT/64), new DScroller (DScroller::sc_side, 0, l->args[0] * (-FRACUNIT/64),
-1, s, accel, SCROLLTYPE(l->args[1])); -1, s, accel, SCROLLTYPE(l->args[1]));