lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move the global taglist init functionality to the taglist files.

Browse source
This commit is contained in:
Nev3r 2020-04-17 11:43:37 +02:00
parent 209b8e7678
commit b690d35a99
3 changed files with 32 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/p_spec.c
View file

@ -1445,7 +1445,6 @@ void P_RunNightsCapsuleTouchExecutors(mobj_t *actor, boolean entering, boolean e
static inline void P_InitTagLists(void) static inline void P_InitTagLists(void)
{ {
register size_t i; register size_t i;
size_t j;
for (i = numsectors - 1; i != (size_t)-1; i--) for (i = numsectors - 1; i != (size_t)-1; i--)
{ {
@ -1461,27 +1460,7 @@ static inline void P_InitTagLists(void)
lines[j].firsttag = (INT32)i; lines[j].firsttag = (INT32)i;
} }
for (i = 0; i < MAXTAGS; i++) Taglist_InitGlobalTables();
{
tags_sectors[i] = NULL;
tags_lines[i] = NULL;
tags_mapthings[i] = NULL;
}
for (i = 0; i < numsectors; i++)
{
for (j = 0; j < sectors[i].tags.count; j++)
Taglist_AddToSectors(sectors[i].tags.tags[j], i);
}
for (i = 0; i < numlines; i++)
{
for (j = 0; j < lines[i].tags.count; j++)
Taglist_AddToLines(lines[i].tags.tags[j], i);
}
for (i = 0; i < nummapthings; i++)
{
for (j = 0; j < mapthings[i].tags.count; j++)
Taglist_AddToMapthings(mapthings[i].tags.tags[j], i);
}
} }
/** Finds minimum light from an adjacent sector. /** Finds minimum light from an adjacent sector.

33
src/taglist.c
View file

@ -63,7 +63,7 @@ boolean Tag_Compare (const taglist_t* list1, const taglist_t* list2)
return true; return true;
} }
void Taglist_AddToSectors (const mtag_t tag, const size_t itemid) static void Taglist_AddToSectors (const mtag_t tag, const size_t itemid)
{ {
taggroup_t* tagelems; taggroup_t* tagelems;
@ -79,7 +79,7 @@ void Taglist_AddToSectors (const mtag_t tag, const size_t itemid)
tagelems->elements[tagelems->count - 1] = itemid; tagelems->elements[tagelems->count - 1] = itemid;
} }
void Taglist_AddToLines (const mtag_t tag, const size_t itemid) static void Taglist_AddToLines (const mtag_t tag, const size_t itemid)
{ {
taggroup_t* tagelems; taggroup_t* tagelems;
@ -95,7 +95,7 @@ void Taglist_AddToLines (const mtag_t tag, const size_t itemid)
tagelems->elements[tagelems->count - 1] = itemid; tagelems->elements[tagelems->count - 1] = itemid;
} }
void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid) static void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid)
{ {
taggroup_t* tagelems; taggroup_t* tagelems;
@ -111,6 +111,33 @@ void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid)
tagelems->elements[tagelems->count - 1] = itemid; tagelems->elements[tagelems->count - 1] = itemid;
} }
void Taglist_InitGlobalTables(void)
{
size_t i, j;
for (i = 0; i < MAXTAGS; i++)
{
tags_sectors[i] = NULL;
tags_lines[i] = NULL;
tags_mapthings[i] = NULL;
}
for (i = 0; i < numsectors; i++)
{
for (j = 0; j < sectors[i].tags.count; j++)
Taglist_AddToSectors(sectors[i].tags.tags[j], i);
}
for (i = 0; i < numlines; i++)
{
for (j = 0; j < lines[i].tags.count; j++)
Taglist_AddToLines(lines[i].tags.tags[j], i);
}
for (i = 0; i < nummapthings; i++)
{
for (j = 0; j < mapthings[i].tags.count; j++)
Taglist_AddToMapthings(mapthings[i].tags.tags[j], i);
}
}
INT32 Tag_Iterate_Sectors (const mtag_t tag, const size_t p) INT32 Tag_Iterate_Sectors (const mtag_t tag, const size_t p)
{ {
if (tag == MTAG_GLOBAL) if (tag == MTAG_GLOBAL)

4
src/taglist.h
View file

@ -33,9 +33,7 @@ taggroup_t* tags_sectors[MAXTAGS + 1];
taggroup_t* tags_lines[MAXTAGS + 1]; taggroup_t* tags_lines[MAXTAGS + 1];
taggroup_t* tags_mapthings[MAXTAGS + 1]; taggroup_t* tags_mapthings[MAXTAGS + 1];
void Taglist_AddToSectors (const mtag_t tag, const size_t itemid); void Taglist_InitGlobalTables(void);
void Taglist_AddToLines (const mtag_t tag, const size_t itemid);
void Taglist_AddToMapthings (const mtag_t tag, const size_t itemid);
INT32 Tag_Iterate_Sectors (const mtag_t tag, const size_t p); INT32 Tag_Iterate_Sectors (const mtag_t tag, const size_t p);
INT32 Tag_Iterate_Lines (const mtag_t tag, const size_t p); INT32 Tag_Iterate_Lines (const mtag_t tag, const size_t p);