From b2548bf02a69a1e1714bb9e7cc619072aa8a3621 Mon Sep 17 00:00:00 2001 From: Braden Obrzut Date: Sat, 9 Oct 2010 00:10:54 +0000 Subject: [PATCH] - Added detection code for Hacx 1.2 IWAD. SVN r2925 (trunk) --- src/d_iwad.cpp | 9 +++++++++ src/d_main.h | 1 + 2 files changed, 10 insertions(+) diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index 3453d9d5f..429a354f8 100644 --- a/src/d_iwad.cpp +++ b/src/d_iwad.cpp @@ -82,6 +82,7 @@ const IWADInfo IWADInfos[NUM_IWAD_TYPES] = { "Chex(R) Quest 3", "Chex3", MAKERGB(255,255,0), MAKERGB(0,192,0), GAME_Chex, "mapinfo/chex3.txt", GI_NOTEXTCOLOR }, { "Action Doom 2: Urban Brawl", "UrbanBrawl",MAKERGB(168,168,0), MAKERGB(168,0,0), GAME_Doom, "mapinfo/urbanbrawl.txt", GI_MAPxx }, { "Harmony", "Harmony", MAKERGB(110,180,230), MAKERGB(69,79,126), GAME_Doom, "mapinfo/doom2.txt", GI_MAPxx }, + { "Hacx: Twitch n' Kill", "Hacx", MAKERGB(168,0,0), MAKERGB(168,168,168), GAME_Doom, "mapinfo/doom2.txt", GI_MAPxx }, //{ "ZDoom Engine", NULL, MAKERGB(168,0,0), MAKERGB(168,168,168) }, }; @@ -113,6 +114,7 @@ static const char *IWADNames[] = "chex3.wad", "action2.wad", "harm1.wad", + "hacx.wad", #ifdef unix "DOOM2.WAD", // Also look for all-uppercase names "PLUTONIA.WAD", @@ -137,6 +139,7 @@ static const char *IWADNames[] = "CHEX3.WAD", "ACTION2.WAD", "HARM1.WAD", + "HACX.WAD", #endif NULL }; @@ -175,6 +178,7 @@ static EIWADType ScanIWAD (const char *iwad) "0HAWK01", "0CARA3", "0NOSE1", + "HACX-R", { 'G','A','M','E','I','N','F','O' }, "E2M1","E2M2","E2M3","E2M4","E2M5","E2M6","E2M7","E2M8","E2M9", "E3M1","E3M2","E3M3","E3M4","E3M5","E3M6","E3M7","E3M8","E3M9", @@ -208,6 +212,7 @@ static EIWADType ScanIWAD (const char *iwad) Check_Hawk, Check_Car, Check_Nose, + Check_Hacx, Check_Gameinfo, Check_e2m1 }; @@ -300,6 +305,10 @@ static EIWADType ScanIWAD (const char *iwad) { return IWAD_Harmony; } + else if (lumpsfound[Check_Hacx]) + { + return IWAD_Hacx; + } else if (lumpsfound[Check_FreeDoom]) { // Is there a 100% reliable way to tell FreeDoom and FreeDM diff --git a/src/d_main.h b/src/d_main.h index f72f7a69b..eb49840f1 100644 --- a/src/d_main.h +++ b/src/d_main.h @@ -82,6 +82,7 @@ enum EIWADType IWAD_ChexQuest3, IWAD_ActionDoom2, IWAD_Harmony, + IWAD_Hacx, IWAD_Custom, NUM_IWAD_TYPES