3cc8de8aef
Fix extra prompt after abort due to misuse of snxtitem()
...
The old code used getstarg() to get an argument with a different
prompt than snxtitem() uses, then passed the value to snxtitem()
unchecked. If the player aborts, getstarg() returns a null pointer,
and snxtitem() prompts again. Affected:
* load/lload plane/land third argument; load_plane_ship(),
load_land_ship(), load_plane_land(), load_land_land()
* bomb, drop, fly, paradrop, recon and sweep second argument;
get_planes()
* tend and ltend second and fourth argument; ltend(), tend(),
tend_land()
* mission second argument; mission()
Fix by making snxtitem() taking a prompt argument, null pointer
requests the old prompt.
Use that to simplify multifire() and torp(). Change the other callers
to pass NULL.
2008-07-26 21:36:37 -04:00
a0fa4550a8
Use sctstr member sct_uid instead of recomputing it
...
The old code recomputed it with sctoff() in some places, without
checking for failure. Not a bug, because it can't actually fail, just
confusing.
2008-03-26 22:10:29 +01:00
db02dda32f
Update copyright notice
2008-01-19 10:15:37 +01:00
90631d56ed
Record raw arguments, to be used in the next changesets:
...
(player): New member comtail.
(parse): New parameter tail. Reorder parameter list.
(command, execute): Pass player->comtail.
(player_login, emp_config, do_unit_move): Pass NULL. No functional
change.
2007-11-25 13:55:52 +00:00
404095d2fa
Trim system includes.
2007-08-18 17:03:14 +00:00
e24b608dc6
(nav_map): Remove unused bitmap and its initialization.
2007-07-28 07:23:59 +00:00
Ron Koenderink
7434da679e
(unit_view): New, create by expanding shp_view() to work for
...
land_unit as well.
(do_unit_move): Add view option for land units using unit_view().
Combine ship and land viewing using the unit_view().
(shp_view): Remove, not used any more, replaced by unit_view().
2007-01-27 02:04:27 +00:00
Ron Koenderink
aee2bc78e2
(unit_path): New, create by combining shp_path() and lnd_path().
...
(do_unit_move): Replace shp_path() and lnd_path() with unit_path().
(shp_path, lnd_path): Remove shp_path() and lnd_path(),
not used any more.
2007-01-24 23:24:37 +00:00
Ron Koenderink
038cc74d4e
(unit_list): New, create by combining shp_list() and lnd_list().
...
(do_unit_move): Replace call to shp_list() and lnd_list() with unit_list().
(shp_list, lnd_list): Remove, not needed, replaced by unit_list().
2007-01-23 01:41:37 +00:00
Ron Koenderink
99e30073f2
(do_unit_move): Rename unit_list parameter to ulist
...
to prevent a future conflict with unit_list().
2007-01-21 23:11:59 +00:00
Ron Koenderink
139086fd20
(do_unit_move): Combine the two length checks and type check for
...
printing the ship path into one if statement. No functional changes.
2007-01-21 12:28:40 +00:00
Ron Koenderink
e8f74e0f7e
(do_look): Make public.
...
(do_unit_move): Switch look() and llook() to use
do_look() instead.
2007-01-21 11:48:14 +00:00
Ron Koenderink
b0a9e3579f
(do_unit_move): Change unit type to be determined at the
...
beginning of function instead using the leader. The leader
becomes unknown when stopping or unit list becomes
empty. This broke printing the path for ships. Broken
in rev 1.43.
2007-01-21 11:39:52 +00:00
Ron Koenderink
4091c380f1
(do_unit_move): Move the shp_view() code in the switch case.
...
No functional changes.
2007-01-20 12:56:55 +00:00
Ron Koenderink
0fda2a608a
(do_unit_move): New, create from common code in navi() and march().
...
(navi, move): Use do_unit_move(), remove unneeded code.
(switch_leader, pr_leader_change, get_leader): Make static as only called
from marc.c.
2007-01-20 02:21:10 +00:00
Ron Koenderink
d57a57155c
(pr_leader_change, get_leader, switch_leader): Move
...
pr_leader_change(), get_leader() and switch_leader()
from marc.c to navi.c.
2007-01-20 01:42:39 +00:00
7db3523f62
Update known contributors comment.
2007-01-13 10:16:43 +00:00
63bdc89835
Update copyright notice.
2007-01-09 19:09:31 +00:00
Ron Koenderink
6225e47f9f
(marc, navi): Switch the parsing logic to facilitate the merging marc()
...
and navi() in the future. No functional changes.
2007-01-06 12:35:44 +00:00
Ron Koenderink
90b987058b
(march, navi): Switch to struct empobj * for leader and rename to leader.
...
No functional changes.
2007-01-02 12:50:56 +00:00
Ron Koenderink
c6577ef2c5
(get_leader, pr_leader_change): New.
...
(set_leader, set_flagship): Replace with get_leader() and
pr_leader_change().
2006-12-31 12:31:18 +00:00
a3b52a748c
Fix rev. 1.24, which failed to charge mobility for sweeping without
...
moving.
2006-11-21 22:26:30 +00:00
Ron Koenderink
fd49704a74
(switch_leader): Generalize the code, no functional changes.
...
(navi): Change switch_flagship() to call switch_leader() instead.
(switch_flagship): Remove, not needed, replaced with switch_leader().
2006-10-10 20:23:19 +00:00
Ron Koenderink
cd8d742392
Combined struct llist and struct mlist into superset struct ulist.
...
(assa, set_leader, switch_leader, set_flagship, switch_flagship,
take_move_in_mob, get_land, ask_olist, att_get_defense,
get_dlist, get_ototal, get_dtotal, kill_land, att_infect_units,
put_land, att_reacting_units, count_bodies, att_fight,
send_reacting_units_home, take_def, ask_move_in, move_in_land,
lnd_print, lnd_delete, lnd_take_casualty, lnd_takemob,
lnd_sel, lnd_mar, lnd_put, lnd_sweep, contains_engineer,
lnd_check_mines, lnd_list, lnd_mess,
lnd_damage, lnd_easiest_target, lnd_mar_one_sector, shp_sel,
shp_nav, shp_put, shp_sweep, shp_check_one_mines, shp_check_mines,
shp_list, shp_mess, shp_count, shp_damage_one, shp_damage,
shp_contains, most_valuable_ship, shp_easiest_target,
shp_missile_interdiction, notify_coastguard,
shp_view, shp_nav_one_sector, shp_missdef, nav_ship,
fltp_to_list): Switch to struct ulist from either struct mlist
or struct llist.
2006-09-25 03:29:06 +00:00
Ron Koenderink
a9a9957a27
(radar): New, moved functionality from rada() except ef_type determination.
...
(rada): Call radar() with EF_SHIP.
(lrad): New, call radar() with EF_LAND.
(empmod[]): Call lrad() for lradar command.
(march, navi): Call radar() with appropriate type.
2006-08-16 01:16:30 +00:00
Ron Koenderink
8e7199c338
(march, navi): Provide equivalent functionality to map in move(), expl()
...
and tran(). Allow map and bmap to access the regular map command
parameters.
2006-07-20 13:33:11 +00:00
e42053d928
Break inclusion cycle: prototypes.h and commands.h included each
...
other. Ensure headers in include/ can be included in any order
(except for econfig-spec.h, which is special). New header types.h to
help avoid inclusion cycles. Sort include directives. Remove some
superflous includes.
2006-07-10 06:37:23 +00:00
Ron Koenderink
f874995c19
(switch_leader, switch_flagship): New.
...
(navi, marc): Add the ability to select a flagship or leader.
2006-07-09 18:30:13 +00:00
Ron Koenderink
6a07beb3cb
(navi): Modify map and bmap command options for navi() to support
...
an user specified ship number.
Without an user specified ship number it will still default to the flagship.
This will make map and bmap commands consistent with commands
like radar, sonar and look.
2006-06-29 03:36:14 +00:00
Ron Koenderink
ed176d8856
(navi): Add missing local map for ship list.
...
Broken in rev 1.27. Remove unnecessary brackets.
2006-06-29 01:24:34 +00:00
Ron Koenderink
2438fe7c9c
(navi): Add the ability mine using 'd' while in the navigate command.
2006-06-28 19:02:21 +00:00
Ron Koenderink
0c12d837cb
(navi): Reorganize, use parse() to split arguments.
2006-06-28 13:51:44 +00:00
bd51dea51a
(navi, march): Simplify convoluted logic. Old code tried path finding
...
whenever the next direction in the path string is bad. It then passed
the whole path string to shp_path(), which makes no sense unless we're
at the beginning of it, but luckily failed in that case. Change to
try path finding right after prompting for new input.
2006-06-18 08:53:06 +00:00
f900ac68cb
(shp_sweep): New parameter takemob. Charge mobility only if it's
...
true.
(shp_nav_one_sector): Pass false. This lets minesweepers move at the
speed their stats indicate. Closes #1498801 .
(navi): Pass true. This ensures sweeping without moving still costs
mobility.
2006-06-11 18:09:09 +00:00
7ed308526c
Remove redundant casts of argument to (prototyped) double parameter.
2006-05-01 12:34:16 +00:00
0c8c169f88
(s_char): Remove. Use signed char for small integers, plain char for
...
characters.
2006-04-29 16:25:17 +00:00
a988b907fc
s_char purge directed by compiler warnings.
2006-04-29 06:41:45 +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
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
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
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
4515b84c59
COPYING duplicates information from README. Remove. Move GPL from
...
LICENSE to COPYING, because that's where it usually is. Update all
the references to these files.
2006-01-21 19:48:41 +00:00
3e400c018c
Update copyright notice.
2006-01-05 13:36:57 +00:00
3aebb68ee7
Include config.h.
2005-12-27 18:04:19 +00:00
ba84b71f8d
(draw_map): Parameter bmap abused EF_MAP and EF_BMAP, and required the
...
silly EF_NMAP. Use characters instead: 'b' for bmap (was EF_BMAP),
't' for true bmap (was EF_MAP), 'r' for revert (was EF_MAP+EF_BMAP,
more sillness), and 'n' for nmap (was EF_NMAP). Callers changed.
(EF_NMAP): Remove.
2005-10-23 08:58:23 +00:00
f5a1430bcf
(map, draw_map): Remove undocumented feature that lets deities run map
...
as another country. It appeared around Chainsaw 3.0 and never fully
worked. See also #1335316 .
2005-10-23 08:32:49 +00:00
1fe759dc1e
(marc, navi, retreat_ship1, retreat_land1): Treat any negative value
...
of chkdir() as failure, not just -1.
2005-09-25 10:00:43 +00:00
4f59fc9967
Remove a bunch of redundant casts.
2005-06-12 06:31:48 +00:00
345ad3dfe0
Update copyright notice.
2005-03-16 22:03:16 +00:00
