Basic detection of N3D #712

appveyor.yml

@@ -32,7 +32,7 @@ install:
   - cd %APPVEYOR_BUILD_FOLDER%
 
 before_build:
-  - .\build\windows\get-sdl2-dlls.bat dll 32 "appveyor DownloadFile"
+  - .\build\windows\get-sdl2-dlls.bat dll 86 "appveyor DownloadFile"
   - cmake -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 17 2022" -A Win32 .
 
 build:

appveyor.yml.cmake

@@ -32,7 +32,7 @@ install:
   - cd %APPVEYOR_BUILD_FOLDER%
 
 before_build:
-  - .\build\windows\get-sdl2-dlls.bat dll 32 "appveyor DownloadFile"
+  - .\build\windows\get-sdl2-dlls.bat dll 86 "appveyor DownloadFile"
   - cmake -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -G "Visual Studio 17 2022" -A Win32 .
 
 build:

data/.wolf3d/N3D.cdogscpn/campaign.json

@@ -0,0 +1,12 @@
+{
+	"Version": 16,
+	"Title": "Super 3-D Noah's Ark",
+	"Author": "Wisdom Tree",
+	"Description": "",
+	"Ammo": true,
+	"WeaponPersist": true,
+	"SkipWeaponMenu": true,
+	"RandomPickups": false,
+	"DoorOpenTicks": 210,
+	"Missions": 0
+}

data/.wolf3d/N3D.cdogscpn/characters.json

@@ -0,0 +1,4 @@
+{
+	"Version": 13,
+	"Characters": []
+}

data/.wolf3d/N3D.cdogscpn/missions.json

@@ -0,0 +1,3 @@
+{
+	"Missions": []
+}

src/cdogs/map_wolf.c

@@ -41,9 +41,11 @@ CWolfMap *defaultSpearMap = NULL;
 
 #define WOLF_STEAM_NAME "Wolfenstein 3D"
 #define SPEAR_STEAM_NAME "Spear of Destiny"
+#define N3D_STEAM_NAME "Super 3-D Noah's Ark"
 #define WOLF_GOG_ID "1441705046"
 #define WOLF_SPEAR_GOG_ID "1441705226"
 #define SPEAR_GOG_ID "1441705126"
+#define N3D_GOG_ID "1672565562"
 #define WOLF_DATA_DIR "data/.wolf3d/"
 
 #define TILE_CLASS_WALL_OFFSET 63
@@ -95,6 +97,9 @@ static void GetCampaignPath(
 			break;
 		}
 		break;
+	case CWMAPTYPE_N3D:
+		GetDataFilePath(buf, WOLF_DATA_DIR "N3D.cdogscpn");
+		break;
 	default:
 		// TODO: implement unknown map types
 		LOG(LM_MAP, LL_ERROR, "Unknown wolf map type %d", (int)type);
@@ -473,6 +478,8 @@ static bool IsDefaultMap(const char *filename)
 			   // Steam Windows
 			   StrEndsWith(buf, "WOLFENSTEIN 3D/BASE") ||
 			   StrEndsWith(buf, "SPEAR OF DESTINY/BASE") ||
+			   // GOG/Steam Windows
+			   StrEndsWith(buf, "Super 3-D Noah's Ark") ||
 			   // Steam Linux
 			   StrEndsWith(buf, "Wolfenstein 3D/base") ||
 			   StrEndsWith(buf, "Spear of Destiny/base"));
@@ -2516,6 +2523,14 @@ void MapWolfLoadCampaignsFromSystem(CampaignList *list)
 	{
 		TryLoadSpearGOG(list, numLoaded);
 	}
+
+	// Super 3D Noah's Ark
+	fsg_get_steam_game_path(buf, N3D_STEAM_NAME);
+	if (!TryLoadCampaign(list, buf))
+	{
+		fsg_get_gog_game_path(buf, N3D_GOG_ID);
+		TryLoadCampaign(list, buf);
+	}
 }
 static bool TryLoadSpearSteamVanilla(CampaignList *list);
 static bool TryLoadSpearSteamInWolf3D(CampaignList *list);