diff --git a/source/src/tools.cpp b/source/src/tools.cpp index fd73bbc5..5d712829 100644 --- a/source/src/tools.cpp +++ b/source/src/tools.cpp @@ -45,7 +45,7 @@ static const uchar transformenttab[] = { /* 16 */ /* CARROT */ NOTUSED, 16, /* 17 */ /* JUMPPAD */ NOTUSED, 17 }; -void transformoldentities(int mapversion, uchar &enttype) +void transformoldentitytypes(int mapversion, uchar &enttype) { const uchar *usetab = transformenttab + (mapversion > 5 ? 1 : 0); if(mapversion < 8 && enttype < 18) enttype = usetab[enttype * 2]; @@ -101,7 +101,7 @@ mapstats *loadmapstats(const char *filename, bool getlayout) { f->read(&e, s.hdr.version < 10 ? 12 : sizeof(persistent_entity)); lilswap((short *)&e, 4); - transformoldentities(s.hdr.version, e.type); + transformoldentitytypes(s.hdr.version, e.type); if(e.type == PLAYERSTART && (e.attr2 == 0 || e.attr2 == 1 || e.attr2 == 100)) s.spawns[e.attr2 == 100 ? 2 : e.attr2]++; if(e.type == CTF_FLAG && (e.attr2 == 0 || e.attr2 == 1)) { s.flags[e.attr2]++; s.flagents[e.attr2] = i; } s.entcnt[e.type]++; diff --git a/source/src/tools.h b/source/src/tools.h index cd1f1455..39ccc923 100644 --- a/source/src/tools.h +++ b/source/src/tools.h @@ -941,7 +941,7 @@ struct stream extern const char *timestring(bool local = false, const char *fmt = NULL); extern const char *asctime(); extern const char *numtime(); -extern void transformoldentities(int mapversion, uchar &enttype); +extern void transformoldentitytypes(int mapversion, uchar &enttype); extern int fixmapheadersize(int version, int headersize); extern char *path(char *s); extern char *path(const char *s, bool copy); diff --git a/source/src/worldio.cpp b/source/src/worldio.cpp index 297fb982..16c0d143 100644 --- a/source/src/worldio.cpp +++ b/source/src/worldio.cpp @@ -709,7 +709,7 @@ bool load_world(char *mname) // still supports all map formats that have if(!e.attr2) e.attr2 = 255; // needed for MAPVERSION<=2 if(e.attr1>32) e.attr1 = 32; // 12_03 and below } - transformoldentities(hdr.version, e.type); + transformoldentitytypes(hdr.version, e.type); if(oldentityformat) { switch(e.type)