upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-24 14:52:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[side] save_id= now defaults to [side][leader]id=

Browse Source 
When neither id non save_id are present in [side]

Similar for [side]side_name which will now use
[leader]name= as a fallback.

As discussed in #3742
This commit is contained in:
gfgtdf 2023-04-30 23:39:32 +02:00
parent afadcfd7df
commit 4f6e0e4719
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/saved_game.cpp
View File

@ -242,9 +242,17 @@ void saved_game::set_defaults()
if(side["save_id"].empty()) {
side["save_id"] = side["id"];
}
if(side["save_id"].empty()) {
side["save_id"] = side.child_or_empty("leader")["id"];
}
if(!is_multiplayer_tag && side["side_name"].blank()) {
side["side_name"] = side["name"];
if(!is_multiplayer_tag) {
if(side["name"].blank()) {
side["name"] = side.child_or_empty("leader")["name"];
}
if(side["side_name"].blank()) {
side["side_name"] = side["name"];
}
}
if(!is_loaded_game && !side["current_player"].empty()) {