OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- store the index of each map item in the struct itself and return that for the Index function.

Browse source 
If we ever want to refactor the global level data these must not reference the 'level' variable.
The main parts of the map loader cannot use this information, because it can only be created after running the node builder, so it got its own set of index functions instead.
This commit is contained in:
Christoph Oelckers 2019-01-06 00:41:46 +01:00
commit 8b18ed4759
11 changed files with 150 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/scripting/vmthunks.cpp
View file

@ -1154,9 +1154,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(_Sector, RemoveForceField, RemoveForceField)
static int SectorIndex(sector_t *self)
{
unsigned ndx = self->Index();
if (ndx >= level.sectors.Size()) return -1; // This must not throw because it is the only means to check that the given pointer is valid.
return ndx;
return self->Index();
}
DEFINE_ACTION_FUNCTION_NATIVE(_Sector, Index, SectorIndex)
@ -1295,12 +1293,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(_Sector, RemoveForceField, RemoveForceField)
static int LineIndex(line_t *self)
{
unsigned ndx = self->Index();
if (ndx >= level.lines.Size())
{
return -1;
}
return ndx;
return self->Index();
}
DEFINE_ACTION_FUNCTION_NATIVE(_Line, Index, LineIndex)
@ -1594,12 +1587,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(_Sector, RemoveForceField, RemoveForceField)
static int SideIndex(side_t *self)
{
unsigned ndx = self->Index();
if (ndx >= level.sides.Size())
{
return -1;
}
return ndx;
return self->Index();
}
DEFINE_ACTION_FUNCTION_NATIVE(_Side, Index, SideIndex)
@ -1616,12 +1604,7 @@ DEFINE_ACTION_FUNCTION_NATIVE(_Sector, RemoveForceField, RemoveForceField)
static int VertexIndex(vertex_t *self)
{
unsigned ndx = self->Index();
if (ndx >= level.vertexes.Size())
{
return -1;
}
return ndx;
return self->Index();
}
DEFINE_ACTION_FUNCTION_NATIVE(_Vertex, Index, VertexIndex)