mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-26 03:30:46 +00:00
TROR: when clearing bunch number of c/f with yax_setbunch(), don't reset xpanning.
In the non-Lunatic build naturally, since the Lunatic one uses its own member. git-svn-id: https://svn.eduke32.com/eduke32@4275 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
62abd504ef
commit
63e0de5e3d
3 changed files with 4 additions and 6 deletions
|
@ -9830,10 +9830,7 @@ static int16_t whitelinescan(int16_t sucksect, int16_t dalinehighlight)
|
||||||
wall[i].point2 = i+1;
|
wall[i].point2 = i+1;
|
||||||
wall[tnewnumwalls-1].point2 = numwalls;
|
wall[tnewnumwalls-1].point2 = numwalls;
|
||||||
|
|
||||||
if (clockdir(numwalls) == CLOCKDIR_CCW)
|
return (clockdir(numwalls) == CLOCKDIR_CCW) ? -1 : tnewnumwalls;
|
||||||
return(-1);
|
|
||||||
else
|
|
||||||
return(tnewnumwalls);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t loadnames(const char *namesfile, int8_t root)
|
int32_t loadnames(const char *namesfile, int8_t root)
|
||||||
|
|
|
@ -446,7 +446,9 @@ void yax_setbunch(int16_t i, int16_t cf, int16_t bunchnum)
|
||||||
|
|
||||||
#if !defined NEW_MAP_FORMAT
|
#if !defined NEW_MAP_FORMAT
|
||||||
*(§or[i].ceilingstat + cf) &= ~YAX_BIT;
|
*(§or[i].ceilingstat + cf) &= ~YAX_BIT;
|
||||||
YAX_BUNCHNUM(i, cf) = 0;
|
// NOTE: Don't reset xpanning-as-index, since we can be called from
|
||||||
|
// e.g. Mapster32's "Inner loop made into new sector" functionality.
|
||||||
|
// YAX_BUNCHNUM(i, cf) = 0;
|
||||||
#else
|
#else
|
||||||
YAX_BUNCHNUM(i, cf) = -1;
|
YAX_BUNCHNUM(i, cf) = -1;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -2203,7 +2203,6 @@ local handle =
|
||||||
end,
|
end,
|
||||||
|
|
||||||
-- <fmt>: format string, number of %s's must match number of varargs
|
-- <fmt>: format string, number of %s's must match number of varargs
|
||||||
-- <umask>: number, if 2^i is set, arg '%i' must not be a system gamearray
|
|
||||||
arraycmd = function(fmt, dstargi, ...)
|
arraycmd = function(fmt, dstargi, ...)
|
||||||
local args = {...}
|
local args = {...}
|
||||||
if (issysgar(args[dstargi])) then
|
if (issysgar(args[dstargi])) then
|
||||||
|
|
Loading…
Reference in a new issue