From a88f4aaf0017276bf0bf2aa99517d57fa38d7db2 Mon Sep 17 00:00:00 2001 From: Fafabis Date: Mon, 5 Jul 2021 20:56:41 -0300 Subject: [PATCH] show the track addon --- src/dehacked.c | 7 +++++-- src/m_menu.c | 17 +++++++++++++++++ src/m_menu.h | 2 ++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 00f4fa96d..f1cf96ce0 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -871,7 +871,7 @@ static const struct { {NULL, 0} }; -static void readlevelheader(MYFILE *f, INT32 num) +static void readlevelheader(MYFILE *f, INT32 num, INT32 wadnum) { char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL); char *word; @@ -884,6 +884,9 @@ static void readlevelheader(MYFILE *f, INT32 num) // This call automatically saves all previous information when DELFILE is defined. // We don't need to do it ourselves. P_AllocMapHeader((INT16)(num-1)); + + if (!strstr(wadfiles[wadnum]->filename, ".soc")) + mapwads[num-1] = wadnum; do { @@ -3387,7 +3390,7 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad) { if (mapheaderinfo[i]) G_SetGameModified(multiplayer, true); // only mark as a major mod if it replaces an already-existing mapheaderinfo - readlevelheader(f, i); + readlevelheader(f, i, wad); } else { diff --git a/src/m_menu.c b/src/m_menu.c index 15a619871..f97f7a996 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -135,6 +135,8 @@ const char *quitmsg[NUM_QUITMESSAGES]; // Stuff for customizing the player select screen Tails 09-22-2003 description_t description[MAXSKINS]; +INT32 mapwads[NUMMAPS]; + //static char *char_notes = NULL; //static fixed_t char_scroll = 0; @@ -8908,6 +8910,21 @@ static void M_DrawLevelSelectOnly(boolean leftfade, boolean rightfade) trans = G_GetGametypeColor(cv_newgametype.value); V_DrawFill(x-1, y-1, w+2, i+2, trans); // variable reuse... + + if (cv_nextmap.value) + { + char *addonname = wadfiles[mapwads[cv_nextmap.value-1]]->filename; + INT32 len, sw = 0; + INT32 charlimit = 21 + (dupadjust/5); + nameonly(addonname); + len = strlen(addonname); +#define charsonside 14 + if (len > charlimit) + V_DrawThinString(x+w+5, y+i-8, V_TRANSLUCENT, va("%.*s...%s", charsonside, addonname, addonname+((len-charlimit) + charsonside))); // variable reuse... +#undef charsonside + else + V_DrawThinString(x+w+5, y+i-8, V_TRANSLUCENT, addonname); // variable reuse... + } if (!cv_kartencore.value || gamestate == GS_TIMEATTACK || cv_newgametype.value != GT_RACE) V_DrawSmallScaledPatch(x, y, 0, PictureOfLevel); diff --git a/src/m_menu.h b/src/m_menu.h index 28fdd44e6..70cb0f9cb 100644 --- a/src/m_menu.h +++ b/src/m_menu.h @@ -235,6 +235,8 @@ typedef struct UINT8 netgame; } saveinfo_t; +extern INT32 mapwads[NUMMAPS]; + extern description_t description[MAXSKINS]; extern consvar_t cv_showfocuslost;