Commit graph

1826 commits

Author SHA1 Message Date
Ron Koenderink
b70653815c (get_empobj_mob_max): New. Return maximum mobility based on ef_type.
(miss): Use new get_empobj_mob_max().
2006-07-24 13:40:12 +00:00
6db2e6ec63 (swaps): Failed to update coastal flags. Was missed in the changeset
containing coastal.c rev. 1.1.
(set_coastal): New parameter olddes, to simplify fixing swaps().
Callers changed.
2006-07-21 18:10:09 +00:00
ad0a37eca4 (update_coastal_flag, coast_sea_to_land, coastal_land_to_sea): Return
new coastal flag instead of updating the sector.  This is a bit
simpler.  Change arguments from sectors to coordinates to make it
obvious that the sector is not touched.
(set_coastal): Update the coastal flag, but leave putsect() to
callers.  All existing callers do that anyway.
2006-07-21 18:01:28 +00:00
cc0748894b Bump version to 4.3.8. 2006-07-21 05:28:47 +00:00
Ron Koenderink
a62989d4a3 (put_empobj): New. Put generic empobj into the appropriate data file.
(get_empobj_chr): New.  Get characteristics for empobj.
(mission, build_mission_list_type): Switch to use new
functions put_empobj() and get_empobj_chr().
2006-07-20 14:12:35 +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
Ron Koenderink
379cb0a840 (prod_nat): Change the wording from "total pop is" to
"total pop was" to be less confusing.  The total population
display is the total at the start of the update, not after the
update is complete.
2006-07-20 01:29:25 +00:00
Ron Koenderink
60fc522758 [_WIN32]: Add io.h to pickup open/close externs for MSVC environments. 2006-07-19 01:22:57 +00:00
76cf8811fc (draw_map): Simplify. 2006-07-14 23:07:59 +00:00
Ron Koenderink
911a553a65 (powe): Remove unused local variable.
Remove CR's.
2006-07-13 21:17:00 +00:00
Ron Koenderink
d413884a37 [_WIN32, __GNUC__]: Reorganize the include files for WIN32 to
separate the MinGW environment from the MSVC environment and
WIN32 environment.  Reorganize the order of the includes so
the system files are always loaded first to prevent with misc.h defines.
Remove system file includes from misc.h.
2006-07-13 21:14:16 +00:00
b1399ebbad Fix power's c_form. 2006-07-13 20:58:13 +00:00
51baf40e90 (powe): Fix `pow n' not to ignore second argument when BTUs don't
suffice for `n'.
2006-07-13 20:07:41 +00:00
b27c7ea77d (powe): Simplify evaluation of arg 1. No functional change. 2006-07-13 19:57:56 +00:00
7282d4d639 (prpower): New, factored out of powe(). No functional change. 2006-07-13 19:41:05 +00:00
7b54d5feaa Update known contributors comment. 2006-07-13 19:12:26 +00:00
a3eb9c0d30 (init_sanct): Spread food evenly among sanctuaries, for simplicity.
Give max_pop() civilians (changes civs from 999 to 1000).
2006-07-13 18:42:34 +00:00
5fdd7546dd (init_sanct): New, factored out of new(). No functional change. 2006-07-13 18:35:17 +00:00
Ron Koenderink
1ebb172e66 (display_region_map): Remove unused local variable. 2006-07-13 18:02:28 +00:00
Ron Koenderink
51275c753f (do_map): New. map() was split into two parts map() and do_map().
(map): Call new function do_map().
(display_region_map): Modify to use do_map() instead of map().
(tran_nmap, tran_pmap, cmd_move_map): Modify to accomodate
the modified display_region_map() function.
2006-07-12 18:14:31 +00:00
Ron Koenderink
4c9293f9ea Remove optlist.h, not required.
Add empthread.h, needed for empth_request_shutdown() and
empth_wait_for_signal().
2006-07-11 22:08:10 +00:00
Ron Koenderink
897c212bfa Add missing prototypes.h to get logerror(). 2006-07-11 22:06:03 +00:00
db3996e37e Fix the previous revision. 2006-07-11 19:59:28 +00:00
c54cb0e8e8 Change system header inclusion order to make crufty old systems happy. 2006-07-11 19:11:55 +00:00
91b4045558 Fix rev. 1.37 some more. 2006-07-11 19:07:42 +00:00
2119e557dc (setstr): Supply missing cast. 2006-07-11 18:45:29 +00:00
c72edef30f (vers): Format string fix. 2006-07-11 18:44:33 +00:00
4dc350043e Fix the previous revision. 2006-07-11 18:42:56 +00:00
acad2240e0 Fix the previous revision (system header inclusion cleanup), it
doesn't compile on crufty old systems.
2006-07-11 18:42:08 +00:00
f4e018b6ee Back out the previous revision (system header inclusion cleanup), it
doesn't compile on crufty old systems.
2006-07-11 18:11:03 +00:00
7bddbe98a4 (bestownedpath): Failed to consider direction y due to off-by one
mistake in rev. 1.28.  Reported by Stefan Hauser.
2006-07-11 06:25:26 +00:00
Ron Koenderink
e55198f2c3 [_WIN32]: Add missing include sys/types.h to get off_t. 2006-07-11 03:16:02 +00:00
Ron Koenderink
7748e65fe6 Add missing includes config.h, prototypes.h and file.h. 2006-07-11 03:14:56 +00:00
Ron Koenderink
6d90861aae (obj_nameof): New.
(nameofitem): Remove, switch callers to to obj_nameof().
(mission, show_mission): Convert functions to use obj_nameof()
instead of nameofitem().
2006-07-10 23:14:26 +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
16a0869bb0 Fix missing include. 2006-07-10 05:46:38 +00:00
7aaf8f26b3 (coord): Unused & inappropriate, remove. 2006-07-10 04:57:03 +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
df8dc6ab5a (tran_map, tran_nmap, tran_pmap): Split tran_map() into tran_nmap()
and tran_pmap() so that unit number arguments are interpreted
sensibly.  Users changed.

(display_region_map): New.
(cmd_move_map, tran_nmap, tran_pmap): Use it.
2006-07-09 18:24:31 +00:00
Ron Koenderink
f65b255d18 (move_ground): Passed junk to map callback when 'm' sub-command
wasn't followed by an argument.
2006-07-09 16:55:40 +00:00
Ron Koenderink
5ea9060132 (mission, build_mission_list_type, show_mission, oprange): Remove the
type parameter as it can be determined from the empobj parameter.

(oprange): Remove getting the unit information again as it is contained
in the empobj parameter passed in.
2006-07-09 10:57:24 +00:00
a33f1378e8 (starv_sects): Reported food need was one short when the sector had no
food.
2006-07-08 12:47:39 +00:00
99fc82b94d (LND_AMM): Became weird in 4.2.3: ammo use depends on l_dam if l_ammo
is non-zero; actual value of non-zero l_ammo was unimportant.  Side
effect: it substantially increased ammunition consumption at high
tech, because the change made the value increase with tech.  Back out
4.2.3's change, just use l_ammo.  This lets deities customize
ammunition consumption independent of damage.  Remove second
parameter.  Callers changed.
2006-07-08 07:21:47 +00:00
Ron Koenderink
79ee88f7c6 (nxtitemp, trade_getitem, trade_desc, trade_check_item_ok, nxtitem,
oprange, show_mission, nameofitem, build_mission_list_type,
unit_map, xdvisible, trdswitchown, ontradingblock, trad, check_trade,
unit_type_name, start_stop_unit, scut, scra, mission, multifire,
perform_mission, fuel, NSC_GENITEM): Replace struct genitem with
struct empobj.  Remove genitem.h and create a new file empobj.h.
Replace multiple instances of unions of ef_type structures with
one standard union empobj_storage which is a superset of the individual
instances.
2006-07-07 15:15:43 +00:00
Ron Koenderink
21e34de8dd (tran_nuke): Correct text to nukes. Copy and Paste error. 2006-07-02 18:22:50 +00:00
Ron Koenderink
4d3b9dc77a (march): Modify map and bmap command options for march() to support
an user specified land unit number.
Without an user specified land unit number it will still default to the leader.
This will map and bmap commands consistent with commands like radar
and look. This is the same feature that was added to navi().
2006-06-29 13:46:03 +00:00
Ron Koenderink
274c8e423c (march): Add the ability mine using 'd' while in the march command.
This is the same feature that was added to navi().
2006-06-29 13:38:42 +00:00
Ron Koenderink
fa90c1921f (march): Reorganize, use parse() to split arguments.
These changes are based on improvements made in
navi().
2006-06-29 13:24:55 +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