Skip to content

Commit b56c1ff

Browse files
OrthamOrtham
committed
Set defaul masterlist branch to v0.17
This includes some formatting changes for the registry key strings, because I've now got format-on-save enabled.
1 parent d2669b6 commit b56c1ff

File tree

1 file changed

+59
-55
lines changed

1 file changed

+59
-55
lines changed

‎src/gui/state/game/game_settings.cpp‎

Lines changed: 59 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -36,50 +36,52 @@ using std::filesystem::u8path;
3636

3737
namespace loot {
3838
const std::set<std::string> GameSettings::oldDefaultBranches(
39-
{"master", "v0.7", "v0.8", "v0.10", "v0.13", "v0.14"});
39+
{"master", "v0.7", "v0.8", "v0.10", "v0.13", "v0.14", "v0.15"});
4040

4141
GameSettings::GameSettings() :
4242
type_(GameType::tes4), mininumHeaderVersion_(0.0f) {}
4343

4444
GameSettings::GameSettings(const GameType gameCode, const std::string& folder) :
45-
type_(gameCode), repositoryBranch_("v0.15") {
45+
type_(gameCode), repositoryBranch_("v0.17") {
4646
if (Type() == GameType::tes3) {
4747
name_ = "TES III: Morrowind";
48-
registryKeys_ = {
49-
"Software\\Bethesda Softworks\\Morrowind\\Installed Path",
50-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 22320\\InstallLocation",
51-
"Software\\GOG.com\\Games\\1440163901\\path",
52-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\1440163901_is1\\InstallLocation",
53-
"Software\\GOG.com\\Games\\1435828767\\path",
54-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\1435828767_is1\\InstallLocation"
55-
};
48+
registryKeys_ = {"Software\\Bethesda Softworks\\Morrowind\\Installed Path",
49+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
50+
"Steam App 22320\\InstallLocation",
51+
"Software\\GOG.com\\Games\\1440163901\\path",
52+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
53+
"1440163901_is1\\InstallLocation",
54+
"Software\\GOG.com\\Games\\1435828767\\path",
55+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
56+
"1435828767_is1\\InstallLocation"};
5657
pluginsFolderName_ = "Data Files";
5758
lootFolderName_ = "Morrowind";
5859
masterFile_ = "Morrowind.esm";
5960
mininumHeaderVersion_ = 1.2f;
6061
repositoryURL_ = "https://github.com/loot/morrowind.git";
6162
} else if (Type() == GameType::tes4) {
6263
name_ = "TES IV: Oblivion";
63-
registryKeys_ = {
64-
"Software\\Bethesda Softworks\\Oblivion\\Installed Path",
65-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 22330\\InstallLocation",
66-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 900883\\InstallLocation",
67-
"Software\\GOG.com\\Games\\1242989820\\path",
68-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\1242989820_is1\\InstallLocation",
69-
"Software\\GOG.com\\Games\\1458058109\\path",
70-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\1458058109_is1\\InstallLocation"
71-
};
64+
registryKeys_ = {"Software\\Bethesda Softworks\\Oblivion\\Installed Path",
65+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
66+
"Steam App 22330\\InstallLocation",
67+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
68+
"Steam App 900883\\InstallLocation",
69+
"Software\\GOG.com\\Games\\1242989820\\path",
70+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
71+
"1242989820_is1\\InstallLocation",
72+
"Software\\GOG.com\\Games\\1458058109\\path",
73+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
74+
"1458058109_is1\\InstallLocation"};
7275
pluginsFolderName_ = "Data";
7376
lootFolderName_ = "Oblivion";
7477
masterFile_ = "Oblivion.esm";
7578
mininumHeaderVersion_ = 0.8f;
7679
repositoryURL_ = "https://github.com/loot/oblivion.git";
7780
} else if (Type() == GameType::tes5) {
7881
name_ = "TES V: Skyrim";
79-
registryKeys_ = {
80-
"Software\\Bethesda Softworks\\Skyrim\\Installed Path",
81-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 72850\\InstallLocation"
82-
};
82+
registryKeys_ = {"Software\\Bethesda Softworks\\Skyrim\\Installed Path",
83+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
84+
"Steam App 72850\\InstallLocation"};
8385
pluginsFolderName_ = "Data";
8486
lootFolderName_ = "Skyrim";
8587
masterFile_ = "Skyrim.esm";
@@ -88,63 +90,65 @@ GameSettings::GameSettings(const GameType gameCode, const std::string& folder) :
8890
} else if (Type() == GameType::tes5se) {
8991
name_ = "TES V: Skyrim Special Edition";
9092
registryKeys_ = {
91-
"Software\\Bethesda Softworks\\Skyrim Special Edition\\Installed Path",
92-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 489830\\InstallLocation"
93-
};
93+
"Software\\Bethesda Softworks\\Skyrim Special Edition\\Installed Path",
94+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App "
95+
"489830\\InstallLocation"};
9496
pluginsFolderName_ = "Data";
9597
lootFolderName_ = "Skyrim Special Edition";
9698
masterFile_ = "Skyrim.esm";
9799
mininumHeaderVersion_ = 1.7f;
98100
repositoryURL_ = "https://github.com/loot/skyrimse.git";
99101
} else if (Type() == GameType::tes5vr) {
100102
name_ = "TES V: Skyrim VR";
101-
registryKeys_ = {
102-
"Software\\Bethesda Softworks\\Skyrim VR\\Installed Path",
103-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 611670\\InstallLocation"
104-
};
103+
registryKeys_ = {"Software\\Bethesda Softworks\\Skyrim VR\\Installed Path",
104+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
105+
"Steam App 611670\\InstallLocation"};
105106
pluginsFolderName_ = "Data";
106107
lootFolderName_ = "Skyrim VR";
107108
masterFile_ = "Skyrim.esm";
108109
mininumHeaderVersion_ = 1.7f;
109110
repositoryURL_ = "https://github.com/loot/skyrimvr.git";
110111
} else if (Type() == GameType::fo3) {
111112
name_ = "Fallout 3";
112-
registryKeys_ = {
113-
"Software\\Bethesda Softworks\\Fallout3\\Installed Path",
114-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 22300\\InstallLocation",
115-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 22370\\InstallLocation",
116-
"Software\\GOG.com\\Games\\1454315831\\path",
117-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\1454315831_is1\\InstallLocation",
118-
"Software\\GOG.com\\Games\\1248282609\\path",
119-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\1248282609_is1\\InstallLocation"
120-
};
113+
registryKeys_ = {"Software\\Bethesda Softworks\\Fallout3\\Installed Path",
114+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
115+
"Steam App 22300\\InstallLocation",
116+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
117+
"Steam App 22370\\InstallLocation",
118+
"Software\\GOG.com\\Games\\1454315831\\path",
119+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
120+
"1454315831_is1\\InstallLocation",
121+
"Software\\GOG.com\\Games\\1248282609\\path",
122+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
123+
"1248282609_is1\\InstallLocation"};
121124
pluginsFolderName_ = "Data";
122125
lootFolderName_ = "Fallout3";
123126
masterFile_ = "Fallout3.esm";
124127
mininumHeaderVersion_ = 0.94f;
125128
repositoryURL_ = "https://github.com/loot/fallout3.git";
126129
} else if (Type() == GameType::fonv) {
127130
name_ = "Fallout: New Vegas";
128-
registryKeys_ = {
129-
"Software\\Bethesda Softworks\\FalloutNV\\Installed Path",
130-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 22380\\InstallLocation",
131-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 22490\\InstallLocation",
132-
"Software\\GOG.com\\Games\\1312824873\\path",
133-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\1312824873_is1\\InstallLocation",
134-
"Software\\GOG.com\\Games\\1454587428\\path",
135-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\1454587428_is1\\InstallLocation"
136-
};
131+
registryKeys_ = {"Software\\Bethesda Softworks\\FalloutNV\\Installed Path",
132+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
133+
"Steam App 22380\\InstallLocation",
134+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
135+
"Steam App 22490\\InstallLocation",
136+
"Software\\GOG.com\\Games\\1312824873\\path",
137+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
138+
"1312824873_is1\\InstallLocation",
139+
"Software\\GOG.com\\Games\\1454587428\\path",
140+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
141+
"1454587428_is1\\InstallLocation"};
137142
pluginsFolderName_ = "Data";
138143
lootFolderName_ = "FalloutNV";
139144
masterFile_ = "FalloutNV.esm";
140145
mininumHeaderVersion_ = 1.32f;
141146
repositoryURL_ = "https://github.com/loot/falloutnv.git";
142147
} else if (Type() == GameType::fo4) {
143148
name_ = "Fallout 4";
144-
registryKeys_ = {
145-
"Software\\Bethesda Softworks\\Fallout4\\Installed Path",
146-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 377160\\InstallLocation"
147-
};
149+
registryKeys_ = {"Software\\Bethesda Softworks\\Fallout4\\Installed Path",
150+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"
151+
"Steam App 377160\\InstallLocation"};
148152
pluginsFolderName_ = "Data";
149153
lootFolderName_ = "Fallout4";
150154
masterFile_ = "Fallout4.esm";
@@ -153,9 +157,9 @@ GameSettings::GameSettings(const GameType gameCode, const std::string& folder) :
153157
} else if (Type() == GameType::fo4vr) {
154158
name_ = "Fallout 4 VR";
155159
registryKeys_ = {
156-
"Software\\Bethesda Softworks\\Fallout 4 VR\\Installed Path",
157-
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App 611660\\InstallLocation"
158-
};
160+
"Software\\Bethesda Softworks\\Fallout 4 VR\\Installed Path",
161+
"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Steam App "
162+
"611660\\InstallLocation"};
159163
pluginsFolderName_ = "Data";
160164
lootFolderName_ = "Fallout4VR";
161165
masterFile_ = "Fallout4.esm";

0 commit comments

Comments
 (0)