OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed the optional MAPINFO data handler and moved the 3 items still using it to the main parser file.

Browse source 
This thing made sense when GZDoom and ZDoom were separate projects to avoid having to change some core files for the added options.
Now, with only 3 ones remaining, one for FraggleScript and two for Extradata the overhead here is just too high. The 3 variables can just be moved to level_info_t without carrying along this much baggage.
This commit is contained in:
Christoph Oelckers 2018-12-27 17:38:11 +01:00
commit 6ae417725f
7 changed files with 38 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/fragglescript/t_func.cpp
View file

@ -887,7 +887,7 @@ void FParser::SF_Spawn(void)
{
t_return.value.mobj->Angles.Yaw = angle;
if (!DFraggleThinker::ActiveThinker->nocheckposition)
if (!level.info->fs_nocheckposition)
{
if (!P_TestMobjLocation(t_return.value.mobj))
{
@ -3724,19 +3724,7 @@ void FParser::SF_SetColor(void)
FSSectorTagIterator itr(tagnum);
while ((i = itr.Next()) >= 0)
{
if (!DFraggleThinker::ActiveThinker->setcolormaterial)
{
level.sectors[i].SetColor(color, 0);
}
else
{
// little hack for testing the D64 color stuff.
for (int j = 0; j < 4; j++) level.sectors[i].SetSpecialColor(j, color);
// simulates 'nocoloredspritelighting' settings.
int v = (color.r + color.g + color.b) / 3;
v = (255 + v + v) / 3;
level.sectors[i].SetSpecialColor(sector_t::sprites, v, v, v);
}
level.sectors[i].SetColor(color, 0);
}
}
}