OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- major cleanup of p_scroll.cpp to eliminate the use of indices to access sidedefs and sectors.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-06 12:41:02 +01:00
commit 4de649d4d1
5 changed files with 141 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/p_lnspec.cpp
View file

@ -2287,8 +2287,8 @@ FUNC(LS_Sector_SetLink)
return false;
}
void SetWallScroller(int id, int sidechoice, double dx, double dy, EScrollPos Where);
void SetScroller(int tag, EScroll type, double dx, double dy);
void SetWallScroller(FLevelLocals *Level, int id, int sidechoice, double dx, double dy, EScrollPos Where);
void SetScroller(FLevelLocals *Level, int tag, EScroll type, double dx, double dy);
FUNC(LS_Scroll_Texture_Both)
@ -2311,7 +2311,7 @@ FUNC(LS_Scroll_Texture_Both)
sidechoice = 0;
}
SetWallScroller (arg0, sidechoice, dx, dy, scw_all);
SetWallScroller (&level, arg0, sidechoice, dx, dy, scw_all);
return true;
}
@ -2322,7 +2322,7 @@ FUNC(LS_Scroll_Wall)
if (arg0 == 0)
return false;
SetWallScroller (arg0, !!arg3, arg1 / 65536., arg2 / 65536., EScrollPos(arg4));
SetWallScroller (&level, arg0, !!arg3, arg1 / 65536., arg2 / 65536., EScrollPos(arg4));
return true;
}
@ -2338,19 +2338,19 @@ FUNC(LS_Scroll_Floor)
if (arg3 == 0 || arg3 == 2)
{
SetScroller (arg0, EScroll::sc_floor, -dx, dy);
SetScroller (&level, arg0, EScroll::sc_floor, -dx, dy);
}
else
{
SetScroller (arg0, EScroll::sc_floor, 0, 0);
SetScroller (&level, arg0, EScroll::sc_floor, 0, 0);
}
if (arg3 > 0)
{
SetScroller (arg0, EScroll::sc_carry, dx, dy);
SetScroller (&level, arg0, EScroll::sc_carry, dx, dy);
}
else
{
SetScroller (arg0, EScroll::sc_carry, 0, 0);
SetScroller (&level, arg0, EScroll::sc_carry, 0, 0);
}
return true;
}
@ -2361,7 +2361,7 @@ FUNC(LS_Scroll_Ceiling)
double dx = arg1 / 32.;
double dy = arg2 / 32.;
SetScroller (arg0, EScroll::sc_ceiling, -dx, dy);
SetScroller (&level, arg0, EScroll::sc_ceiling, -dx, dy);
return true;
}