mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Install devilutionx.mpq on Linux 

1. Installs devilutionx.mpq on Linux.
2. Falls back to finding it in the install location.
pull/1199/head
Gleb Mazovetskiy 5 years ago committed by Anders Jenbo
parent
dc47832877
commit
c52505388b
3 changed files with 45 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      .editorconfig
  2. 3
      CMakeLists.txt
  3. 56
      Source/init.cpp

9
.editorconfig
Unescape View File

@ -24,10 +24,6 @@ end_of_line = lf
[.gitignore]
end_of_line = lf
[CMakeLists.txt]
indent_style = space
indent_size = 2
[*.cmake]
indent_style = space
indent_size = 2
@ -39,3 +35,8 @@ end_of_line = lf
[*.txt]
end_of_line = lf
[CMakeLists.txt]
indent_style = space
indent_size = 2
end_of_line = crlf

3
CMakeLists.txt
Unescape View File

@ -842,6 +842,9 @@ if(CPACK)
install(FILES "${PROJECT_SOURCE_DIR}/Packaging/nix/README.txt"
DESTINATION "share/diasurgical/${project_name}"
)
install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/devilutionx.mpq"
DESTINATION "share/diasurgical/${project_name}"
)
install(FILES "${PROJECT_SOURCE_DIR}/Packaging/resources/icon.png"
DESTINATION "share/icons/hicolor/512x512/apps"
RENAME "${project_name}.png"

56
Source/init.cpp
Unescape View File

@ -4,6 +4,7 @@
* Implementation of routines for initializing the environment, disable screen saver, load MPQ.
*/
#include <string>
#include <vector>
#include "all.h"
#include "paths.h"
@ -49,19 +50,18 @@ HANDLE devilutionx_mpq;
namespace {
HANDLE init_test_access(const char *mpq_name, const char *reg_loc, int dwPriority, int fs)
HANDLE init_test_access(const std::vector<std::string> &paths, const char *mpq_name, const char *reg_loc, int dwPriority, int fs)
{
HANDLE archive;
const std::string *paths[2] = { &GetBasePath(), &GetPrefPath() };
std::string mpq_abspath;
DWORD mpq_flags = 0;
#if !defined(__SWITCH__) && !defined(__AMIGA__) && !defined(__vita__)
mpq_flags |= MPQ_FLAG_READ_ONLY;
#endif
for (int i = 0; i < 2; i++) {
mpq_abspath = *paths[i] + mpq_name;
for (int i = 0; i < paths.size(); i++) {
mpq_abspath = paths[i] + mpq_name;
if (SFileOpenArchive(mpq_abspath.c_str(), dwPriority, mpq_flags, &archive)) {
SFileSetBasePath(paths[i]->c_str());
SFileSetBasePath(paths[i].c_str());
return archive;
}
}
@ -146,14 +146,20 @@ void init_archives()
fileinfo.versionstring = gszVersionNumber;
init_get_file_info();
diabdat_mpq = init_test_access("DIABDAT.MPQ", "DiabloCD", 1000, FS_CD);
std::vector<std::string> paths;
paths.reserve(2);
paths.push_back(GetBasePath());
paths.push_back(GetPrefPath());
if (paths[0] == paths[1]) paths.pop_back();
diabdat_mpq = init_test_access(paths, "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);
diabdat_mpq = init_test_access(paths, "diabdat.mpq", "DiabloCD", 1000, FS_CD);
}
if (diabdat_mpq == NULL) {
spawn_mpq = init_test_access("spawn.mpq", "DiabloSpawn", 1000, FS_PC);
spawn_mpq = init_test_access(paths, "spawn.mpq", "DiabloSpawn", 1000, FS_PC);
if (spawn_mpq != NULL)
gbIsSpawn = true;
}
@ -161,25 +167,37 @@ void init_archives()
InsertCDDlg();
SFileCloseFile(fh);
patch_rt_mpq = init_test_access("patch_rt.mpq", "DiabloInstall", 2000, FS_PC);
patch_rt_mpq = init_test_access(paths, "patch_rt.mpq", "DiabloInstall", 2000, FS_PC);
if (patch_rt_mpq == NULL)
patch_rt_mpq = init_test_access("patch_sh.mpq", "DiabloSpawn", 2000, FS_PC);
patch_rt_mpq = init_test_access(paths, "patch_sh.mpq", "DiabloSpawn", 2000, FS_PC);
hellfire_mpq = init_test_access("hellfire.mpq", "DiabloInstall", 8000, FS_PC);
hellfire_mpq = init_test_access(paths, "hellfire.mpq", "DiabloInstall", 8000, FS_PC);
if (hellfire_mpq != NULL)
gbIsHellfire = true;
hfmonk_mpq = init_test_access("hfmonk.mpq", "DiabloInstall", 8100, FS_PC);
hfbard_mpq = init_test_access("hfbard.mpq", "DiabloInstall", 8110, FS_PC);
hfmonk_mpq = init_test_access(paths, "hfmonk.mpq", "DiabloInstall", 8100, FS_PC);
hfbard_mpq = init_test_access(paths, "hfbard.mpq", "DiabloInstall", 8110, FS_PC);
if (hfbard_mpq != NULL)
gbBard = true;
hfbarb_mpq = init_test_access("hfbarb.mpq", "DiabloInstall", 8120, FS_PC);
hfbarb_mpq = init_test_access(paths, "hfbarb.mpq", "DiabloInstall", 8120, FS_PC);
if (hfbarb_mpq != NULL)
gbBarbarian = true;
hfmusic_mpq = init_test_access("hfmusic.mpq", "DiabloInstall", 8200, FS_PC);
hfvoice_mpq = init_test_access("hfvoice.mpq", "DiabloInstall", 8500, FS_PC);
hfopt1_mpq = init_test_access("hfopt1.mpq", "DiabloInstall", 8600, FS_PC);
hfopt2_mpq = init_test_access("hfopt2.mpq", "DiabloInstall", 8610, FS_PC);
devilutionx_mpq = init_test_access("devilutionx.mpq", "DiabloInstall", 9000, FS_PC);
hfmusic_mpq = init_test_access(paths, "hfmusic.mpq", "DiabloInstall", 8200, FS_PC);
hfvoice_mpq = init_test_access(paths, "hfvoice.mpq", "DiabloInstall", 8500, FS_PC);
hfopt1_mpq = init_test_access(paths, "hfopt1.mpq", "DiabloInstall", 8600, FS_PC);
hfopt2_mpq = init_test_access(paths, "hfopt2.mpq", "DiabloInstall", 8610, FS_PC);
devilutionx_mpq = init_test_access(paths, "devilutionx.mpq", "DiabloInstall", 9000, FS_PC);
#ifdef __linux__
// On Linux, always try the global install directory for devilutionx.mpq,
// so that it is picked up even if `--data-dir` and `--config-dir` are set.
if (devilutionx_mpq == NULL) {
std::vector<std::string> share_paths;
share_paths.reserve(3);
share_paths.push_back("/usr/share/diasurgical/devilutionx/");
share_paths.push_back("/usr/local/share/diasurgical/devilutionx/");
share_paths.push_back(""); // PWD
devilutionx_mpq = init_test_access(share_paths, "devilutionx.mpq", "DiabloInstall", 9000, FS_PC);
}
#endif
}
void init_create_window()

Write Preview
Loading…
Cancel
Save