From 6487883084634183582a76c8635008848156bd6c Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 15 Mar 2009 21:16:07 +0000 Subject: (svn r15729) -Fix: silence MSVC warning --- src/town_cmd.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index d3ef72889..d84f40597 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -1374,15 +1374,16 @@ extern int _nb_orig_names; * Speeds things up a bit because these values are computed only once per name generation. */ struct TownNameParams { - bool grf; ///< true iff a newgrf is used to generate town name uint32 grfid; ///< newgrf ID uint16 townnametype; ///< town name style + bool grf; ///< true iff a newgrf is used to generate town name - TownNameParams(byte town_name) : - grf(town_name >= _nb_orig_names), - grfid(this->grf ? GetGRFTownNameId(town_name - _nb_orig_names) : 0), - townnametype(this->grf ? GetGRFTownNameType(town_name - _nb_orig_names) : SPECSTR_TOWNNAME_START + town_name) - { } + TownNameParams(byte town_name) + { + this->grf = town_name >= _nb_orig_names; + this->grfid = this->grf ? GetGRFTownNameId(town_name - _nb_orig_names) : 0; + this->townnametype = this->grf ? GetGRFTownNameType(town_name - _nb_orig_names) : SPECSTR_TOWNNAME_START + town_name; + } }; /** -- cgit v1.2.3-54-g00ecf