From 1e0d5998dbee6b682a59d3fc643c477816d1b966 Mon Sep 17 00:00:00 2001 From: Tyler Trahan Date: Sat, 12 Nov 2022 07:09:33 -0700 Subject: [PATCH] Fix #10154: Don't inconsistently set random company face in network games (cherry picked from commit 638b75d4763a412085157eea7e09e9d74db268cd) --- 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 75ea4f48c0..e0f8759425 100644 --- a/src/company_cmd.cpp +++ b/src/company_cmd.cpp @@ -586,8 +586,8 @@ Company *DoStartupNewCompany(DoStartupNewCompanyFlag flags, CompanyID 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);