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

Make the macros and their usage relatively cleaner.

This commit is contained in:
Nev3r 2020-04-13 13:09:58 +02:00
parent 0d1f898869
commit de07c04f5c
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/p_spec.c
View File

@ -7502,12 +7502,12 @@ void P_SpawnSpecials(boolean fromnetsave)
*/ */
static void P_AddFakeFloorsByLine(size_t line, ffloortype_e ffloorflags, thinkerlist_t *secthinkers) static void P_AddFakeFloorsByLine(size_t line, ffloortype_e ffloorflags, thinkerlist_t *secthinkers)
{ {
TAG_ITER_C
INT32 s; INT32 s;
size_t sec = sides[*lines[line].sidenum].sector-sectors; size_t sec = sides[*lines[line].sidenum].sector-sectors;
line_t* li = lines + line; line_t* li = lines + line;
TAG_ITER_SECTORS(li->tag, s) TAG_ITER_SECTORS(li->tag, s)
P_AddFakeFloor(&sectors[s], &sectors[sec], li, ffloorflags, secthinkers); P_AddFakeFloor(&sectors[s], &sectors[sec], li, ffloorflags, secthinkers);
TAG_ITER_END
} }
/* /*

29
src/taglist.h
View File

@ -29,25 +29,14 @@ void Taglist_AddToLines (const size_t tag, const size_t itemid);
void Taglist_AddToMapthings (const size_t tag, const size_t itemid); void Taglist_AddToMapthings (const size_t tag, const size_t itemid);
#endif //__R_TAGLIST__ #endif //__R_TAGLIST__
#define TAG_ITER_SECTORS(tag, sc)\ #define TAG_ITER_C size_t kkkk;
if(tags_sectors[tag])\
{ size_t kk;\
for(kk = 0, sc = tags_sectors[tag]->elements[0];\
kk < tags_sectors[tag]->count;\
sc = tags_sectors[tag]->elements[++kk])
#define TAG_ITER_LINES(tag, li)\ #define TAG_ITER(group, tag, id)\
if(tags_lines[tag])\ if (group[tag])\
{ size_t kk;\ for(id = group[tag]->elements[kkkk = 0] = 0;\
for(kk = 0, li = tags_lines[tag]->elements[0];\ kkkk < group[tag]->count;\
kk < tags_lines[tag]->count;\ id = group[tag]->elements[++kkkk])
li = tags_lines[tag]->elements[++kk])
#define TAG_ITER_THINGS(tag, mt)\ #define TAG_ITER_SECTORS(tag, id) TAG_ITER(tags_sectors, tag, id)
if(tags_mapthings[tag])\ #define TAG_ITER_LINES(tag, id) TAG_ITER(tags_lines, tag, id)
{ size_t kk;\ #define TAG_ITER_THINGS(tag, id) TAG_ITER(tags_mapthings, tag, id)
for(kk = 0, mt = tags_mapthings[tag]->elements[0];\
kk < tags_mapthings[tag]->count;\
mt = tags_mapthings[tag]->elements[++kk])
#define TAG_ITER_END }