Merge branch 'master' into jgrpp

# Conflicts: # src/gamelog.cpp
2020-05-11 00:45:24 +01:00
parent 0202211514 39092ee13b
commit 763a2826b6
9 changed files with 122 additions and 26 deletions
--- a/src/gamelog.cpp
+++ b/src/gamelog.cpp
@@ -63,7 +63,7 @@ void GamelogStopAction()
 	if (print) GamelogPrintDebug(5);
 }

-void GamelogStopActionIfStarted()
+void GamelogStopAnyAction()
 {
 	if (_gamelog_action_type != GLAT_NONE) GamelogStopAction();
 }