OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- refactored global sides array to be more VM friendly.

Browse source 
- moved FLevelLocals to its own header to resolve some circular include conflicts.
This commit is contained in:
Christoph Oelckers 2017-01-08 18:45:30 +01:00
commit cd7986b1b1
117 changed files with 354 additions and 251 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/dobjgc.cpp
View file

@ -77,6 +77,7 @@
#include "r_utility.h"
#include "menu/menu.h"
#include "intermission/intermission.h"
#include "g_levellocals.h"
// MACROS ------------------------------------------------------------------
@ -709,15 +710,15 @@ size_t DSectorMarker::PropagateMark()
moretodo = true;
}
}
if (!moretodo && sides != NULL)
if (!moretodo && level.sides.Size() > 0)
{
for (i = 0; i < SIDEDEFSTEPSIZE && SideNum + i < numsides; ++i)
for (i = 0; i < SIDEDEFSTEPSIZE && SideNum + i < (int)level.sides.Size(); ++i)
{
side_t *side = &sides[SideNum + i];
side_t *side = &level.sides[SideNum + i];
for(int j=0;j<3;j++) GC::Mark(side->textures[j].interpolation);
}
marked += i * sizeof(side_t);
if (SideNum + i < numsides)
if (SideNum + i < (int)level.sides.Size())
{
SideNum += i;
moretodo = true;