From 89a2d0a60546cb27055c42a757640ab4882c3210 Mon Sep 17 00:00:00 2001 From: Tyler Trahan Date: Sun, 13 Nov 2022 09:30:46 -0700 Subject: [PATCH] Fix #10154: Don't inconsistently set random company face in network games (#10157) --- src/company_cmd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp index 6d3f5b6256..a4e5fc9c3b 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -569,8 +569,8 @@ Company *DoStartupNewCompany(bool is_ai, CompanyID company = INVALID_COMPANY) c->inaugurated_year = _cur_year; /* If starting a player company in singleplayer and a favorite company manager face is selected, choose it. Otherwise, use a random face. - * In a network game, we'll choose the favorite face later in CmdCompanyCtrl to sync it to all clients, but we choose it here for the first (host) company. */ - if (_company_manager_face != 0 && !is_ai) { + * In a network game, we'll choose the favorite face later in CmdCompanyCtrl to sync it to all clients. */ + if (_company_manager_face != 0 && !is_ai && !_networking) { c->face = _company_manager_face; } else { RandomCompanyManagerFaceBits(c->face, (GenderEthnicity)Random(), false, false);