mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r15279) -Fix: deadlock (with wide fonts) or desync when generating manager name

release/0.7
smatz 2009-01-26 22:27:11 +00:00
parent 659989af45
commit 3ac080425a
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/company_cmd.cpp
View File

@ -384,26 +384,23 @@ static byte GenerateCompanyColour()
static void GeneratePresidentName(Company *c) static void GeneratePresidentName(Company *c)
{ {
Company *cc;
char buffer[100], buffer2[40];
for (;;) { for (;;) {
restart:; restart:;
c->president_name_2 = Random(); c->president_name_2 = Random();
c->president_name_1 = SPECSTR_PRESIDENT_NAME; c->president_name_1 = SPECSTR_PRESIDENT_NAME;
char buffer[MAX_LENGTH_PRESIDENT_NAME_BYTES + 1];
SetDParam(0, c->index); SetDParam(0, c->index);
GetString(buffer, STR_PRESIDENT_NAME, lastof(buffer)); GetString(buffer, STR_PRESIDENT_NAME, lastof(buffer));
if (strlen(buffer) >= 32 || GetStringBoundingBox(buffer).width >= 94) if (strlen(buffer) >= MAX_LENGTH_PRESIDENT_NAME_BYTES) continue;
continue;
Company *cc;
FOR_ALL_COMPANIES(cc) { FOR_ALL_COMPANIES(cc) {
if (c != cc) { if (c != cc) {
char buffer2[MAX_LENGTH_PRESIDENT_NAME_BYTES + 2];
SetDParam(0, cc->index); SetDParam(0, cc->index);
GetString(buffer2, STR_PRESIDENT_NAME, lastof(buffer2)); GetString(buffer2, STR_PRESIDENT_NAME, lastof(buffer2));
if (strcmp(buffer2, buffer) == 0) if (strcmp(buffer2, buffer) == 0) goto restart;
goto restart;
} }
} }
return; return;