AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-25 13:55:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

use MAPNAME() more consistently (#836)

Browse Source
This commit is contained in:
Fabian Greffrath 2022-12-09 12:35:44 +01:00 committed by GitHub
parent fa2398109e
commit 2b6ddd69ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/g_game.c
View File

@ -1207,15 +1207,7 @@ static void G_WriteLevelStat(void)
} }
} }
if (gamemode == commercial) strcpy(levelString, MAPNAME(gameepisode, gamemap));
{
M_snprintf(levelString, sizeof(levelString), "MAP%02d", gamemap);
}
else
{
M_snprintf(levelString, sizeof(levelString), "E%dM%d",
gameepisode, gamemap);
}
G_FormatLevelStatTime(levelTimeString, leveltime); G_FormatLevelStatTime(levelTimeString, leveltime);
G_FormatLevelStatTime(totalTimeString, totalleveltimes + leveltime); G_FormatLevelStatTime(totalTimeString, totalleveltimes + leveltime);
@ -1854,10 +1846,7 @@ static uint64_t G_Signature(int sig_epi, int sig_map)
int lump, i; int lump, i;
char name[9]; char name[9];
if (gamemode == commercial) strcpy(name, MAPNAME(sig_epi, sig_map));
sprintf(name, "map%02d", sig_map);
else
sprintf(name, "E%dM%d", sig_epi, sig_map);
lump = W_CheckNumForName(name); lump = W_CheckNumForName(name);
@ -3144,10 +3133,7 @@ mapentry_t *G_LookupMapinfo(int episode, int map)
int i; int i;
char lumpname[9]; char lumpname[9];
if (gamemode == commercial) strcpy(lumpname, MAPNAME(episode, map));
M_snprintf(lumpname, 9, "MAP%02d", map);
else
M_snprintf(lumpname, 9, "E%dM%d", episode, map);
for (i = 0; i < U_mapinfo.mapcount; i++) for (i = 0; i < U_mapinfo.mapcount; i++)
{ {
@ -3181,14 +3167,13 @@ int G_ValidateMapName(const char *mapname, int *pEpi, int *pMap)
{ {
if (sscanf(mapuname, "E%dM%d", &epi, &map) != 2) if (sscanf(mapuname, "E%dM%d", &epi, &map) != 2)
return 0; return 0;
M_snprintf(lumpname, 9, "E%dM%d", epi, map); strcpy(lumpname, MAPNAME(epi, map));
} }
else else
{ {
if (sscanf(mapuname, "MAP%d", &map) != 1) if (sscanf(mapuname, "MAP%d", &map) != 1)
return 0; return 0;
M_snprintf(lumpname, 9, "MAP%02d", map); strcpy(lumpname, MAPNAME(epi = 1, map));
epi = 1;
} }
if (epi > 4) if (epi > 4)

5
src/p_setup.c
View File

@ -1549,10 +1549,7 @@ void P_SetupLevel(int episode, int map, int playermask, skill_t skill)
// W_Reload (); killough 1/31/98: W_Reload obsolete // W_Reload (); killough 1/31/98: W_Reload obsolete
// find map name // find map name
if (gamemode == commercial) strcpy(lumpname, MAPNAME(episode, map));
sprintf(lumpname, "MAP%02d", map); // killough 1/24/98: simplify
else
sprintf(lumpname, "E%dM%d", episode, map); // killough 1/24/98: simplify
lumpnum = W_GetNumForName(lumpname); lumpnum = W_GetNumForName(lumpname);