Commit graph

826 commits

Author SHA1 Message Date
3813203174 (getin): Confusing. Redesign.
(edit): Simplify.

(doland): Spelling fix.
2006-04-17 08:13:20 +00:00
7b97f33789 (doplane): Don't arbitrarily truncate value for key 'a' and 'd'.
s_char purge.
2006-04-17 08:09:14 +00:00
4836f6c543 Fix long lines. No functional changes. 2006-04-16 17:20:33 +00:00
328c9af40a (sail): There is no qsail command, remove test for it. Test the
second argument only when the command is sail.  Before, `unsail 42 q'
showed the sailing path instead of clearing it.
2006-04-15 10:55:19 +00:00
abb9ae2338 (bestownedpath): Return NULL on long path instead of "?". Terminate
returned path with 'h'.  This makes BestShipPath() and BestAirPath()
more similar to BestLandPath().  Simplify callers.
2006-04-05 09:30:38 +00:00
7cc14a2c9a (tend): Fix rev. 1.20: used to send bulletin to last tendee's owner,
unless that's the player, regardless of success.  Send them for every
successful tend to a foreign ship.
2006-04-05 07:06:58 +00:00
e8b50af84e (mission): Silence compiler warning. 2006-03-29 19:40:42 +00:00
9646854705 (mission): Plug memory leak. s_char purge. 2006-03-29 19:40:22 +00:00
bd2673a6e4 Remove superflous casts. 2006-03-28 19:51:48 +00:00
a1ce7db238 (move_ground): Drop first parameter of map callback, it's not used.
Callers changed.  s_char purge.
2006-03-28 19:46:40 +00:00
06b669924a Type of gift()'s generic pointer parameter was fixed in the previous
revision of src/lib/commands/load.c, change callers.
2006-03-28 19:20:08 +00:00
8065fe84e4 (multifire): Retreat when helpless used RET_INJURED instead of
RET_HELPLESS.  Closes #1146364.
2006-03-28 06:22:48 +00:00
fce8b1aa38 (lost): Simplify code for argument default value. 2006-03-27 19:53:05 +00:00
3aea505aa7 Cosmetics. 2006-03-27 19:50:38 +00:00
523936cfef (map, rout, sct, surv): Remove special case for sects argument `*',
snxtsct() handles it just fine.
2006-03-27 19:45:08 +00:00
f99bc9298a (map): Simplify slightly. 2006-03-27 19:24:44 +00:00
1ddb87d235 (tran_map): Set player->argp[0]. Required since bmap() was merged
into map() ca. 1995.  Fixes 'm' at test's move_ground() prompt.
Simplify clearing player->argp[2].  Don't clear beyond that.
2006-03-27 19:10:40 +00:00
18bbcb2c9e (tran_map): Set player->argp[0]. Required since bmap() was merged
into map() ca. 1995.  Clear player->argp[2].  Required since map
acquired its second argument in the early 90s.  Fixes 'm' at
transport's move_ground() prompt.
2006-03-27 19:00:42 +00:00
707e1aad72 (explore_map, nav_map, move_map, fly_map): Don't use snxtsct(), it
obeys conditionals.  Use snxtsct_dist().  Closes #785447.  Only march
and test were actually broken, the other uses zapped conditionals.
(move_map, fly_map, nav_map, navi): Don't zap conditionals.
2006-03-27 18:20:25 +00:00
021a91a779 The previous revision is wrong, back it out. 2006-03-26 17:36:27 +00:00
82a3c0d0f5 The revision before the previous one is partially wrong, back out the
bad parts.
2006-03-26 17:34:58 +00:00
e438227011 The revision before the previous one is wrong, back it out. 2006-03-26 17:33:46 +00:00
5d6e8c0685 (retr, lretr, doship, dounit): Zero-terminate retreat paths. The last
character in the array must be zero already.  Closes #1225708.
2006-03-26 14:42:27 +00:00
2f08b52cef (shut): Fix misuse of logerror(): passed formatted string instead of
format string and arguments.  Correctness depends on formatted string
not containing '%', which is the case.
2006-03-26 13:59:47 +00:00
29faf70fa7 (show_sail): Fix misuse of pr(): passed formatted string instead of
format string and arguments.  Correctness depends on paths not
containing '%', which is correct, but not as robust as it could be.
2006-03-26 13:57:34 +00:00
4c6fb12377 Code formatting. No functional changes. 2006-03-26 13:52:23 +00:00
b0a5d11a3f (show_nuke_capab, show_ship_capab, show_plane_capab, show_land_capab)
(prxy, border, ac_encounter, look, budg): Fix misuse of pr() and PR():
passed formatted string instead of format string and arguments.
Correctness depends on argument values and tables not containing '%',
which is correct, but fragile.
2006-03-26 13:41:46 +00:00
65168f0d93 (comm_bomb, ship_bomb, land_bomb, pinflak_planedamage): Fix dangerous
misuse of pr(), PR() and mpr(): passed formatted string instead of
format string and arguments.  Crash bug if formatted string contains
'%'.  Players can put that in ship names...
2006-03-26 13:34:35 +00:00
ade364fa1d (prunits, prplanes): Simplify, compute relation string instead of
format.

(prplanes): Fix dangerous misuse of pr(): passed formatted string
instead of format string and arguments.  Crash bug if formatted string
contains '%'.  Players can put that in country names...
2006-03-26 12:54:52 +00:00
7b4a164d0a (prod): Simplify printing of materials used. Don't assume amount fits
into eight characters and item mnemo can't be '%'.
2006-03-26 12:37:22 +00:00
aee94ca077 (head_describe): Print the headline instead of returning the format
string.  This simplifies format string checking.
2006-03-26 12:08:35 +00:00
197d8cd2ca (prthresh): Remove format string parameter. Callers don't really need
that flexibility, and it makes format checking harder.
2006-03-26 10:21:57 +00:00
8cd3845b08 Remove useless multiplications with sizeof(char) and sizeof(s_char).
Replace by literal 1 in other contexts.
2006-03-26 10:16:08 +00:00
8ca2468706 (gift): Fix parameter types: natid instead of int, void * for generic
pointer, char * for string.
2006-03-26 08:18:34 +00:00
a6843eeba6 (gift, load_comm_ship, load_comm_land): Fix dangerous misuse of wu():
passed formatted string instead of format string and arguments.  Crash
bug if formatted string contains '%'.  Players can put that in ship
names...
2006-03-26 08:15:27 +00:00
0d0a305bf3 Remove silly superflous parenthesis. 2006-03-26 07:46:49 +00:00
2e32b87695 (buil): Simplify the loop for building multiple units. Unit type
argument "" no longer makes it prompt for the unit type on every
iteration.
2006-03-25 19:16:35 +00:00
90bddc6541 (buil): Return RET_FAIL on insufficient tech for bridge instead of
literal 2 (which is RET_SYN).  Return RET_SYN on incorrect first
argument.
2006-03-25 18:56:34 +00:00
2a3da4916e (build_ship, build_land, build_plane): Compute cost in floating-point.
It's better to round just once, when subtracting player->dolcost from
nat_money.
2006-03-25 16:36:45 +00:00
2625dc4b8f (build_can_afford): New.
(build_ship, build_land, build_bridge, build_nuke, build_plane)
(build_tower): Use it.  This changes some messages.  Fixes ancient
bridge building race condition: while prompting for direction, another
build could clobber cash.
(cash): Remove.
2006-03-25 16:21:48 +00:00
38f3f7ea49 (trade_check_item_ok): New.
(trade_check_ok): Use it and simplify.

(set): Use new trade_check_item_ok().  The code replaced by it didn't
work (abusable bug).
2006-03-25 15:26:29 +00:00
79714720cc (ontradingblock, trdswitchown): Second parameter is a generic pointer,
change it from int * to void *.  Callers changed not to cast to int *.
2006-03-25 15:11:17 +00:00
05f64e8c3f (genstr): Redundant. Replace by struct genitem. 2006-03-25 15:03:32 +00:00
9055031b7f Fix the previous revision. 2006-03-25 09:08:58 +00:00
8054aafb9a (u_char, u_short, u_int): BSDisms. Figuring out whether sys/types.h
defines them would be possible, but isn't worth the trouble.  Replace
by unabbreviated types.
2006-03-25 07:05:34 +00:00
21bf6b41d4 Use NULL instead of (FOO *)0, it's easier to read. 2006-03-23 20:48:49 +00:00
be78c807e3 (map): Simplify loop control. 2006-03-23 20:13:38 +00:00
bddb20c7f0 (marc, navi): Permit any whitespace between route and optional
argument for radar, lookout, sonar, not just spaces.
2006-03-23 19:50:25 +00:00
aebcc536e4 (do_conv, enli, explore, move, shoo, s_commod): sct_mobil was changed
from u_char to short in 3.0.0, but many assignments still cast to
u_char.  Remove casts.
2006-03-23 07:58:03 +00:00
c52a9a2822 New doc/xdump. 2006-03-06 18:27:37 +00:00