equal
deleted
inserted
replaced
342 FOR_ALL_PLAYERS(pp) { |
342 FOR_ALL_PLAYERS(pp) { |
343 if (pp->name_1 == str && pp->name_2 == strp) goto bad_town_name; |
343 if (pp->name_1 == str && pp->name_2 == strp) goto bad_town_name; |
344 } |
344 } |
345 |
345 |
346 GetString(buffer, str); |
346 GetString(buffer, str); |
347 if (strlen(buffer) >= 32 || GetStringWidth(buffer) >= 150) |
347 if (strlen(buffer) >= 32 || GetStringBoundingBox(buffer).width >= 150) |
348 goto bad_town_name; |
348 goto bad_town_name; |
349 |
349 |
350 set_name:; |
350 set_name:; |
351 p->name_1 = str; |
351 p->name_1 = str; |
352 p->name_2 = strp; |
352 p->name_2 = strp; |
449 p->president_name_2 = Random(); |
449 p->president_name_2 = Random(); |
450 p->president_name_1 = SPECSTR_PRESIDENT_NAME; |
450 p->president_name_1 = SPECSTR_PRESIDENT_NAME; |
451 |
451 |
452 SetDParam(0, p->president_name_2); |
452 SetDParam(0, p->president_name_2); |
453 GetString(buffer, p->president_name_1); |
453 GetString(buffer, p->president_name_1); |
454 if (strlen(buffer) >= 32 || GetStringWidth(buffer) >= 94) |
454 if (strlen(buffer) >= 32 || GetStringBoundingBox(buffer).width >= 94) |
455 continue; |
455 continue; |
456 |
456 |
457 FOR_ALL_PLAYERS(pp) { |
457 FOR_ALL_PLAYERS(pp) { |
458 if (pp->is_active && p != pp) { |
458 if (pp->is_active && p != pp) { |
459 SetDParam(0, pp->president_name_2); |
459 SetDParam(0, pp->president_name_2); |