zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-01-18 21:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added Gez's Freedoom detection patch.

Browse source 
SVN r1136 (trunk)
This commit is contained in:
Randy Heit 2008-08-09 04:32:56 +00:00
parent 85a6ae7c34
commit 67c844df4d
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/rh-log.txt
View file

@ -1,4 +1,5 @@
August 8, 2008 August 8, 2008
- Added Gez's Freedoom detection patch.
- SBARINFO update: - SBARINFO update:
* Added: The ability to have drawkeybar auto detect spacing. * Added: The ability to have drawkeybar auto detect spacing.
* Added: Offset parameter to drawkeybar to allow two key bars with * Added: Offset parameter to drawkeybar to allow two key bars with

12
src/d_main.cpp
View file

@ -225,7 +225,8 @@ const IWADInfo IWADInfos[NUM_IWAD_TYPES] =
{ "DOOM Registered", "Doom1", MAKERGB(84,84,84), MAKERGB(168,168,168) }, { "DOOM Registered", "Doom1", MAKERGB(84,84,84), MAKERGB(168,168,168) },
{ "Strife: Quest for the Sigil", NULL, MAKERGB(224,173,153), MAKERGB(0,107,101) }, { "Strife: Quest for the Sigil", NULL, MAKERGB(224,173,153), MAKERGB(0,107,101) },
{ "Strife: Teaser (Old Version)", NULL, MAKERGB(224,173,153), MAKERGB(0,107,101) }, { "Strife: Teaser (Old Version)", NULL, MAKERGB(224,173,153), MAKERGB(0,107,101) },
{ "Strife: Teaser (New Version)", NULL, MAKERGB(224,173,153), MAKERGB(0,107,101) } { "Strife: Teaser (New Version)", NULL, MAKERGB(224,173,153), MAKERGB(0,107,101) },
{ "Freedoom", "Freedoom", MAKERGB(50,84,67), MAKERGB(198,220,209) },
}; };
// PRIVATE DATA DEFINITIONS ------------------------------------------------ // PRIVATE DATA DEFINITIONS ------------------------------------------------
@ -249,6 +250,7 @@ static const char *IWADNames[] =
"hexdd.wad", "hexdd.wad",
"strife1.wad", "strife1.wad",
"strife0.wad", "strife0.wad",
"freedoom.wad", // Freedoom.wad is distributed as Doom2.wad, but this allows to have both in the same directory.
#ifdef unix #ifdef unix
"DOOM2.WAD", // Also look for all-uppercase names "DOOM2.WAD", // Also look for all-uppercase names
"PLUTONIA.WAD", "PLUTONIA.WAD",
@ -261,6 +263,7 @@ static const char *IWADNames[] =
"HEXDD.WAD", "HEXDD.WAD",
"STRIFE1.WAD", "STRIFE1.WAD",
"STRIFE0.WAD", "STRIFE0.WAD",
"FREEDOOM.WAD",
#endif #endif
NULL NULL
}; };
@ -1333,6 +1336,7 @@ static void SetIWAD (const char *iwadpath, EIWADType type)
{ commercial, &StrifeGameInfo, doom2 }, // Strife { commercial, &StrifeGameInfo, doom2 }, // Strife
{ commercial, &StrifeTeaserGameInfo, doom2 }, // StrifeTeaser { commercial, &StrifeTeaserGameInfo, doom2 }, // StrifeTeaser
{ commercial, &StrifeTeaser2GameInfo, doom2 }, // StrifeTeaser2 { commercial, &StrifeTeaser2GameInfo, doom2 }, // StrifeTeaser2
{ commercial, &CommercialGameInfo, doom2 }, // FreeDoom
}; };
D_AddFile (iwadpath); D_AddFile (iwadpath);
@ -1375,6 +1379,7 @@ static EIWADType ScanIWAD (const char *iwad)
"ENDSTRF", "ENDSTRF",
"MAP33", "MAP33",
"INVCURS", "INVCURS",
{ 'F','R','E','E','D','O','O','M' },
"E2M1","E2M2","E2M3","E2M4","E2M5","E2M6","E2M7","E2M8","E2M9", "E2M1","E2M2","E2M3","E2M4","E2M5","E2M6","E2M7","E2M8","E2M9",
"E3M1","E3M2","E3M3","E3M4","E3M5","E3M6","E3M7","E3M8","E3M9", "E3M1","E3M2","E3M3","E3M4","E3M5","E3M6","E3M7","E3M8","E3M9",
"DPHOOF","BFGGA0","HEADA1","CYBRA1", "DPHOOF","BFGGA0","HEADA1","CYBRA1",
@ -1394,6 +1399,7 @@ static EIWADType ScanIWAD (const char *iwad)
Check_endstrf, Check_endstrf,
Check_map33, Check_map33,
Check_invcurs, Check_invcurs,
Check_FreeDoom,
Check_e2m1 Check_e2m1
}; };
int lumpsfound[NUM_CHECKLUMPS]; int lumpsfound[NUM_CHECKLUMPS];
@ -1461,6 +1467,10 @@ static EIWADType ScanIWAD (const char *iwad)
{ {
return IWAD_Hexen; return IWAD_Hexen;
} }
else if (lumpsfound[Check_FreeDoom])
{
return IWAD_FreeDoom;
}
else else
{ {
return IWAD_Doom2; return IWAD_Doom2;

1
src/d_main.h
View file

@ -70,6 +70,7 @@ enum EIWADType
IWAD_Strife, IWAD_Strife,
IWAD_StrifeTeaser, IWAD_StrifeTeaser,
IWAD_StrifeTeaser2, IWAD_StrifeTeaser2,
IWAD_FreeDoom,
NUM_IWAD_TYPES NUM_IWAD_TYPES
}; };