TakeV
/
dxx-rebirth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Align capitalization of Data directory in instructions with the code 

Commit e6169f17f9 switched from searching `Data/` to searching
`data/`.  For users on case-insensitive filesystems, this is a no-op and
the instructions that reference the `Data` directory continue to work.
For users on case-sensitive filesystems, the change broke accessing the
data directory, and caused the instructions to mislead.  Given the age
of the commit, fixing the capitalization now will likely cause more
problems than it solves.  Instead, fix the capitalization of the
instructions, so that users who follow the documentation get a working
setup.

Reported-by: krux02 <https://github.com/dxx-rebirth/dxx-rebirth/issues/447>
Fixes: e6169f17f9 ("Add 'Data' subdir as a searchpath, so D2X will find descent.pig and to simplify a lot of file opening/checking/closing code")
This commit is contained in:
Kp 2019-08-25 17:06:34 +00:00
parent c355e207fe
commit e7275f8a8c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
d2x-rebirth/INSTALL.txt
View File

@ -79,14 +79,14 @@ Needed files:
With the PC version, these files - except the Movies (*.mvl) - are archived in the file
'descent2.sow' on the Descent2 CD-Rom.
This is an ARJ-archive and can be extracted with an adapted archiver like ÔunarjÕ or by installing the
This is an ARJ-archive and can be extracted with an adapted archiver like unarj or by installing the
game on a Windows/DOS system.
Note that the above files must be lowercase if you use an operating system with case-sensitive file management.
For the Mac CD-ROM, download The Unarchiver (http://wakaba.c3.cx/s/apps/unarchiver.html) and drag the
installer program onto it. Alternatively, use a computer with Mac OS 9 to run the installer, then copy over.
After installing, copy all the files from 'Data' on the CD to the 'Data' folder created.
After installing, copy all the files from 'Data' on the CD to the 'data' folder created.
Unfortunately the movies do not work; if you want the movies consider purchasing Descent 2 for PC
(e.g. from Good Old Games) and extract that installer with The Unarchiver. Hey, then you'll have
another license for multiplayer. ;)

2
similar/main/inferno.cpp
View File

@ -494,7 +494,7 @@ static int main(int argc, char *argv[])
#define DXX_MISSING_HOGFILE_ERROR_TEXT \
"Could not find a valid hog file (" DXX_HOGFILE_NAMES ")\nPossible locations are:\n" \
DXX_HOGFILE_PROGRAM_DATA_DIRECTORY \
"\tIn a subdirectory called 'Data'\n" \
"\tIn a subdirectory called 'data'\n" \
DXX_HOGFILE_APPLICATION_BUNDLE \
"Or use the -hogdir option to specify an alternate location."
UserError(DXX_MISSING_HOGFILE_ERROR_TEXT);