Start on the replay hut menu!

src/filesrch.c

@@ -368,9 +368,10 @@ void searchfilemenu(char *tempname)
 	return;
 }
 
-boolean preparefilemenu(boolean samedepth)
+boolean preparefilemenu(boolean samedepth, boolean replayhut)
 {
 	(void)samedepth;
+	(void)replayhut;
 	return false;
 }
 
@@ -437,9 +438,10 @@ void searchfilemenu(char *tempname)
 	return;
 }
 
-boolean preparefilemenu(boolean samedepth)
+boolean preparefilemenu(boolean samedepth, boolean replayhut)
 {
 	(void)samedepth;
+	(void)replayhut;
 	return false;
 }
 
@@ -710,7 +712,7 @@ void searchfilemenu(char *tempname)
 	}
 }
 
-boolean preparefilemenu(boolean samedepth)
+boolean preparefilemenu(boolean samedepth, boolean replayhut)
 {
 	DIR *dirhandle;
 	struct dirent *dent;
@@ -759,9 +761,13 @@ boolean preparefilemenu(boolean samedepth)
 		{
 			if (!S_ISDIR(fsstat.st_mode)) // file
 			{
-				if (!cv_addons_showall.value)
+				size_t len = strlen(dent->d_name)+1;
+				if (replayhut)
+				{
+					if (strcasecmp(".lmp", dent->d_name+len-5)) continue; // Not a replay
+				}
+				else if (!cv_addons_showall.value)
 				{
-					size_t len = strlen(dent->d_name)+1;
 					UINT8 ext;
 					for (ext = 0; ext < NUM_EXT_TABLE; ext++)
 						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0]))) break; // extension comparison
@@ -829,40 +835,49 @@ boolean preparefilemenu(boolean samedepth)
 			if (!S_ISDIR(fsstat.st_mode)) // file
 			{
 				if (!((numfolders+pos) < sizecoredirmenu)) continue; // crash prevention
-				for (; ext < NUM_EXT_TABLE; ext++)
-					if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0]))) break; // extension comparison
-				if (ext == NUM_EXT_TABLE && !cv_addons_showall.value) continue; // not an addfile-able (or exec-able) file
-				ext += EXT_START; // moving to be appropriate position
 
-				if (ext >= EXT_LOADSTART)
+				if (replayhut)
 				{
-					size_t i;
+					if (strcasecmp(".lmp", dent->d_name+len-5)) continue; // Not a replay
-					for (i = 0; i < numwadfiles; i++)
+					ext = EXT_TXT; // This isn't used anywhere but better safe than sorry for messing with this...
+				}
+				else
+				{
+					for (; ext < NUM_EXT_TABLE; ext++)
+						if (!strcasecmp(exttable[ext]+1, dent->d_name+len-(exttable[ext][0]))) break; // extension comparison
+					if (ext == NUM_EXT_TABLE && !cv_addons_showall.value) continue; // not an addfile-able (or exec-able) file
+					ext += EXT_START; // moving to be appropriate position
+
+					if (ext >= EXT_LOADSTART)
 					{
-						if (!filenamebuf[i][0])
+						size_t i;
+						for (i = 0; i < numwadfiles; i++)
 						{
-							strncpy(filenamebuf[i], wadfiles[i]->filename, MAX_WADPATH);
+							if (!filenamebuf[i][0])
-							filenamebuf[i][MAX_WADPATH - 1] = '\0';
+							{
-							nameonly(filenamebuf[i]);
+								strncpy(filenamebuf[i], wadfiles[i]->filename, MAX_WADPATH);
+								filenamebuf[i][MAX_WADPATH - 1] = '\0';
+								nameonly(filenamebuf[i]);
+							}
+
+							if (strcmp(dent->d_name, filenamebuf[i]))
+								continue;
+							if (cv_addons_md5.value && !checkfilemd5(menupath, wadfiles[i]->md5sum))
+								continue;
+
+							ext |= EXT_LOADED;
 						}
-
-						if (strcmp(dent->d_name, filenamebuf[i]))
-							continue;
-						if (cv_addons_md5.value && !checkfilemd5(menupath, wadfiles[i]->md5sum))
-							continue;
-
-						ext |= EXT_LOADED;
 					}
-				}
+					else if (ext == EXT_TXT)
-				else if (ext == EXT_TXT)
+					{
-				{
+						if (!strcmp(dent->d_name, "log.txt") || !strcmp(dent->d_name, "errorlog.txt"))
-					if (!strcmp(dent->d_name, "log.txt") || !strcmp(dent->d_name, "errorlog.txt"))
+							ext |= EXT_LOADED;
+					}
+
+					if (!strcmp(dent->d_name, configfile))
 						ext |= EXT_LOADED;
 				}
 
-				if (!strcmp(dent->d_name, configfile))
-					ext |= EXT_LOADED;
-
 				folder = 0;
 			}
 			else // directory

src/filesrch.h

@@ -94,6 +94,6 @@ typedef enum
 
 void closefilemenu(boolean validsize);
 void searchfilemenu(char *tempname);
-boolean preparefilemenu(boolean samedepth);
+boolean preparefilemenu(boolean samedepth, boolean replayhut);
 
 #endif // __FILESRCH_H__

src/m_menu.c

@@ -336,6 +336,10 @@ static patch_t *addonsp[NUM_EXT+5];
 
 #define numaddonsshown 4
 
+// Replay hut
+static void M_ReplayHut(INT32 choice);
+static void M_DrawReplayHut(void);
+
 // Drawing functions
 static void M_DrawGenericMenu(void);
 static void M_DrawCenteredMenu(void);
@@ -526,6 +530,13 @@ static menuitem_t MISC_AddonsMenu[] =
 	{IT_KEYHANDLER | IT_NOTHING, NULL, "", M_HandleAddons, 0},     // dummy menuitem for the control func
 };
 
+static menuitem_t MISC_ReplayHutMenu[] =
+{
+	{IT_SUBMENU   |IT_STRING,  NULL, "Replay Options...", NULL, 0},
+
+	{IT_KEYHANDLER|IT_NOTHING, NULL, "",                  NULL, 20}, // Dummy menuitem for the replay list
+};
+
 // ---------------------------------
 // Pause Menu Mode Attacking Edition
 // ---------------------------------
@@ -700,7 +711,7 @@ static menuitem_t SR_MainMenu[] =
 {
 	{IT_STRING|IT_SUBMENU,                  NULL, "Unlockables", &SR_UnlockChecklistDef, 0},
 	{IT_CALL|IT_STRING|IT_CALL_NOTMODIFIED, NULL, "Statistics",  M_Statistics,           10},
-	{IT_CALL|IT_STRING,                     NULL, "Replay Hut",  M_Statistics,           20},
+	{IT_CALL|IT_STRING,                     NULL, "Replay Hut",  M_ReplayHut,            20},
 	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom1
 	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom2
 	{IT_DISABLED,         NULL, "",   NULL,                 0}, // Custom3
@@ -1583,6 +1594,18 @@ menu_t MISC_AddonsDef =
 	NULL
 };
 
+menu_t MISC_ReplayHutDef =
+{
+	"M_REPLAY",
+	sizeof (MISC_ReplayHutMenu)/sizeof (menuitem_t),
+	&MainDef,
+	MISC_ReplayHutMenu,
+	M_DrawReplayHut,
+	30, 80,
+	0,
+	NULL
+};
+
 menu_t MAPauseDef = PAUSEMENUSTYLE(MAPauseMenu, 40, 72);
 menu_t SPauseDef = PAUSEMENUSTYLE(SPauseMenu, 40, 72);
 menu_t MPauseDef = PAUSEMENUSTYLE(MPauseMenu, 40, 72);
@@ -4471,7 +4494,7 @@ static void M_Addons(INT32 choice)
 	else
 		--menupathindex[menudepthleft];
 
-	if (!preparefilemenu(false))
+	if (!preparefilemenu(false, false))
 	{
 		M_StartMessage(va("No files/folders found.\n\n%s\n\n(Press a key)\n", (recommendedflags == V_SKYMAP ? LOCATIONSTRING2 : LOCATIONSTRING1)),NULL,MM_NOTHING);
 		return;
@@ -4595,7 +4618,7 @@ static void M_AddonsClearName(INT32 choice)
 // returns whether to do message draw
 static boolean M_AddonsRefresh(void)
 {
-	if ((refreshdirmenu & REFRESHDIR_NORMAL) && !preparefilemenu(true))
+	if ((refreshdirmenu & REFRESHDIR_NORMAL) && !preparefilemenu(true, false))
 	{
 		UNEXIST;
 		if (refreshdirname)
@@ -4844,7 +4867,7 @@ static void M_HandleAddons(INT32 choice)
 		if (dirmenu && dirmenu[dir_on[menudepthleft]])
 			tempname = Z_StrDup(dirmenu[dir_on[menudepthleft]]+DIR_STRING); // don't need to I_Error if can't make - not important, just QoL
 #if 0 // much slower
-		if (!preparefilemenu(true))
+		if (!preparefilemenu(true, false))
 		{
 			UNEXIST;
 			return;
@@ -4898,13 +4921,13 @@ static void M_HandleAddons(INT32 choice)
 								menupathindex[--menudepthleft] = strlen(menupath);
 								menupath[menupathindex[menudepthleft]] = 0;
 
-								if (!preparefilemenu(false))
+								if (!preparefilemenu(false, false))
 								{
 									S_StartSound(NULL, sfx_s224);
 									M_StartMessage(va("%c%s\x80\nThis folder is empty.\n\n(Press a key)\n", ('\x80' + (highlightflags>>V_CHARCOLORSHIFT)), M_AddonsHeaderPath()),NULL,MM_NOTHING);
 									menupath[menupathindex[++menudepthleft]] = 0;
 
-									if (!preparefilemenu(true))
+									if (!preparefilemenu(true, false))
 									{
 										UNEXIST;
 										return;
@@ -4927,7 +4950,7 @@ static void M_HandleAddons(INT32 choice)
 						case EXT_UP:
 							S_StartSound(NULL, sfx_menu1);
 							menupath[menupathindex[++menudepthleft]] = 0;
-							if (!preparefilemenu(false))
+							if (!preparefilemenu(false, false))
 							{
 								UNEXIST;
 								return;
@@ -4984,6 +5007,84 @@ static void M_HandleAddons(INT32 choice)
 	}
 }
 
+// ---- REPLAY HUT -----
+
+static INT16 replayOn = 0;
+
+static void M_ReplayHut(INT32 choice)
+{
+	(void)choice;
+
+	snprintf(menupath, 1024, "%s"PATHSEP"replay"PATHSEP"online"PATHSEP, srb2home);
+	menupathindex[(menudepthleft = menudepth-1)] = strlen(menupath);
+
+	if (!preparefilemenu(false, true))
+	{
+		M_StartMessage("No replays found.\n\n(Press a key)\n", NULL, MM_NOTHING);
+		return;
+	}
+	else
+		dir_on[menudepthleft] = 0;
+
+	M_SetupNextMenu(&MISC_ReplayHutDef);
+	G_SetGamestate(GS_TIMEATTACK);
+
+	S_ChangeMusicInternal("replst", true);
+}
+
+static void M_DrawReplayHut(void)
+{
+	INT32 x, y, cursory = 0;
+	INT16 i;
+
+	(void)cursory;
+
+	V_DrawPatchFill(W_CachePatchName("SRB2BACK", PU_CACHE));
+	M_DrawMenuTitle();
+
+	// Draw menu choices
+	x = currentMenu->x;
+	y = currentMenu->y;
+
+	if (itemOn == currentMenu->numitems-1)
+	{
+		INT32 maxy;
+		// Scroll menu items if needed
+		cursory = y + currentMenu->menuitems[currentMenu->numitems-1].alphaKey + replayOn*10;
+		maxy = y + currentMenu->menuitems[currentMenu->numitems-1].alphaKey + sizedirmenu*10;
+
+		if (cursory > maxy - 70)
+			cursory = maxy - 70;
+
+		if (cursory > 130)
+			y -= (cursory-130);
+	}
+
+	// Draw static menu items
+	for (i = 0; i < currentMenu->numitems-1; i++)
+	{
+		if (i == itemOn)
+			cursory = y;
+
+		if ((currentMenu->menuitems[i].status & IT_DISPLAY)==IT_STRING)
+			V_DrawString(x, y + currentMenu->menuitems[i].alphaKey, 0, currentMenu->menuitems[i].text);
+		else
+			V_DrawString(x, y + currentMenu->menuitems[i].alphaKey, highlightflags, currentMenu->menuitems[i].text);
+	}
+
+	y += currentMenu->menuitems[currentMenu->numitems-1].alphaKey;
+
+	for (i = 0; i < (INT16)sizedirmenu; i++)
+	{
+		V_DrawString(x, y+i*10, V_ALLOWLOWERCASE, dirmenu[i]+DIR_STRING);
+	}
+
+	// Draw the cursor
+	V_DrawScaledPatch(currentMenu->x - 24, cursory, 0,
+		W_CachePatchName("M_CURSOR", PU_CACHE));
+	V_DrawString(currentMenu->x, cursory, highlightflags, currentMenu->menuitems[itemOn].text);
+}
+
 static void M_PandorasBox(INT32 choice)
 {
 	(void)choice;