Merge branch 'master' into jgrpp

# Conflicts: # src/lang/korean.txt # src/misc_gui.cpp
2022-12-04 20:45:48 +00:00
parent 6d4474b84e 2c5eb206d4
commit 9ada7380ef
19 changed files with 339 additions and 106 deletions
--- a/src/script/api/script_object.cpp
+++ b/src/script/api/script_object.cpp
@@ -110,7 +110,7 @@ ScriptObject::ActiveInstance::~ActiveInstance()

 /* static */ void ScriptObject::SetDoCommandCosts(Money value)
 {
-	GetStorage()->costs = CommandCost(value);
+	GetStorage()->costs = CommandCost(INVALID_EXPENSES, value); // Expense type is never read.
 }

 /* static */ void ScriptObject::IncreaseDoCommandCosts(Money value)