Try uppercase DIABDAT.MPQ (#1184)

It's uppercase in GOG and on the retail CD.
Other MPQs are not known to be uppercase.

.editorconfig

@@ -36,3 +36,6 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 end_of_line = lf
+
+[*.txt]
+end_of_line = lf

Packaging/OpenDingux/gkd350h-manual.txt

@@ -2,7 +2,6 @@ Copy diabdat.mpq from your CD (or GoG install folder) to:
 /usr/local/home/.local/share/diasurgical/devilution/
 
 For Hellfire, also copy hellfire.mpq, hfmonk.mpq, hfmusic.mpq, and hfvoice.mpq.
-All mpq filenames must be lowercase.
 
 Game saves and diablo.ini are located at:
 /usr/local/home/.local/share/diasurgical/devilution/

Packaging/OpenDingux/retrofw-manual.txt

@@ -2,7 +2,6 @@ Copy diabdat.mpq from your CD (or GoG install folder) to:
 ~/.local/share/diasurgical/
 
 For Hellfire, also copy hellfire.mpq, hfmonk.mpq, hfmusic.mpq, and hfvoice.mpq.
-All mpq filenames must be lowercase.
 
 Game saves and diablo.ini are located at:
 ~/.local/share/diasurgical/devilution

Packaging/OpenDingux/rg350-manual.txt

@@ -2,7 +2,6 @@ Copy diabdat.mpq from your CD (or GoG install folder) to:
 /media/home/.local/share/diasurgical/devilution/
 
 For Hellfire, also copy hellfire.mpq, hfmonk.mpq, hfmusic.mpq, and hfvoice.mpq.
-All mpq filenames must be lowercase.
 
 Game saves and diablo.ini are located at:
 /media/home/.local/share/diasurgical/devilution/

Packaging/cpi-gamesh/readme.md

@@ -37,4 +37,4 @@ The mapping is based on the standard GameShell keyboard layout, devilutionX uses
 | Start + X    | Enter + U    | Start + Y    | quest log |
 | Start + A    | Enter + J    | Start + B    | spell book |
 | Select + LK5                | Space + L                  | Select + R1                | right mouse click |
-| Select + A/B/X/Y            | Space + J/K/U/I         | Select + A/B/X/Y            | hot spell | 
+| Select + A/B/X/Y            | Space + J/K/U/I         | Select + A/B/X/Y            | hot spell |

Packaging/nix/README.txt

@@ -7,7 +7,7 @@ GitHub: https://github.com/diasurgical/devilutionX
 # How To Install:
  - Extract the files in the archive.
  - Install libsdl2 libsdl2-mixer libsdl2-ttf
- - Copy diabdat.mpq from your CD (or GoG install folder) to the DevilutionX install folder. Make sure it is all lowercase.
+ - Copy diabdat.mpq from your CD (or GoG install folder) to the DevilutionX install folder.
  - Run ./devilutionx
 
 # Multiplayer

Packaging/pi/README.txt

@@ -7,7 +7,7 @@ GitHub: https://github.com/diasurgical/devilutionX
 # How To Install:
  - Extract the files in the archive.
  - Install libsdl2 libsdl2-mixer libsdl2-ttf
- - Copy diabdat.mpq from your CD (or GoG install folder) to the DevilutionX install folder. Make sure it is all lowercase.
+ - Copy diabdat.mpq from your CD (or GoG install folder) to the DevilutionX install folder.
  - Run ./devilutionx
 
 # Raspberry Pi performance

Packaging/switch/README.txt

@@ -2,7 +2,7 @@
 
 # How To Install:
  - Put `devilutionx.nro` and `CharisSILB.ttf` in into `/switch/devilutionx`
- - Copy diabdat.mpq from your CD (or GoG install folder) to `/switch/devilutionx`. Make sure it is all lowercase.
+ - Copy diabdat.mpq from your CD (or GoG install folder) to `/switch/devilutionx`.
  - Launch `devilutionx.nro`. (Do not use album to launch; see the note below.)
  - *Note:* Hold R on any installed game and launch it. Do not use album to launch. If you use album, the homebrew will only have a small amount memory available, and the touch keyboard won't work. This is true for all homebrew, not just DevilutionX.
 

README.md

@@ -12,7 +12,7 @@ Nightly builds | Platform
 
 # How To Play:
  - Download [the latest DevilutionX release](https://github.com/diasurgical/devilutionX/releases), or build from source
- - Copy diabdat.mpq from your CD or GoG installation (or [extract it from the GoG installer](https://github.com/diasurgical/devilutionX/wiki/Extracting-the-DIABDAT.MPQ-from-the-GoG-installer)) to the DevilutionX install folder or data folder; make sure it is all lowercase. The DevilutionX install folder is the one that contains the DevilutionX executable. The data folder path may differ depending on OS version and security settings, but will normally be as follows:
+ - Copy diabdat.mpq from your CD or GoG installation (or [extract it from the GoG installer](https://github.com/diasurgical/devilutionX/wiki/Extracting-the-DIABDAT.MPQ-from-the-GoG-installer)) to the DevilutionX install folder or data folder. The DevilutionX install folder is the one that contains the DevilutionX executable. The data folder path may differ depending on OS version and security settings, but will normally be as follows:
     - macOS `~/Library/Application Support/diasurgical/devilution`
     - Linux `~/.local/share/diasurgical/devilution/`
     - Windows `C:\Users\[username]\AppData\Roaming\diasurgical\devilution`

Source/init.cpp

@@ -146,7 +146,12 @@ void init_archives()
 	fileinfo.versionstring = gszVersionNumber;
 	init_get_file_info();
 
-	diabdat_mpq = init_test_access("diabdat.mpq", "DiabloCD", 1000, FS_CD);
+	diabdat_mpq = init_test_access("DIABDAT.MPQ", "DiabloCD", 1000, FS_CD);
+	if (diabdat_mpq == NULL) {
+		// DIABDAT.MPQ is uppercase on the original CD and the GOG version.
+		diabdat_mpq = init_test_access("diabdat.mpq", "DiabloCD", 1000, FS_CD);
+	}
+
 	if (diabdat_mpq == NULL) {
 		spawn_mpq = init_test_access("spawn.mpq", "DiabloSpawn", 1000, FS_PC);
 		if (spawn_mpq != NULL)

docs/manual/platforms/gkd350h.md

@@ -5,7 +5,7 @@
 ## Installation
 
 1. Copy [devilutionx-gkd350h.opk](https://github.com/diasurgical/devilutionX/releases/latest/download/devilutionx-gkd350h.opk) to `/media/data/apps` or `/media/sdcard/apps/`.
-2. Copy `diabdat.mpq` (**all lowercase**) from your CD, or GoG install folder to:
+2. Copy `diabdat.mpq` from your CD, or GoG install folder to:
 
    ~~~
    /usr/local/home/.local/share/diasurgical/devilution/diabdat.mpq

docs/manual/platforms/retrofw.md

@@ -9,7 +9,7 @@ Demo video:
 **Requires RetroFW 2.0+.**
 
 1. Copy [devilutionx-retrofw.opk](https://github.com/diasurgical/devilutionX/releases/latest/download/devilutionx-retrofw.opk) to the apps directory.
-2. Copy `diabdat.mpq` (**all lowercase**) from your CD, or GoG install folder to:
+2. Copy `diabdat.mpq` from your CD, or GoG install folder to:
 
    ~~~
    ~/.local/share/diasurgical/devilution

docs/manual/platforms/rg350.md

@@ -10,7 +10,7 @@ Demo video:
 
 1. Copy [devilutionx-rg350.opk](https://github.com/diasurgical/devilutionX/releases/latest/download/devilutionx-rg350.opk) to `/media/sdcard/APPS/`.
 
-2. Copy `diabdat.mpq` (**all lowercase**) from your CD, or GoG install folder to:
+2. Copy `diabdat.mpq` from your CD, or GoG install folder to:
 
    ~~~
    /media/home/.local/share/diasurgical/devilution/diabdat.mpq

docs/manual/platforms/switch.md

@@ -4,7 +4,7 @@
 
 1. Download and unzip [devilutionx-switch.zip](https://github.com/diasurgical/devilutionX/releases/latest/download/devilutionx-switch.zip).
 2. Put `devilutionx.nro` and `CharisSILB.ttf` in into `/switch/devilutionx`
-3. Copy `diabdat.mpq` from your CD (or GoG install folder) to `/switch/devilutionx`. Make sure it is all lowercase.
+3. Copy `diabdat.mpq` from your CD (or GoG install folder) to `/switch/devilutionx`.
 
 ## Usage
 

docs/manual/platforms/vita.md

@@ -2,7 +2,7 @@
 
 ## How To Play:
  - Install VPK
- - Copy diabdat.mpq from your CD or GoG installation (or [extract it from the GoG installer](https://github.com/diasurgical/devilutionX/wiki/Extracting-the-DIABDAT.MPQ-from-the-GoG-installer)) to the `ux0:/data/diasurgical/devilution/`; make sure it is all lowercase.
+ - Copy diabdat.mpq from your CD or GoG installation (or [extract it from the GoG installer](https://github.com/diasurgical/devilutionX/wiki/Extracting-the-DIABDAT.MPQ-from-the-GoG-installer)) to the `ux0:/data/diasurgical/devilution/`.
 
 # Building from Source