This commit is contained in:
Enno Rehling 2002-03-10 13:17:07 +00:00
parent 9a104e8a18
commit 8bb5509446
2 changed files with 7 additions and 3 deletions

View File

@ -242,10 +242,10 @@ seed_dropouts(void)
boolean found = false;
newfaction **nfp = &newfactions;
unit * u;
for (u=r->units;u;u=u->next) if (u->faction->no==drop->fno) break;
for (u=r->units;u;u=u->next) if (u->faction->no!=drop->fno) break;
if (u==NULL) while (*nfp) {
newfaction * nf = *nfp;
if (nf->race==drop->race) {
if (nf->race==drop->race && !nf->bonus) {
unit * u = addplayer(r, nf->email, nf->race, nf->lang);
if (nf->bonus) give_latestart_bonus(r, u, nf->bonus);
*nfp = nf->next;
@ -309,7 +309,7 @@ select_newfaction(const struct race * rc)
while (player) {
if (rc==NULL || player->race==rc) {
char str[80];
snprintf(str, 70, "%s %s", locale_string(default_locale, rc_name(player->race, 0)), player->email);
snprintf(str, 70, "%s %s %s", player->bonus?"!":" ", locale_string(default_locale, rc_name(player->race, 0)), player->email);
insert_selection(iinsert, prev, strdup(str), (void*)player);
prev = *iinsert;
iinsert = &prev->next;

View File

@ -1448,6 +1448,10 @@ main(int argc, char *argv[])
else
turn = atoi(argv[++i]);
break;
case 'f':
firstx = atoi(argv[++i]);
firsty = atoi(argv[++i]);
break;
case 'v':
orderfile = argv[++i];
break;