MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove globals from paths.h

Browse source 
Fix for Vita

Update to use free functions

Use std::optional to allow setting empty paths

Change header inclusion order

Co-authored-by: Gleb Mazovetskiy <glex.spb@gmail.com>

Use std::optional to allow setting empty paths

Apply clang-format

Temporary commit
This commit is contained in:
Jmgr 2021-04-25 12:32:17 +01:00 • committed by Anders Jenbo
commit d4f62870b8
12 changed files with 89 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/init.cpp
View file

@ -152,8 +152,8 @@ void init_archives()
std::vector<std::string> paths;
paths.reserve(5);
paths.push_back(GetBasePath());
paths.push_back(GetPrefPath());
paths.push_back(paths::BasePath());
paths.push_back(paths::PrefPath());
if (paths[0] == paths[1])
paths.pop_back();