dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/crashlog.cpp
#	src/gfx.cpp
#	src/network/network_client.cpp
#	src/openttd.cpp
#	src/openttd.h
#	src/saveload/saveload.cpp
#	src/survey.cpp
This commit is contained in:
Jonathan G Rennison
2024-03-16 18:06:09 +00:00
parent 8066309074 3e625b5b1a
commit 041e71ec05
32 changed files with 857 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openttd.cpp
View File

@@ -772,8 +772,8 @@ int openttd_main(int argc, char *argv[])
PerThreadSetup();
SlXvSetStaticCurrentVersions();
_switch_mode_time = std::chrono::steady_clock::now();
_switch_mode_time_valid = true;
_game_session_stats.start_time = std::chrono::steady_clock::now();
_game_session_stats.savegame_size = std::nullopt;
std::string musicdriver;
std::string sounddriver;
@@ -1430,8 +1430,8 @@ void SwitchToMode(SwitchMode new_mode)
/* Keep track when we last switch mode. Used for survey, to know how long someone was in a game. */
if (new_mode != SM_SAVE_GAME) {
_switch_mode_time = std::chrono::steady_clock::now();
_switch_mode_time_valid = true;
_game_session_stats.start_time = std::chrono::steady_clock::now();
_game_session_stats.savegame_size = std::nullopt;
}
switch (new_mode) {