vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

...completely misunderstood the reasons we weren't merging toast_slopes, mom holy fuck i'm stupid and bad 

Enjoy your slopes without physics, people :D
This commit is contained in:
toasterbabe 2016-06-20 00:20:20 +01:00
parent 86721f1457
commit 71f5d4ea85
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/f_finale.c
View File

@ -973,7 +973,6 @@ static const char *credits[] = {
"Callum Dickinson",
"Scott \"Graue\" Feeney",
"Nathan \"Jazz\" Giroux",
"Vivian \"toaster\" Grannell",
"Thomas \"Shadow Hog\" Igoe",
"\"Monster\" Iestyn Jealous",
"Ronald \"Furyhunter\" Kinard", // The SDL2 port
@ -987,6 +986,7 @@ static const char *credits[] = {
"\"chi.miru\"", // Red's secret weapon, the REAL reason slopes exist (also helped port drawing code from ZDoom)
"Andrew \"orospakr\" Clunis",
"Gregor \"Oogaland\" Dick",
"Vivian \"toaster\" Grannell",
"Julio \"Chaos Zero 64\" Guir",
"\"Kalaron\"", // Coded some of Sryder13's collection of OpenGL fixes, especially fog
"Matthew \"Shuffle\" Marsalko",

8
src/p_slopes.c
View File

@ -249,8 +249,8 @@ void P_SpawnSlope_Line(int linenum)
boolean backceil = (special == 711 || special == 712 || special == 703);
UINT8 flags = 0; // Slope flags
/*if (line->flags & ML_NOSONIC)
flags |= SL_NOPHYSICS; - disabled for 2.1*/
if (line->flags & ML_NOSONIC)
flags |= SL_NOPHYSICS;
if (line->flags & ML_NOTAILS)
flags |= SL_NODYNAMIC;
if (line->flags & ML_NOKNUX)
@ -685,8 +685,8 @@ void P_ResetDynamicSlopes(void) {
size_t which = lines[i].special;
UINT8 flags = SL_VERTEXSLOPE;
/*if (line->flags & ML_NOSONIC)
flags |= SL_NOPHYSICS; - disabled for 2.1*/
if (lines[i].flags & ML_NOSONIC)
flags |= SL_NOPHYSICS;
if (!(lines[i].flags & ML_NOTAILS))
flags |= SL_NODYNAMIC;