From 64fa28aa349e17f3f6e1de3d7dc7601500daae64 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 12 Jan 2004 17:28:22 +0000 Subject: [PATCH] (do_desi): Move check for redesignated capital behind the actual redesignation. Closes #803768. --- src/lib/commands/desi.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/lib/commands/desi.c b/src/lib/commands/desi.c index 0e5fde4d6..93995340e 100644 --- a/src/lib/commands/desi.c +++ b/src/lib/commands/desi.c @@ -150,10 +150,6 @@ do_desi(struct natstr *natp, s_char *sects, s_char *deschar, long int cash, continue; if (sect.sct_type == SCT_SANCT) breaksanct++; - if (sect.sct_x == cap_x && sect.sct_y == cap_y && - des != SCT_CAPIT && des != SCT_SANCT && - des != SCT_MOUNT && for_real) - pr("You have redesignated your capital!\n"); if (des == SCT_HARBR) { for (n = 1; n <= 6; n++) { getsect(nstr.x + diroff[n][0], @@ -204,9 +200,8 @@ do_desi(struct natstr *natp, s_char *sects, s_char *deschar, long int cash, if ((sect.sct_newtype != des) && (sect.sct_type != des) && dchr[des].d_cost) { if (for_real) { - if (check_cost - (!deschar, dchr[des].d_cost, cash, &warned, - player->argp[3])) + if (check_cost(!deschar, dchr[des].d_cost, cash, &warned, + player->argp[3])) break; } else { cost += dchr[des].d_cost; @@ -216,15 +211,15 @@ do_desi(struct natstr *natp, s_char *sects, s_char *deschar, long int cash, if (sect.sct_effic < 5 || player->god) { sect.sct_type = des; sect.sct_effic = 0; - /* No longer tear down infrasturcture - sect.sct_road = 0; - sect.sct_defense = 0; - */ changed += map_set(player->cnum, sect.sct_x, sect.sct_y, dchr[des].d_mnem, 0); } sect.sct_newtype = des; putsect(§); + if (sect.sct_x == cap_x && sect.sct_y == cap_y + && des != SCT_CAPIT && des != SCT_SANCT && des != SCT_MOUNT + && for_real) + pr("You have redesignated your capital!\n"); if (opt_EASY_BRIDGES == 0) { /* may cause a bridge fall */ if (n != SCT_BHEAD) continue; -- 2.43.0