Skip to content

Commit 6d1ac3c

Browse files
razaqqrazaqq
committed
fix replay path detection when using aslains versioned replays
1 parent 1d9f84f commit 6d1ac3c

File tree

5 files changed

+435
-7
lines changed

5 files changed

+435
-7
lines changed

‎Client/src/Game.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,9 @@ Result<GameInfo> ReadGameInfo(const fs::path& path)
363363

364364
PA_TRY(preferences, ReadPreferences(path));
365365
PA_TRY(binPath, GetBinPath(path, preferences.GameVersion));
366-
PA_TRY(engineConfig, ReadEngineConfig(binPath / "res" / "engine_config.xml"));
366+
// engine config in res_mods takes precedence
367+
const fs::path resModsEngineCfg = binPath / "res_mods" / "engine_config.xml";
368+
PA_TRY(engineConfig, ReadEngineConfig(File::Exists(resModsEngineCfg) ? resModsEngineCfg : binPath / "res" / "engine_config.xml"));
367369

368370
const fs::path idxPath = binPath / "idx";
369371
const fs::path pkgPath = path / "res_packages";
@@ -389,11 +391,6 @@ Result<GameInfo> ReadGameInfo(const fs::path& path)
389391
}
390392
}
391393

392-
std::erase_if(replaysPaths, [](const fs::path& p)
393-
{
394-
return !fs::exists(p);
395-
});
396-
397394
return GameInfo
398395
{
399396
.GameVersion = preferences.GameVersion,

‎Test/Data/GameDirectories/res_mods_versioned/bin/8893005/res/engine_config.xml

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
<engine_config.xml>
2+
<renderer>
3+
<cacheEffects>false</cacheEffects>
4+
<gammaCorrectionOutside>1.0</gammaCorrectionOutside>
5+
<gammaCorrectionInside>1.0</gammaCorrectionInside>
6+
<gammaCorrectionSpeed>0.2</gammaCorrectionSpeed>
7+
<tripleBuffering>true</tripleBuffering>
8+
<maxFrameRate>0</maxFrameRate>
9+
<maxDockFrameRate>75</maxDockFrameRate>
10+
<enableTextureStreaming>true</enableTextureStreaming>
11+
<textureStreamingMode>0</textureStreamingMode>
12+
<useAsyncRenderThread>true</useAsyncRenderThread>
13+
</renderer>
14+
<animation>
15+
<optimize>false</optimize>
16+
<lod>
17+
<distance>20</distance>
18+
<frames>2</frames>
19+
</lod>
20+
<lod>
21+
<distance>50</distance>
22+
<frames>3</frames>
23+
</lod>
24+
<lod>
25+
<distance>125</distance>
26+
<frames>4</frames>
27+
</lod>
28+
<lod>
29+
<distance>312</distance>
30+
<frames>5</frames>
31+
</lod>
32+
<lod>
33+
<distance>781</distance>
34+
<frames>6</frames>
35+
</lod>
36+
</animation>
37+
<inputDevices>
38+
<exclusive>true</exclusive>
39+
</inputDevices>
40+
<accessMonitor>false</accessMonitor>
41+
<alertsEnabled>false</alertsEnabled>
42+
<entities>
43+
<disablePreloads>false</disablePreloads>
44+
<enforcePreloads>false</enforcePreloads>
45+
<entityCollision>true</entityCollision>
46+
<particlesActive>true</particlesActive>
47+
</entities>
48+
<ui>
49+
<loadingScreen>gui/gameface/game_loading/index.html</loadingScreen>
50+
<alertTexture>system/maps/icon_tex_frame.bmp</alertTexture>
51+
<alertTexture>system/maps/icon_poly.bmp</alertTexture>
52+
<alertTexture>system/maps/icon_tex_total.bmp</alertTexture>
53+
<alertTexture>system/maps/icon_anim.bmp</alertTexture>
54+
<alertTexture>system/maps/icon_mesh.bmp</alertTexture>
55+
<alertTexture>system/maps/icon_framerate_warning.bmp</alertTexture>
56+
<straferate>5.0</straferate>
57+
<loadingText>151 231 233</loadingText>
58+
<enableLanguageBar>false</enableLanguageBar>
59+
<maxInLoadingFrameSkip>-1</maxInLoadingFrameSkip>
60+
<maxInDockFrameSkip>50</maxInDockFrameSkip>
61+
<maxInBattleFrameSkip>0</maxInBattleFrameSkip>
62+
<forcePromoFlow>false</forcePromoFlow>
63+
<currentLoadingVideo>gui/video/login/main.webm</currentLoadingVideo>
64+
<currentPromoVideo/>
65+
<currentPromoVideoAudioTracks/>
66+
<currentStaticScreen>gui/game_loading/static_screen.jpg</currentStaticScreen>
67+
<autoSkipLoadingVideo>false</autoSkipLoadingVideo>
68+
<enableAccountTransfer>true</enableAccountTransfer>
69+
</ui>
70+
<camera>
71+
<lookTable>0.00 0.00</lookTable>
72+
<lookTable>0.10 0.05</lookTable>
73+
<lookTable>0.30 0.10</lookTable>
74+
<lookTable>0.50 0.15</lookTable>
75+
<lookTable>0.70 0.30</lookTable>
76+
<lookTable>0.90 1.00</lookTable>
77+
<lookAxisMin>0.10</lookAxisMin>
78+
<lookAxisMax>0.91</lookAxisMax>
79+
<cameraYawSpeed>90</cameraYawSpeed>
80+
<cameraPitchSpeed>60</cameraPitchSpeed>
81+
<accelerateStart>0.00</accelerateStart>
82+
<accelerateRate>2.00</accelerateRate>
83+
<accelerateEnd>1.00</accelerateEnd>
84+
</camera>
85+
<directionCursor>
86+
<invertVerticalMovement>false</invertVerticalMovement>
87+
<mouseSensitivity>0.005</mouseSensitivity>
88+
<mouseHVBias>0.667</mouseHVBias>
89+
<maxPitch>50.0</maxPitch>
90+
<minPitch>-65.0</minPitch>
91+
<yaw>0.000</yaw>
92+
<pitch>0.000</pitch>
93+
<lookSpring>false</lookSpring>
94+
<lookSpringRate>0.75</lookSpringRate>
95+
<lookSpringIdleTime>3600.0</lookSpringIdleTime>
96+
<lookSpringOnMove>true</lookSpringOnMove>
97+
</directionCursor>
98+
<soundSettings>
99+
<muteEnabled>true</muteEnabled>
100+
</soundSettings>
101+
<xmppSettings>
102+
<releaseLogs>false</releaseLogs>
103+
</xmppSettings>
104+
<vivoxSettings>
105+
<logsEnabled>true</logsEnabled>
106+
<logsFilter>4</logsFilter>
107+
<extendedEventLogs>false</extendedEventLogs>
108+
</vivoxSettings>
109+
<hangDetector>
110+
<enable>false</enable>
111+
<hangUpdateDelay>4000</hangUpdateDelay>
112+
<hangFailCount>10</hangFailCount>
113+
</hangDetector>
114+
<fpsgathering>true</fpsgathering>
115+
<customization>
116+
<currentRealm>ww</currentRealm>
117+
</customization>
118+
<webBrowser>
119+
<userAgent>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.134 Safari/537.36 WOWS/1.0</userAgent>
120+
<cachePath>cef_cache</cachePath>
121+
<maxFrameRate>60</maxFrameRate>
122+
<logVerbosity>info</logVerbosity>
123+
<enableStatistics/>
124+
<debugLog>debug.log</debugLog>
125+
<debugLogMaxFilesCount>4</debugLogMaxFilesCount>
126+
<debugLogMaxFileSizeMB>10</debugLogMaxFileSizeMB>
127+
<pathBase>CWD</pathBase>
128+
<dirPath>profile</dirPath>
129+
<autoPlayVideo>true</autoPlayVideo>
130+
</webBrowser>
131+
<window>
132+
<iconBlinkPeriod>0</iconBlinkPeriod>
133+
</window>
134+
<scriptLogger>
135+
<fileSizeInMb>2</fileSizeInMb>
136+
<volumesCount>4</volumesCount>
137+
<dirPath>profile</dirPath>
138+
<pathBase>CWD</pathBase>
139+
</scriptLogger>
140+
<memleaks>
141+
<dirPath>profile</dirPath>
142+
<name>memleaks.log</name>
143+
<pathBase>CWD</pathBase>
144+
</memleaks>
145+
<allocations>
146+
<dirPath>allocations</dirPath>
147+
<name>allocation_stats.log</name>
148+
<pathBase>CWD</pathBase>
149+
</allocations>
150+
<crashes>
151+
<dirPath>crashes</dirPath>
152+
<pathBase>CWD</pathBase>
153+
<reportScriptExceptions>false</reportScriptExceptions>
154+
<crashDumpLevel>1</crashDumpLevel>
155+
</crashes>
156+
<debug>
157+
<profilerBufferSize>54331648</profilerBufferSize>
158+
<statisticsLog>false</statisticsLog>
159+
<battleLogOnly>false</battleLogOnly>
160+
<postBattleAllocationsLogs>False</postBattleAllocationsLogs>
161+
<profilerPort>39999</profilerPort>
162+
<dxdiag_file>dxdiag.exe /whql:off /t</dxdiag_file>
163+
<errorsLogPath>errors.log</errorsLogPath>
164+
<enableErrorsLogging>true</enableErrorsLogging>
165+
<enableScaleformStats>false</enableScaleformStats>
166+
<enableActionscriptLeaksTracking>false</enableActionscriptLeaksTracking>
167+
<enableScaleformFrameNumberInLog>false</enableScaleformFrameNumberInLog>
168+
<enableMemGroupMetrics>false</enableMemGroupMetrics>
169+
<dirPath>profile</dirPath>
170+
<pathBase>CWD</pathBase>
171+
</debug>
172+
<preferences>
173+
<pathBase>CWD</pathBase>
174+
</preferences>
175+
<currentrealm>
176+
<pathBase>CWD</pathBase>
177+
</currentrealm>
178+
<screenShot>
179+
<extension>jpg</extension>
180+
<name>shot</name>
181+
<dirPath>screenshot</dirPath>
182+
<pathBase>CWD</pathBase>
183+
</screenShot>
184+
<profile>
185+
<pathBase>CWD</pathBase>
186+
</profile>
187+
<replays>
188+
<dirPath>replays</dirPath>
189+
<pathBase>CWD</pathBase>
190+
<versioned>false</versioned>
191+
<maxReplaysToSave>30</maxReplaysToSave>
192+
<skipBattleResults>false</skipBattleResults>
193+
</replays>
194+
<platformParameters>
195+
<msStore>
196+
<uwpShell>
197+
<protocol>net.wargaming.launcher</protocol>
198+
<appService>CommunicationService</appService>
199+
</uwpShell>
200+
</msStore>
201+
</platformParameters>
202+
</engine_config.xml>

0 commit comments

Comments
 (0)