Commit graph

924 commits

Author SHA1 Message Date
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
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
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
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
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
c72edef30f (vers): Format string fix. 2006-07-11 18:44:33 +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
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
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
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
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
0cf5c17f08 (move): Don't trigger interdiction when moving stuff that cannot be
harmed (bars with opt_SUPER_BARS enabled).
2006-06-27 05:30:47 +00:00
Ron Koenderink
26a014ea04 (map, unit_map, draw_map, player_coms[]):
Modify nmap command to allow mapping around a nuke.
Add new command nbmap for bmapping around a nuke.
Add a new mapping flag 'n' for adding nukes to a map.
Correct syntax description for pmap, pbmap, lmap and lbmap
in player_coms[].
2006-06-24 17:29:40 +00:00
5091956480 (out5): Conditional chose formats incorrectly, e.g. 9999 was printed
as 10.0K instead of 10K.  Could make power report columns run
together.
2006-06-24 17:09:20 +00:00
d240bad7f8 (ac_flak_dam): Redesign so that code common to all its callers ends up
in this function.
2006-06-24 14:24:23 +00:00
d9c48789fb (pinflak_planedamage): Grant +1 vs. flak only to non-tactical bombers,
for consistency with ac_fireflak().
2006-06-24 14:21:55 +00:00
d06dc534ed (prod, prprod): Fix to show the designation that actually produces,
not the designation as it is now.
2006-06-24 09:22:04 +00:00
4985d9c9cd (ldump, pdump, sdump): The previous revision added extra space to the
output, fix that.
2006-06-24 08:06:33 +00:00
Ron Koenderink
0e4eb6bf0a (install_service, info, apro) [_WIN32]: Convert to standard snprintf()
from _snprintf().

[_WIN32]: Add #define snprintf to convert to _snprintf for WIN32
Visual Studio.
2006-06-23 00:13:21 +00:00
591b8d4862 (mil_dbl_pay): No effect, remove. Was used for mil being built into
units until that was removed in 4.0.0.
2006-06-22 20:45:19 +00:00
0a50a48141 Update known contributors comment. 2006-06-22 20:27:36 +00:00
9e8f74d239 Support definition of additional sector types in sector.config,
missing bits:
(budg, calc_all, update_main): Use SCT_TYPE_MAX instead of SCT_MAXDEF
to size tables.
(map_char): Update sanity check; use CANT_HAPPEN().
(show_sect_build, show_sect_stats, show_sect_capab): Use the sentinel
instead of SCT_MAXDEF.
2006-06-22 20:21:48 +00:00
2d99971a7f (SCT_MAXDEF): Make it equal the maximum sector type, not the maximum
plus one.  Users changed.  This indirectly fixes off-by-one loop
bounds in budg(), show_sect_build(), show_sect_stats() and
show_sect_capab().  The show bugs were harmless: the loops ran into
the sentinel, which they ignore.  The budg bug was serious: the loop
ran into the entries for SCT_EFFIC.  This lead to a bogus line in the
budget, printing of a null pointer, and doubled sector build cost.
Budget priorities masked this bug until rev. 1.25.
2006-06-22 17:10:26 +00:00
36fbf37bb8 (arm): Fix trading block message.
(disarm): Recipient must be allied.
2006-06-18 17:47:26 +00:00
9837bf0a40 (arm): Permit arming allied planes. 2006-06-18 17:28:28 +00:00
f68ee899e1 (disarm): Give disarmed nuke to sector owner. This was forgotten in
rev. 1.15.
(gift): Extend to nukes.
2006-06-18 17:15:38 +00:00
Ron Koenderink
fe5edc3ef0 (map): Fix misleading prompt to reflect the real choices for the player. 2006-06-18 17:08:03 +00:00
94bc512581 (gift): All callers transfer ownership after calling gift(). Move
that code into gift().  Callers changed.
2006-06-18 17:03:19 +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
db1ac2edf4 (sctstr): New member sct_dterr.
(terr): Let the deity set it, and default the field argument to it.
(sect_ca): New selector dterr.
2006-06-17 19:27:22 +00:00
ca6c16357f (lnd_fortify): Round mobility fractions up always, not just to 1.
Simplify.

(fort): Don't claim land unit can't be fortified when amount argument
is zero.
2006-06-17 08:42:23 +00:00
8861333689 (mission): Nicer diagnostics. 2006-06-16 20:44:23 +00:00
27d37f35a9 Che cannot target #0:
(guerrilla): Oops on it.
(doland, takeover): Clear them when che_target becomes 0.

(doland): Fix bogus message.

(guerrilla): Remove silly sanity check.
2006-06-16 20:01:30 +00:00
4d1dd6fa6a (sctintrins): New member in_enable. Update infra.config. Use it
instead of opt_DEFENSE_INFRA.
(improve): Test for it.
(show_sect_build): Show only enabled infrastructure.
(opt_DEFENSE_INFRA): Remove.  Deities can edit infra.config instead.

(improve): Dumb down prompt.
2006-06-16 18:39:35 +00:00
eff3f89cc6 (map): Fix crash on empty argument introduced in rev. 1.18. 2006-06-15 21:17:37 +00:00
89022fbc42 (prmobcost): New.
(sinfra): Use it to display inaccessible sectors sensibly.
Inaccessible occurs for rail since src/lib/common/move.c rev. 1.12.
2006-06-15 19:46:27 +00:00