From 18361f5ed79279c199fb75be5c3110d5093c4db6 Mon Sep 17 00:00:00 2001 From: spherallic Date: Wed, 2 Feb 2022 23:40:10 +0100 Subject: [PATCH 1/8] Whitelist record attack, NiGHTS mode and SRB2BACK graphics. --- src/w_wad.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/w_wad.c b/src/w_wad.c index e49e0ce82..c5c6592a5 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -2481,9 +2481,15 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error) {"YB_", 3}, // Intermission graphics, goes with the above {"RESULT", 6}, // Used in intermission for competitive modes, above too :3 {"RACE", 4}, // Race mode graphics, 321go + {"SRB2BACK", 8}, // MP intermission background {"M_", 2}, // Menu stuff {"LT", 2}, // Titlecard changes + {"RECATK", 6}, // Record Attack menu + {"RECCLOCK", 8}, + {"NTSATK", 6}, // NiGHTS Mode menu + {"NTSSONC", 7}, + {"SLID", 4}, // Continue {"CONT", 4}, From 61661dc900e8fd7edebb672bb9b55ed50a72e969 Mon Sep 17 00:00:00 2001 From: spherallic Date: Thu, 3 Feb 2022 11:34:05 +0100 Subject: [PATCH 2/8] Whitelist SPECTILE, NGRTIMER, and emblem/emerald hunt radar graphics. --- src/w_wad.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/w_wad.c b/src/w_wad.c index c5c6592a5..85bf0eb3d 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -2477,6 +2477,7 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error) {"STLIVE", 6}, // Life graphics, background and the "X" that shows under skin's HUDNAME {"CROSHAI", 7}, // First person crosshairs {"INTERSC", 7}, // Default intermission backgrounds (co-op) + {"SPECTILE", 8}, // Special stage intermission background {"STT", 3}, // Acceptable HUD changes (Score Time Rings) {"YB_", 3}, // Intermission graphics, goes with the above {"RESULT", 6}, // Used in intermission for competitive modes, above too :3 @@ -2484,6 +2485,8 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error) {"SRB2BACK", 8}, // MP intermission background {"M_", 2}, // Menu stuff {"LT", 2}, // Titlecard changes + {"HOMING", 6}, // Emerald hunt radar + {"HOMITM", 6}, // Emblem radar {"RECATK", 6}, // Record Attack menu {"RECCLOCK", 8}, @@ -2512,6 +2515,7 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error) {"DRILL", 5}, {"GRADE", 5}, {"MINUS5", 6}, + {"NGRTIMER", 8}, // NiGHTS Mode timer {"MUSICDEF", 8}, // Song definitions (thanks kart) {"SHADERS", 7}, // OpenGL shader definitions From 52f3e00497ac020fcc63f50639d4d889138288a6 Mon Sep 17 00:00:00 2001 From: spherallic Date: Thu, 3 Feb 2022 14:38:45 +0100 Subject: [PATCH 3/8] Whitelist CHARFG, CHARFG, and level select graphics. --- src/w_wad.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/w_wad.c b/src/w_wad.c index 85bf0eb3d..eff1899bc 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -2466,6 +2466,10 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error) {"STNONEX", 7}, // "X" graphic {"ULTIMATE", 8}, // Ultimate no-save + {"SLCT", 4}, // Level select "cursor" + {"LSSTATIC", 8}, // Level select static + {"BLANKLV", 7}, // "?" level images + {"CRFNT", 5}, // Sonic 1 font changes {"NTFNT", 5}, // Character Select font changes {"NTFNO", 5}, // Character Select font (outline) @@ -2488,6 +2492,8 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error) {"HOMING", 6}, // Emerald hunt radar {"HOMITM", 6}, // Emblem radar + {"CHARFG", 6}, // Character select menu + {"CHARBG", 6}, {"RECATK", 6}, // Record Attack menu {"RECCLOCK", 8}, {"NTSATK", 6}, // NiGHTS Mode menu From c3001ac42a4385a9392bb26cef9b53e7839d6da6 Mon Sep 17 00:00:00 2001 From: ashi Date: Sat, 30 Apr 2022 14:21:51 +0000 Subject: [PATCH 4/8] Fix description of A_ParentTriesToSleep --- src/p_enemy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_enemy.c b/src/p_enemy.c index 87aa5ff2f..6615fd352 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -12662,7 +12662,7 @@ void A_WhoCaresIfYourSonIsABee(mobj_t *actor) // Function: A_ParentTriesToSleep // -// Description: If extravalue1 is less than or equal to var1, go to var2. +// Description: If extravalue1 is greater than 0 go to var1 // // var1 = state to go to when extravalue1 // var2 = unused From 28bdd7ef00bd9efef93b71a207c458c5bd295ff9 Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Sun, 1 May 2022 19:27:10 +0200 Subject: [PATCH 5/8] Fix size_t compiler warnings in P_WriteTextmap --- src/p_setup.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index ea099e13e..b4fd9cf5e 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2111,31 +2111,31 @@ static void P_WriteTextmap(void) case 1: TAG_ITER_SECTORS(Tag_FGet(&wlines[i].tags), s) { - CONS_Alert(CONS_WARNING, M_GetText("Linedef %d applies custom gravity to sector %d. Changes to this gravity at runtime will not be reflected in the converted map. Use linedef type 469 for this.\n"), i, s); + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s applies custom gravity to sector %d. Changes to this gravity at runtime will not be reflected in the converted map. Use linedef type 469 for this.\n"), sizeu1(i), s); wsectors[s].gravity = FixedDiv(lines[i].frontsector->floorheight >> FRACBITS, 1000); } break; case 2: - CONS_Alert(CONS_WARNING, M_GetText("Custom exit linedef %d detected. Changes to the next map at runtime will not be reflected in the converted map. Use linedef type 468 for this.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Custom exit linedef %s detected. Changes to the next map at runtime will not be reflected in the converted map. Use linedef type 468 for this.\n"), sizeu1(i)); wlines[i].args[0] = lines[i].frontsector->floorheight >> FRACBITS; wlines[i].args[2] = lines[i].frontsector->ceilingheight >> FRACBITS; break; case 5: case 50: case 51: - CONS_Alert(CONS_WARNING, M_GetText("Linedef %d has type %d, which is not supported in UDMF.\n"), i, wlines[i].special); + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s has type %d, which is not supported in UDMF.\n"), sizeu1(i), wlines[i].special); break; case 61: if (wlines[i].flags & ML_MIDSOLID) continue; if (!wlines[i].args[1]) continue; - CONS_Alert(CONS_WARNING, M_GetText("Linedef %d with crusher type 61 rises twice as fast on spawn. This behavior is not supported in UDMF.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s with crusher type 61 rises twice as fast on spawn. This behavior is not supported in UDMF.\n"), sizeu1(i)); break; case 76: if (freetag == (mtag_t)MAXTAGS) { - CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %d with type 76 cannot be converted.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %s with type 76 cannot be converted.\n"), sizeu1(i)); break; } TAG_ITER_SECTORS(wlines[i].args[0], s) @@ -2151,9 +2151,9 @@ static void P_WriteTextmap(void) break; case 259: if (wlines[i].args[3] & FF_QUICKSAND) - CONS_Alert(CONS_WARNING, M_GetText("Quicksand properties of custom FOF on linedef %d cannot be converted. Use linedef type 75 instead.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Quicksand properties of custom FOF on linedef %s cannot be converted. Use linedef type 75 instead.\n"), sizeu1(i)); if (wlines[i].args[3] & FF_BUSTUP) - CONS_Alert(CONS_WARNING, M_GetText("Bustable properties of custom FOF on linedef %d cannot be converted. Use linedef type 74 instead.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Bustable properties of custom FOF on linedef %s cannot be converted. Use linedef type 74 instead.\n"), sizeu1(i)); break; case 412: if ((s = Tag_Iterate_Sectors(wlines[i].args[0], 0)) < 0) @@ -2162,7 +2162,7 @@ static void P_WriteTextmap(void) break; if (freetag == (mtag_t)MAXTAGS) { - CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %d with type 412 cannot be converted.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %s with type 412 cannot be converted.\n"), sizeu1(i)); break; } Tag_Add(&specialthings[s].teleport->tags, freetag); @@ -2176,7 +2176,7 @@ static void P_WriteTextmap(void) break; if (freetag == (mtag_t)MAXTAGS) { - CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %d with type 422 cannot be converted.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %s with type 422 cannot be converted.\n"), sizeu1(i)); break; } Tag_Add(&specialthings[s].altview->tags, freetag); @@ -2185,14 +2185,14 @@ static void P_WriteTextmap(void) freetag = Tag_NextUnused(freetag); break; case 447: - CONS_Alert(CONS_WARNING, M_GetText("Linedef %d has change colormap action, which cannot be converted automatically. Tag arg0 to a sector with the desired colormap.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s has change colormap action, which cannot be converted automatically. Tag arg0 to a sector with the desired colormap.\n"), sizeu1(i)); if (wlines[i].flags & ML_TFERLINE) - CONS_Alert(CONS_WARNING, M_GetText("Linedef %d mixes front and back colormaps, which is not supported in UDMF. Copy one colormap to the target sector first, then mix in the second one.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s mixes front and back colormaps, which is not supported in UDMF. Copy one colormap to the target sector first, then mix in the second one.\n"), sizeu1(i)); break; case 455: - CONS_Alert(CONS_WARNING, M_GetText("Linedef %d has fade colormap action, which cannot be converted automatically. Tag arg0 to a sector with the desired colormap.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s has fade colormap action, which cannot be converted automatically. Tag arg0 to a sector with the desired colormap.\n"), sizeu1(i)); if (wlines[i].flags & ML_TFERLINE) - CONS_Alert(CONS_WARNING, M_GetText("Linedef %d specifies starting colormap for the fade, which is not supported in UDMF. Change the colormap with linedef type 447 instead.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s specifies starting colormap for the fade, which is not supported in UDMF. Change the colormap with linedef type 447 instead.\n"), sizeu1(i)); break; case 457: if ((s = Tag_Iterate_Sectors(wlines[i].args[0], 0)) < 0) @@ -2201,7 +2201,7 @@ static void P_WriteTextmap(void) break; if (freetag == (mtag_t)MAXTAGS) { - CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %d with type 457 cannot be converted.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %s with type 457 cannot be converted.\n"), sizeu1(i)); break; } Tag_Add(&specialthings[s].angleanchor->tags, freetag); @@ -2224,7 +2224,7 @@ static void P_WriteTextmap(void) wsectors[s].extra_colormap = wsides[wlines[i].sidenum[0]].colormap_data; if (freetag == (mtag_t)MAXTAGS) { - CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %d with type 606 cannot be converted.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("No unused tag found. Linedef %s with type 606 cannot be converted.\n"), sizeu1(i)); break; } Tag_Add(&wsectors[s].tags, freetag); @@ -2239,23 +2239,23 @@ static void P_WriteTextmap(void) } if (wlines[i].special >= 300 && wlines[i].special < 400 && wlines[i].flags & ML_WRAPMIDTEX) - CONS_Alert(CONS_WARNING, M_GetText("Linedef executor trigger linedef %d has disregard order flag, which is not supported in UDMF.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Linedef executor trigger linedef %s has disregard order flag, which is not supported in UDMF.\n"), sizeu1(i)); } for (i = 0; i < numsectors; i++) { if (Tag_Find(&wsectors[i].tags, LE_CAPSULE0)) - CONS_Alert(CONS_WARNING, M_GetText("Sector %d has reserved tag %d, which is not supported in UDMF. Use arg3 of the boss mapthing instead.\n"), i, LE_CAPSULE0); + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has reserved tag %d, which is not supported in UDMF. Use arg3 of the boss mapthing instead.\n"), sizeu1(i), LE_CAPSULE0); if (Tag_Find(&wsectors[i].tags, LE_CAPSULE1)) - CONS_Alert(CONS_WARNING, M_GetText("Sector %d has reserved tag %d, which is not supported in UDMF. Use arg3 of the boss mapthing instead.\n"), i, LE_CAPSULE1); + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has reserved tag %d, which is not supported in UDMF. Use arg3 of the boss mapthing instead.\n"), sizeu1(i), LE_CAPSULE1); if (Tag_Find(&wsectors[i].tags, LE_CAPSULE2)) - CONS_Alert(CONS_WARNING, M_GetText("Sector %d has reserved tag %d, which is not supported in UDMF. Use arg3 of the boss mapthing instead.\n"), i, LE_CAPSULE2); + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has reserved tag %d, which is not supported in UDMF. Use arg3 of the boss mapthing instead.\n"), sizeu1(i), LE_CAPSULE2); switch (GETSECSPECIAL(wsectors[i].special, 1)) { case 9: case 10: - CONS_Alert(CONS_WARNING, M_GetText("Sector %d has ring drainer effect, which is not supported in UDMF. Use linedef type 462 instead.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has ring drainer effect, which is not supported in UDMF. Use linedef type 462 instead.\n"), sizeu1(i)); break; default: break; @@ -2264,13 +2264,13 @@ static void P_WriteTextmap(void) switch (GETSECSPECIAL(wsectors[i].special, 2)) { case 6: - CONS_Alert(CONS_WARNING, M_GetText("Sector %d has emerald check trigger type, which is not supported in UDMF. Use linedef types 337-339 instead.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has emerald check trigger type, which is not supported in UDMF. Use linedef types 337-339 instead.\n"), sizeu1(i)); break; case 7: - CONS_Alert(CONS_WARNING, M_GetText("Sector %d has NiGHTS mare trigger type, which is not supported in UDMF. Use linedef types 340-342 instead.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has NiGHTS mare trigger type, which is not supported in UDMF. Use linedef types 340-342 instead.\n"), sizeu1(i)); break; case 9: - CONS_Alert(CONS_WARNING, M_GetText("Sector %d has Egg Capsule type, which is not supported in UDMF. Use linedef type 464 instead.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Sector %s has Egg Capsule type, which is not supported in UDMF. Use linedef type 464 instead.\n"), sizeu1(i)); break; default: break; @@ -2393,7 +2393,7 @@ static void P_WriteTextmap(void) } if (wlines[i].executordelay != 0 && wlines[i].backsector) { - CONS_Alert(CONS_WARNING, M_GetText("Linedef %d has an executor delay. Changes to the delay at runtime will not be reflected in the converted map. Use linedef type 465 for this.\n"), i); + CONS_Alert(CONS_WARNING, M_GetText("Linedef %s has an executor delay. Changes to the delay at runtime will not be reflected in the converted map. Use linedef type 465 for this.\n"), sizeu1(i)); fprintf(f, "executordelay = %d;\n", (wlines[i].backsector->ceilingheight >> FRACBITS) + (wlines[i].backsector->floorheight >> FRACBITS)); } if (wlines[i].flags & ML_IMPASSIBLE) From fd2a097c3410eeec9a4f12ed8b88ccd147b27d04 Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Sat, 28 May 2022 10:29:35 +0200 Subject: [PATCH 6/8] Fix more size_t mishaps --- src/p_setup.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index b4fd9cf5e..0f7cc29ac 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2280,7 +2280,7 @@ static void P_WriteTextmap(void) fprintf(f, "namespace = \"srb2\";\n"); for (i = 0; i < nummapthings; i++) { - fprintf(f, "thing // %d\n", i); + fprintf(f, "thing // %s\n", sizeu1(i)); fprintf(f, "{\n"); firsttag = Tag_FGet(&wmapthings[i].tags); if (firsttag != 0) @@ -2323,7 +2323,7 @@ static void P_WriteTextmap(void) for (i = 0; i < numvertexes; i++) { - fprintf(f, "vertex // %d\n", i); + fprintf(f, "vertex // %s\n", sizeu1(i)); fprintf(f, "{\n"); fprintf(f, "x = %f;\n", FIXED_TO_FLOAT(wvertexes[i].x)); fprintf(f, "y = %f;\n", FIXED_TO_FLOAT(wvertexes[i].y)); @@ -2337,10 +2337,10 @@ static void P_WriteTextmap(void) for (i = 0; i < numlines; i++) { - fprintf(f, "linedef // %d\n", i); + fprintf(f, "linedef // %s\n", sizeu1(i)); fprintf(f, "{\n"); - fprintf(f, "v1 = %d;\n", wlines[i].v1 - vertexes); - fprintf(f, "v2 = %d;\n", wlines[i].v2 - vertexes); + fprintf(f, "v1 = %s;\n", sizeu1(wlines[i].v1 - vertexes)); + fprintf(f, "v2 = %s;\n", sizeu1(wlines[i].v2 - vertexes)); fprintf(f, "sidefront = %d;\n", wlines[i].sidenum[0]); if (wlines[i].sidenum[1] != 0xffff) fprintf(f, "sideback = %d;\n", wlines[i].sidenum[1]); @@ -2432,9 +2432,9 @@ static void P_WriteTextmap(void) for (i = 0; i < numsides; i++) { - fprintf(f, "sidedef // %d\n", i); + fprintf(f, "sidedef // %s\n", sizeu1(i)); fprintf(f, "{\n"); - fprintf(f, "sector = %d;\n", wsides[i].sector - sectors); + fprintf(f, "sector = %s;\n", sizeu1(wsides[i].sector - sectors)); if (wsides[i].textureoffset != 0) fprintf(f, "offsetx = %d;\n", wsides[i].textureoffset >> FRACBITS); if (wsides[i].rowoffset != 0) @@ -2453,7 +2453,7 @@ static void P_WriteTextmap(void) for (i = 0; i < numsectors; i++) { - fprintf(f, "sector // %d\n", i); + fprintf(f, "sector // %s\n", sizeu1(i)); fprintf(f, "{\n"); fprintf(f, "heightfloor = %d;\n", wsectors[i].floorheight >> FRACBITS); fprintf(f, "heightceiling = %d;\n", wsectors[i].ceilingheight >> FRACBITS); From e1a5f48c51cb3f8274ef11501f0c840e0c5a987b Mon Sep 17 00:00:00 2001 From: MascaraSnake Date: Sat, 28 May 2022 14:08:19 +0200 Subject: [PATCH 7/8] Fix even more size_t printfs --- src/p_setup.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index 0f7cc29ac..5e3b071ac 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2313,10 +2313,10 @@ static void P_WriteTextmap(void) fprintf(f, "flip = true;\n"); for (j = 0; j < NUMMAPTHINGARGS; j++) if (wmapthings[i].args[j] != 0) - fprintf(f, "arg%d = %d;\n", j, wmapthings[i].args[j]); + fprintf(f, "arg%s = %d;\n", sizeu1(j), wmapthings[i].args[j]); for (j = 0; j < NUMMAPTHINGSTRINGARGS; j++) if (mapthings[i].stringargs[j]) - fprintf(f, "stringarg%d = \"%s\";\n", j, mapthings[i].stringargs[j]); + fprintf(f, "stringarg%s = \"%s\";\n", sizeu1(j), mapthings[i].stringargs[j]); fprintf(f, "}\n"); fprintf(f, "\n"); } @@ -2362,10 +2362,10 @@ static void P_WriteTextmap(void) fprintf(f, "special = %d;\n", wlines[i].special); for (j = 0; j < NUMLINEARGS; j++) if (wlines[i].args[j] != 0) - fprintf(f, "arg%d = %d;\n", j, wlines[i].args[j]); + fprintf(f, "arg%s = %d;\n", sizeu1(j), wlines[i].args[j]); for (j = 0; j < NUMLINESTRINGARGS; j++) if (lines[i].stringargs[j]) - fprintf(f, "stringarg%d = \"%s\";\n", j, lines[i].stringargs[j]); + fprintf(f, "stringarg%s = \"%s\";\n", sizeu1(j), lines[i].stringargs[j]); if (wlines[i].alpha != FRACUNIT) fprintf(f, "alpha = %f;\n", FIXED_TO_FLOAT(wlines[i].alpha)); if (wlines[i].blendmode != AST_COPY) @@ -3263,7 +3263,7 @@ static boolean P_LoadExtendedSubsectorsAndSegs(UINT8 **data, nodetype_t nodetype linenum = (nodetype == NT_XGL3) ? READUINT32((*data)) : READUINT16((*data)); if (linenum != 0xFFFF && linenum >= numlines) - I_Error("P_LoadExtendedSubsectorsAndSegs: Seg %s in subsector %d has invalid linedef %d!\n", sizeu1(k), i, linenum); + I_Error("P_LoadExtendedSubsectorsAndSegs: Seg %s in subsector %s has invalid linedef %d!\n", sizeu1(k), sizeu1(i), linenum); segs[k].glseg = (linenum == 0xFFFF); segs[k].linedef = (linenum == 0xFFFF) ? NULL : &lines[linenum]; segs[k].side = READUINT8((*data)); @@ -3272,7 +3272,7 @@ static boolean P_LoadExtendedSubsectorsAndSegs(UINT8 **data, nodetype_t nodetype { subsectors[i].firstline++; if (subsectors[i].firstline == k) - I_Error("P_LoadExtendedSubsectorsAndSegs: Subsector %d does not have any valid segs!", i); + I_Error("P_LoadExtendedSubsectorsAndSegs: Subsector %s does not have any valid segs!", sizeu1(i)); } break; @@ -6316,7 +6316,7 @@ static void P_ConvertBinaryThingTypes(void) if (j == -1) { - CONS_Debug(DBG_GAMELOGIC, "Particle generator (mapthing #%d) needs to be tagged to a #15 parameter line (trying to find tag %d).\n", i, mapthings[i].angle); + CONS_Debug(DBG_GAMELOGIC, "Particle generator (mapthing #%s) needs to be tagged to a #15 parameter line (trying to find tag %d).\n", sizeu1(i), mapthings[i].angle); break; } mapthings[i].args[0] = mapthings[i].z; From d10ca13eb912330684320cd8ad3a4e4f763ca057 Mon Sep 17 00:00:00 2001 From: Zwip-Zwap Zapony Date: Sat, 28 May 2022 12:18:09 +0000 Subject: [PATCH 8/8] Apply 1 suggestion(s) to 1 file(s) --- src/p_setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/p_setup.c b/src/p_setup.c index 5e3b071ac..1b518d2d7 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3263,7 +3263,7 @@ static boolean P_LoadExtendedSubsectorsAndSegs(UINT8 **data, nodetype_t nodetype linenum = (nodetype == NT_XGL3) ? READUINT32((*data)) : READUINT16((*data)); if (linenum != 0xFFFF && linenum >= numlines) - I_Error("P_LoadExtendedSubsectorsAndSegs: Seg %s in subsector %s has invalid linedef %d!\n", sizeu1(k), sizeu1(i), linenum); + I_Error("P_LoadExtendedSubsectorsAndSegs: Seg %s in subsector %s has invalid linedef %d!\n", sizeu1(k), sizeu2(i), linenum); segs[k].glseg = (linenum == 0xFFFF); segs[k].linedef = (linenum == 0xFFFF) ? NULL : &lines[linenum]; segs[k].side = READUINT8((*data));