|
@@ -335,25 +335,25 @@ static void GenerateCompanyName(Player *
|
|
|
|
|
|
if (IS_INT_INSIDE(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST+1)) {
|
|
|
str = t->townnametype - SPECSTR_TOWNNAME_START + SPECSTR_PLAYERNAME_START;
|
|
|
strp = t->townnameparts;
|
|
|
|
|
|
verify_name:;
|
|
|
// No player must have this name already
|
|
|
FOR_ALL_PLAYERS(pp) {
|
|
|
if (pp->name_1 == str && pp->name_2 == strp) goto bad_town_name;
|
|
|
}
|
|
|
|
|
|
GetString(buffer, str);
|
|
|
if (strlen(buffer) >= 32 || GetStringWidth(buffer) >= 150)
|
|
|
if (strlen(buffer) >= 32 || GetStringBoundingBox(buffer).width >= 150)
|
|
|
goto bad_town_name;
|
|
|
|
|
|
set_name:;
|
|
|
p->name_1 = str;
|
|
|
p->name_2 = strp;
|
|
|
|
|
|
MarkWholeScreenDirty();
|
|
|
|
|
|
if (!IS_HUMAN_PLAYER(p->index)) {
|
|
|
SetDParam(0, t->index);
|
|
|
AddNewsItem(p->index + (4 << 4), NEWS_FLAGS(NM_CALLBACK, NF_TILE, NT_COMPANY_INFO, DNC_BANKRUPCY), p->last_build_coordinate, 0);
|
|
|
}
|
|
@@ -442,25 +442,25 @@ static void GeneratePresidentName(Player
|
|
|
{
|
|
|
Player *pp;
|
|
|
char buffer[100], buffer2[40];
|
|
|
|
|
|
for (;;) {
|
|
|
restart:;
|
|
|
|
|
|
p->president_name_2 = Random();
|
|
|
p->president_name_1 = SPECSTR_PRESIDENT_NAME;
|
|
|
|
|
|
SetDParam(0, p->president_name_2);
|
|
|
GetString(buffer, p->president_name_1);
|
|
|
if (strlen(buffer) >= 32 || GetStringWidth(buffer) >= 94)
|
|
|
if (strlen(buffer) >= 32 || GetStringBoundingBox(buffer).width >= 94)
|
|
|
continue;
|
|
|
|
|
|
FOR_ALL_PLAYERS(pp) {
|
|
|
if (pp->is_active && p != pp) {
|
|
|
SetDParam(0, pp->president_name_2);
|
|
|
GetString(buffer2, pp->president_name_1);
|
|
|
if (strcmp(buffer2, buffer) == 0)
|
|
|
goto restart;
|
|
|
}
|
|
|
}
|
|
|
return;
|
|
|
}
|