Commit graph

3972 commits

Author SHA1 Message Date
bebca811de (pln_dropoff): The previous revision screwed up output; fix. 2004-03-04 15:08:00 +00:00
5bad9875a5 (sctstr): Member sct_che encoded number of che and their target.
Simplify.  Split into member sct_che (number) and sct_che_target.
Users changed.
(get_che_cnum, set_che_cnum, get_che_value, get_che_value): Che
encoding/decoding functions; remove.
(CHE_MAX): Move from var.h to sect.h.
(prsect, doland): Print / edit the new field.
2004-03-04 13:49:25 +00:00
eccc5cb7d7 Sectors need space for items, deliveries and distribution thresholds.
To save space, the ancients invented `variables': a collection of
key-value pairs, missing means zero value, space for `enough' keys.
This complicates the code, as assigning to a `variable' can fail for
lack of space.  Over time, `enough' increased, and for quite some time
now `variables' have been *wasting* space.  This changeset replaces
them, except in struct mchrstr, struct lchrstr and struct pchrstr,
where they are read-only, and will be replaced later.  It is only a
first step; further cleanup is required.  To simplify and minimize
this necessarily huge changeset, the new item[] arrays have an unused
slot 0, and the old variable types V_CIVIL, ... are still defined, but
must have the same values as the item types I_CIVIL, ...
2004-03-03 16:54:22 +00:00
ba86513b01 (plague_people): Log and repair bad plague stage. 2004-03-03 13:20:46 +00:00
c530a3b980 (genobject, genchrstr): Unused, remove. 2004-03-03 10:23:07 +00:00
08e182e132 (fileinit): Invalid cast sct_init(); a call couldn't possibly work.
Luckily, it isn't called.  Remove.
(ef_fileinit): Unused, remove.
2004-03-03 10:17:53 +00:00
42290db8c8 (nameofitem, produce, check, fire_dchrg, send_reacting_units_home,
do_map_set, upd_land, nav_check_atdest, produce, upd_ship): Remove
unused parameters.  Callers changed.
2004-03-03 09:39:50 +00:00
19acc1cd07 (diss, player_coms): Command `dissolve' has been disabled at least
since the days of Chainsaw (early '90s), and the code smells bad.
Bury it.
2004-03-03 08:20:45 +00:00
3060cabc48 (trade_desc): Ignore non-items when printing load. It used to print
the plague as item, which indexed ichr[] out of bounds, which leads to
crash or bogus output.
2004-03-02 20:59:04 +00:00
bb811df758 (genitem, ship, plane, land): Remove unused member sell & equivalents.
(genitem_ca, ship_ca, plane_ca, land_ca): Remove selector "sell".
(comstr, trdstr): Members trd_price, com_price have no effect.  Use
them instead of trd_maxprice, com_maxprice and remove the latter.
(commodity_ca, trade_ca): Remove selector "maxprice".
2004-03-01 17:21:40 +00:00
95b650396a (s_commod): Move initialization of `min' before first use.
(itemname): Unused, remove.
2004-03-01 14:23:44 +00:00
f72281b773 (shp_missile_defense): Move big assignment out of if condition for
clarity.
2004-03-01 14:21:11 +00:00
b8c9d6a029 (carriersatxy): Use &&' instead of somewhat confusing &'. 2004-03-01 14:18:37 +00:00
1f5754b5aa (player_new) [!RESOLVE_IPADDRESS]: Don't define unused local variable. 2004-03-01 14:17:58 +00:00
69d06bad46 (sctcache, bestp) [!DO_EFF_MEM_CHECKING]: cache isn't used, don't
define it.
2004-03-01 14:16:31 +00:00
21dd4cfc0f (draw_map): Fix test of player->command->c_flags. Broken code
happened to work because C_MOD is the only flag defined.
2004-03-01 14:14:39 +00:00
bbeab716f4 Remove duplicate macro definitions. 2004-03-01 14:10:11 +00:00
e1cb606dab Break excessively long line. 2004-03-01 14:07:10 +00:00
7d12f4b841 (deity_build_land) [!START_UNITS]: Unused, don't define. 2004-03-01 14:06:23 +00:00
d0cf6a0a9b Clean up switch cases: proper fall through comments, no break after
return.
2004-03-01 14:03:29 +00:00
7c52730439 Don't cast void to void. 2004-03-01 13:56:07 +00:00
262e1bafba Remove some unused junk. 2004-03-01 13:48:45 +00:00
5df329c766 Remove RCS keyword comment, it's a nuisance. 2004-03-01 13:41:10 +00:00
5fa00591fe (sccsid): Useless, as we don't use SCCS. Remove. 2004-03-01 13:33:51 +00:00
98b392d72c (CHE_MAX): Don't define twice, define once in a header.
(get_che_cnum, set_che_cnum, get_che_value, set_che_value): Remove
redundant definitions.
2004-03-01 13:32:06 +00:00
13797a2ba2 (execute): Fix botched test for empty argument. 2004-03-01 13:26:39 +00:00
0c19d70c74 (mult, player_coms): Command `mult' is disabled since 4.0.0 ('96), and
its code is obviously not in working order.  Remove.
(minmult, maxmult, configkeys): Unused configuration parameters,
remove.
(tradedesc): Remove code related to mult that had no effect.
(multread, commread, commwrite, commamt, commset, multset, commprice):
Dangerous, because code bypasses ef_read() & friends, remove.
(diss): Commodity cleanup uses the above, remove.  Command is disabled
and unlikely to work anyway.
2004-03-01 09:04:02 +00:00
30cb9e2a83 (interix, INTERIXCFLAGS, INTERIXLFLAGS, INTERIXMASTER): New, from Ron
Koenderink.
2004-03-01 07:10:31 +00:00
ef0ddff4c2 (safe_getcwd): New. When getcwd() is known to be able to allocate its
buffer, just call that.  Else wrap suitable allocation around it.
(main): Use it.
2004-03-01 07:07:27 +00:00
5ce301e2fb (ntinstall): Fix mkdir data. 2004-03-01 06:58:03 +00:00
b572ec19ad Fix missing include. 2004-02-29 11:41:26 +00:00
d500806bc8 inet_ntoa() is available on all machines that matter, and defining it
ourselves without adequate auto-configuration creates more problems
than it solves.  In particular since we defined it with the wrong
type.
2004-02-29 11:41:08 +00:00
f6d7ebb480 (rea): Don't use L_SET, it's ancient BSD history, just use SEEK_SET. 2004-02-29 11:35:38 +00:00
37ebd826c4 Fix the previous rev. 2004-02-28 19:11:24 +00:00
e67dca9d29 Indentation fixes; suspect indent-emp is to blame. 2004-02-28 18:06:11 +00:00
aa4e268d89 Markup changes: separate items more clearly. Don't use numeric fonts. 2004-02-28 17:50:55 +00:00
966d3e7820 \" comments weren't recognized in column 0. 2004-02-28 17:32:30 +00:00
b0bd4e90ac (commodity_ca): "xloc", "yloc", "xsell", "ysel" and "price" weren't
NSC_DEITY.  Wrong, but commodity_ca[] is currently unused.  Also
rename "xloc", "yloc" to "xsell", "ysell".
2004-02-28 16:23:56 +00:00
43f7f153a7 (trade_ca): "xloc" and "yloc" weren't NSC_DEITY. Wrong, but
trade_ca[] is currently unused.
2004-02-28 15:31:21 +00:00
97e221baae Remove some unused stuff, mostly Empire 3 leftovers. 2004-02-28 09:45:10 +00:00
3d0178b994 (NSC_OPMASK, NSC_ISNUM1, NSC_ISNUM2, nscstr, nstr_comp, nstr_exec):
Simplify encoding of struct ncstr member oper.
2004-02-28 08:49:39 +00:00
bd54488715 (NSC_ROUND): No effect, remove. 2004-02-28 08:40:53 +00:00
dd01fcd4c6 (sect_ca, genitem_ca, ship_ca, plane_ca, land_ca, nuke_ca, treaty_ca,
loan_ca, news_ca, lost_ca, commodity_ca, trade_ca, nat_ca, map_ca):
NSC_OFF was lost during Empire3, rendering the codes confusing and
harder to use.  Tack it back on.
(encode, code_char): No need to fool around with NSC_OFF anymore.
2004-02-28 08:29:21 +00:00
d31f4f99cf Delete dead code. No functional changes. Should have been committed
yesterday's along with nsc.h rev. 1.7.
2004-02-28 07:19:31 +00:00
dd35a9637d These files were split a long time ago, for technical reasons which
since vanished (linking into different programs).  Undo the split,
because the stuff really belongs together.
2004-02-28 06:40:48 +00:00
e8b7ed630b (setsector): Fix misleading prompt. 2004-02-27 21:55:50 +00:00
d2e0c8224b Delete dead code, fix indentation, spelling, obvious warning
avoidance, doc fixes.  No functional changes.
2004-02-27 20:13:28 +00:00
f5e49a830c (sct_typematch): New. Use it instead of typematch() where
appropriate.
(typematch): Prefer exact match to partial match.  Use plain char
instead of s_char.
2004-02-27 19:53:02 +00:00
844b654d44 (stmtch, mineq): Document. Move declaration from prototypes.h to
match.h.  Use plain char instead of s_char.  The code has several
thousand type errors due to s_char vs plain char; s_char must go.
(stmtch): Rewrite for clarity.
2004-02-27 19:38:38 +00:00
520baaf867 (html): Expand tabs in all.html; they can confuse browsers. 2004-02-26 09:26:29 +00:00