Merge branch upstream/master

2021-11-28 01:52:06 +02:00
parent d08040a7a9 501087058e
commit 41edadab81
108 changed files with 2653 additions and 1096 deletions
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -828,6 +828,7 @@ bool SettingDesc::IsEditable(bool do_command) const
 	if ((this->desc.flags & SGF_NEWGAME_ONLY) &&
 			(_game_mode == GM_NORMAL ||
 			(_game_mode == GM_EDITOR && !(this->desc.flags & SGF_SCENEDIT_TOO)))) return false;
+	if ((this->desc.flags & SGF_SCENEDIT_ONLY) && _game_mode != GM_EDITOR) return false;
 	return true;
 }