Skip to content

Commit 436e9f5

Browse files
committed
Require doom1.wad instead of DOOM1.WAD.
1 parent 731aef5 commit 436e9f5

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/d_iwad.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//
22
// Copyright(C) 2005-2014 Simon Howard
3+
// Copyright(C) 2025 Wojciech Graj
34
//
45
// This program is free software; you can redistribute it and/or
56
// modify it under the terms of the GNU General Public License
@@ -38,7 +39,7 @@ static const iwad_t iwads[] =
3839
{ "plutonia.wad", pack_plut, commercial, "Final Doom: Plutonia Experiment" },
3940
{ "tnt.wad", pack_tnt, commercial, "Final Doom: TNT: Evilution" },
4041
{ "doom.wad", doom, retail, "Doom" },
41-
{ "DOOM1.WAD", doom, shareware, "Doom Shareware" },
42+
{ "doom1.WAD", doom, shareware, "Doom Shareware" },
4243
{ "chex.wad", pack_chex, shareware, "Chex Quest" },
4344
{ "hacx.wad", pack_hacx, commercial, "Hacx" },
4445
{ "freedm.wad", doom2, commercial, "FreeDM" },
@@ -80,7 +81,7 @@ static void AddIWADDir(char *dir)
8081
#define WIN32_LEAN_AND_MEAN
8182
#include <windows.h>
8283

83-
typedef struct
84+
typedef struct
8485
{
8586
HKEY root;
8687
char *path;
@@ -89,7 +90,7 @@ typedef struct
8990

9091
#define UNINSTALLER_STRING "\\uninstl.exe /S "
9192

92-
// Keys installed by the various CD editions. These are actually the
93+
// Keys installed by the various CD editions. These are actually the
9394
// commands to invoke the uninstaller and look like this:
9495
//
9596
// C:\Program Files\Path\uninstl.exe /S C:\Program Files\Path
@@ -154,7 +155,7 @@ static registry_value_t collectors_edition_value =
154155

155156
// Subdirectories of the above install path, where IWADs are installed.
156157

157-
static char *collectors_edition_subdirs[] =
158+
static char *collectors_edition_subdirs[] =
158159
{
159160
"Doom2",
160161
"Final Doom",
@@ -407,7 +408,7 @@ static bool DirIsFile(char *path, char *filename)
407408

408409
static char *CheckDirectoryHasIWAD(char *dir, char *iwadname)
409410
{
410-
char *filename;
411+
char *filename;
411412

412413
// As a special case, the "directory" may refer directly to an
413414
// IWAD file if the path comes from DOOMWADDIR or DOOMWADPATH.
@@ -449,7 +450,7 @@ static char *SearchDirectoryForIWAD(char *dir, int mask, GameMission_t *mission)
449450
char *filename;
450451
size_t i;
451452

452-
for (i=0; i<arrlen(iwads); ++i)
453+
for (i=0; i<arrlen(iwads); ++i)
453454
{
454455
if (((1 << iwads[i].mission) & mask) == 0)
455456
{
@@ -545,7 +546,7 @@ static void AddDoomWadPath(void)
545546
{
546547
// Break at the separator and store the right hand side
547548
// as another iwad dir
548-
549+
549550
*p = '\0';
550551
p += 1;
551552

@@ -585,7 +586,7 @@ static void BuildIWADDirList(void)
585586
if (doomwaddir != NULL)
586587
{
587588
AddIWADDir(doomwaddir);
588-
}
589+
}
589590

590591
// Add dirs from DOOMWADPATH
591592

@@ -623,13 +624,13 @@ static void BuildIWADDirList(void)
623624

624625
//
625626
// Searches WAD search paths for an WAD with a specific filename.
626-
//
627+
//
627628

628629
char *D_FindWADByName(char *name)
629630
{
630631
char *path;
631632
int i;
632-
633+
633634
// Absolute path?
634635

635636
if (M_FileExists(name))
@@ -728,7 +729,7 @@ char *D_FindIWAD(int mask, GameMission_t *mission)
728729
{
729730
I_Error("IWAD file '%s' not found!", iwadfile);
730731
}
731-
732+
732733
*mission = IdentifyIWADByName(result, mask);
733734
}
734735
else
@@ -740,7 +741,7 @@ char *D_FindIWAD(int mask, GameMission_t *mission)
740741
result = NULL;
741742

742743
BuildIWADDirList();
743-
744+
744745
for (i=0; result == NULL && i<num_iwad_dirs; ++i)
745746
{
746747
result = SearchDirectoryForIWAD(iwad_dirs[i], mask, mission);
@@ -845,4 +846,3 @@ char *D_SuggestGameName(GameMission_t mission, GameMode_t mode)
845846

846847
return "Unknown game?";
847848
}
848-

0 commit comments

Comments
 (0)