From 3a522091b9e47c5e1326fc3e117863d500e2ec75 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 2 Feb 2020 13:31:01 +0100
Subject: [PATCH] - detect the add ons in the Megaton edition.

---
 source/platform/win32/i_system.cpp |  5 +++-
 wadsrc/static/engine/grpinfo.txt   | 37 +++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/source/platform/win32/i_system.cpp b/source/platform/win32/i_system.cpp
index f020e100d..6bdd904eb 100644
--- a/source/platform/win32/i_system.cpp
+++ b/source/platform/win32/i_system.cpp
@@ -562,7 +562,10 @@ BOOL CALLBACK IWADBoxCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
 				filepart = WadList[i].Path;
 			else
 				filepart++;
-			FStringf work("%s (%s)", WadList[i].Name.GetChars(), filepart);
+
+			FString work;
+			if (*filepart) work.Format("%s (%s)", WadList[i].Name.GetChars(), filepart);
+			else work = WadList[i].Name.GetChars();
 			std::wstring wide = work.WideString();
 			SendMessage(ctrl, LB_ADDSTRING, 0, (LPARAM)wide.c_str());
 			SendMessage(ctrl, LB_SETITEMDATA, i, (LPARAM)i);
diff --git a/wadsrc/static/engine/grpinfo.txt b/wadsrc/static/engine/grpinfo.txt
index 7bc51f1cf..799262d80 100644
--- a/wadsrc/static/engine/grpinfo.txt
+++ b/wadsrc/static/engine/grpinfo.txt
@@ -191,6 +191,17 @@ grpinfo
 	gamefilter "Duke.DukeDC"
 }
 
+addon
+{
+	// This is for loading the addon from the megaton edition without setting the path.
+	name "Duke it out in D.C."
+	flags GAMEFLAG_DUKE|GAMEFLAG_ADDON
+	dependency DUKE15_CRC
+	mustcontain "addons/dc/dukedc.grp"
+	loadgrp "addons/dc/dukedc.grp"
+	gamefilter "Duke.DukeDC"
+}
+
 // These are a bit strange but without anything to check I do not know in what way.
 //   { "Duke Caribbean: Life's a Beach (1.3D)", VACA13_CRC,  23559381, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKE13_CRC, NULL, process_vaca13},
 //   { "Duke Caribbean: Life's a Beach (PPak)", VACAPP_CRC,  22551333, GAMEFLAG_DUKE|GAMEFLAG_ADDON, DUKEPP_CRC, NULL, process_vacapp15},
@@ -209,7 +220,7 @@ grpinfo
 grpinfo
 {
 	name "Duke Caribbean: Life's a Beach"
-	scriptname "VACARION.CON"
+	scriptname "VACATION.CON"
 	size 22397273
 	crc 0x65B5F690
 	flags GAMEFLAG_DUKE|GAMEFLAG_ADDON
@@ -217,6 +228,17 @@ grpinfo
 	gamefilter "Duke.Vacation"
 }
 
+addon
+{
+	// This is for loading the addon from the megaton edition without setting the path.
+	name "Duke Caribbean: Life's a Beach"
+	flags GAMEFLAG_DUKE|GAMEFLAG_ADDON
+	dependency DUKE15_CRC
+	mustcontain "addons/vacation/vacation.grp"
+	loadgrp "addons/vacation/vacation.grp"
+	gamefilter "Duke.Vacation"
+}
+
 grpinfo
 {
 	name "Duke: Nuclear Winter"
@@ -228,6 +250,19 @@ grpinfo
 	gamefilter "Duke.NWinter"
 }
 
+addon
+{
+	// This is for loading the addon from the megaton edition without setting the path.
+	name "Duke: Nuclear Winter"
+	scriptname "NWINTER.CON"
+	flags GAMEFLAG_DUKE|GAMEFLAG_ADDON
+	dependency DUKE15_CRC
+	mustcontain "addons/nw/nwinter.grp"
+	loadgrp "addons/nw/nwinter.grp"
+	gamefilter "Duke.NWinter"
+}
+
+
 grpinfo
 {
 	name "Duke: Nuclear Winter Demo"