From f190d211cd2eebb3cfcac82d06cebcb771fdceee Mon Sep 17 00:00:00 2001 From: iris-Neko Date: Wed, 30 Jul 2025 01:03:18 +0800 Subject: [PATCH] fix inappropriate var name and comment --- HouseClass.h | 8 +++++--- HouseTypeClass.h | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/HouseClass.h b/HouseClass.h index 2887eef4..d21a2691 100644 --- a/HouseClass.h +++ b/HouseClass.h @@ -1033,9 +1033,11 @@ class NOVTABLE HouseClass : public AbstractClass, public IHouse, public IPublicH unsigned int ThreatPosedEstimates[130][130]; // BLARGH - char PlainName[21]; // this defaults to the owner country's name in SP or in MP. Used as owner for preplaced map objects - char UINameString[33]; // this contains the UIName= text from the INI! or - wchar_t UIName [21]; // this contains the CSF string from UIName= above, or a copy of the country's UIName if not defined. Take note that this is shorter than the country's UIName can be... + char PlainName[21]; // Internal identifier for this house/faction + // In single-player campaigns: set by map author (e.g. "badguy1", "badguy2", not country names) + // In multiplayer games: format is + char UINameString[33]; // this contains the UIName= text from the INI! + wchar_t UIName [21]; // player's custom name int ColorSchemeIndex; union { diff --git a/HouseTypeClass.h b/HouseTypeClass.h index 0ffcc8c3..a1bc65f0 100644 --- a/HouseTypeClass.h +++ b/HouseTypeClass.h @@ -35,11 +35,11 @@ class NOVTABLE HouseTypeClass : public AbstractTypeClass //helpers HouseTypeClass* FindParentCountry() const { - return HouseTypeClass::Find(this->ParentCountry); + return HouseTypeClass::Find(this->CountryName); } int FindParentCountryIndex() const { - return HouseTypeClass::FindIndexOfName(this->ParentCountry); + return HouseTypeClass::FindIndexOfName(this->CountryName); } static signed int __fastcall FindIndexOfName(const char *name) @@ -61,7 +61,7 @@ class NOVTABLE HouseTypeClass : public AbstractTypeClass public: - FixedString<25> ParentCountry; + FixedString<25> CountryName; PROTECTED_PROPERTY(BYTE, align_B1[3]); int ArrayIndex; int ArrayIndex2; //dunno why