else
id = ni_trade.cur;
ef_blank(EF_TRADE, id, &trade);
- trade.trd_x = item.gen.x;
- trade.trd_y = item.gen.y;
+ trade.trd_x = 1;
+ trade.trd_y = 0;
trade.trd_type = type;
trade.trd_owner = player->cnum;
trade.trd_unitid = ni.cur;
}
}
canspend = natp->nat_money - tally;
- /*
- * Find the destination sector for the plane before the trade is
- * actually made, except for satellites in orbit. Must be owned
- * and must be a 60% airfield (except for VTOL planes).
- */
+
+ /* Find the destination sector for the trade */
if (((trade.trd_type == EF_PLANE) && !pln_is_in_orbit(&tg.plane))
|| (trade.trd_type == EF_NUKE)) {
while (1) {
}
break;
}
- }
- if (trade.trd_type == EF_LAND) {
+ } else if (trade.trd_type == EF_LAND) {
while (1) {
p = getstring("Destination sector: ", buf);
if (!trade_check_ok(&trade, &tg))
}
break;
}
+ } else {
+ /* This trade doesn't teleport; make destination invalid */
+ sx = 1;
+ sy = 0;
}
p = getstring("How much do you bid: ", buf);