Merge branch 'master' of https://github.com/wesnoth/wesnoth

Conflicts:
	changelog

changelog

@@ -35,6 +35,7 @@ Version 1.13.0-dev:
    * Singleplayer campaign creation now utilizes the create, configure,
      and connect engines from the multiplayer codepath.
    * Eras, mods, and options are now available for sp campaigns.
+   * Fix sighted events firing too early in several scenarios. Fixes bug #22466
    * Descent into Darkness:
      * Fixed various issues with player and enemy gold and income in
        'Descent into Darkness'.
@@ -105,6 +106,8 @@ Version 1.13.0-dev:
      WML in text form instead of a simplified version.
    * Added a button to copy the currently displayed content from the :inspect
      dialog to clipboard.
+   * WML array elements are now displayed with subscripts in the :inspect
+     dialog.
    * Added a button to copy the in-game Chat Log dialog contents to clipboard.
    * Fixed the WML load error dialog not displaying an add-on name instead of
      falling back to its directory name if the add-on contains an outdated
@@ -118,7 +121,7 @@ Version 1.13.0-dev:
      language (bug #22092).
    * Added a new "Advanced Settings" button and dialog to campaign select.
    * Added new wml attributes to listbox: has_minimum and has_maximum.
-   * Added a "Disable automatic moves" preference to disable automatic movements 
+   * Added a "Disable automatic moves" preference to disable automatic movements
      at the begining of a turn.
    * In the dialog layout code, fixed the button padding  (bug #22379).
    * Fixed mouse tracking issue with workaround by changing the default window
@@ -335,6 +338,8 @@ Version 1.13.0-dev:
      where the Second Watch picture should be used instead (bug #22537).
    * Fixed mishandling of nested subnamespaces by the [clear_global_variable]
      WML action causing an assertion failure (bug #21093).
+   * Fix bug #22443: Scenario Settings table has inaccurate Start Gold info in certain cases
+   * Fix Grand Knight image being distorted in the sidebar
    * Fix bug #22251: Map labels not appearing in mp
 
 Version 1.11.11:

data/scenario-test.cfg

@@ -1434,8 +1434,23 @@ My best advancement costs $next_cost gold and I’m $experience|% there."
         [/message]
     [/event]
 
+    [event]
+        name=prestart
+
+        [gold]
+            side=1
+            amount=42
+        [/gold]
+    [/event]
+
     [event]
         name=start
+
+        [gold]
+            side=1
+            amount=1000
+        [/gold]
+
         [lua]
             code = <<
                 wesnoth.set_village_owner(20, 1, 1)

src/gui/dialogs/gamestate_inspector.cpp

@@ -239,12 +239,23 @@ public:
 			model_.add_row_to_stuff_list(a.first, a.first);
 		}
 
+		std::map<std::string, size_t> wml_array_sizes;
+
 		FOREACH(const AUTO & c, vars.all_children_range())
 		{
+			if (wml_array_sizes.find(c.key) == wml_array_sizes.end()) {
+				wml_array_sizes[c.key] = 0;
+			} else {
+				++wml_array_sizes[c.key];
+			}
+
 			unsigned int num_pages = model_.get_num_page(config_to_string(c.cfg));
 			for (unsigned int i = 0; i < num_pages; i++) {
 				std::ostringstream cur_str;
-				cur_str << "[" << c.key << "] " << (i + 1) << "/" << num_pages;
+				cur_str << "[" << c.key << "][" << wml_array_sizes[c.key] << "]";
+				if (num_pages > 1) {
+					cur_str << " " << (i + 1) << "/" << num_pages;
+				}
 				model_.add_row_to_stuff_list(cur_str.str(), cur_str.str());
 			}
 		}

src/play_controller.cpp

@@ -463,6 +463,14 @@ void play_controller::fire_start(bool execute){
 		// start event may modify start turn with WML, reflect any changes.
 		start_turn_ = turn();
 		gamestate_.gamedata_.get_variable("turn_number") = int(start_turn_);
+
+		// prestart and start events may modify the initial gold amount,
+		// reflect any changes.
+		BOOST_FOREACH(team& tm, gamestate_.board_.teams_)
+		{
+			tm.set_start_gold(tm.gold());
+		}
+
 	} else {
 		it_is_a_new_turn_ = false;
 	}

src/team.hpp

@@ -188,6 +188,7 @@ public:
 	void new_turn() { gold_ += total_income(); }
 	void get_shared_maps();
 	void set_gold(int amount) { gold_ = amount; }
+	void set_start_gold(const int amount) { info_.start_gold = amount; }
 	void spend_gold(const int amount) { gold_ -= amount; }
 	void set_gold_add(bool b) {info_.gold_add = b; }
 	void set_base_income(int amount) { info_.income = amount - game_config::base_income; }