(line_of_sight): Normalize coordinates before indexing. Closes
#950514.
(line_of_sight): There's just one straight line between two points on
a plane, but on a torus there are four. Code assumed plane, and thus
could screw up near the origin. Pick a shortest line of the four.
Partial fix for #950510.
(buy, mark, display_mark): Move argument evaluation from
display_mark() to callers. buy() no longer accepts "all". It used to
display all lots, but didn't let you buy any. Similar nonsense
happened for "" if buy() prompted for it.
(i_packing): New. Use where appropriate.
(NPKG, WPKG, UPKG, BPKG, NUMPKG): Turn macros into enumeration
constants.
(NPKG, WPKG, UPKG, BPKG): Move from sect.h to item.h.
(build_ship, orde, qorde, nav_loadship, load_it, unload_it): Store
item types instead of mnemo characters in shpstr members shp_tstart[]
and shp_tend[].
(com_num): No longer used, remove.
(strtox, strtoy): New. Use it instead of inputxy() to avoid the
double-remainder problem: x-coordinate SHRT_MAX+1 is truncated to 0 by
cast to coord, then converted by xabs(). This is wrong unless WORLD_X
divides SHRT_MAX+1.
(sarg_xy, sarg_getrange, sarg_range): Use them.
(inputxy): No longer used, remove.
(sarg_type): Use NS_UNDEF instead of 0.
(sarg_list): Change confusing loop control. Properly diagnose
overlong lists; used to silently ignore list tail and return MAX+1,
which made a later snxtitem_list() fail.
(atoip): No longer used, remove. Parsing was broken anyway.
(sarg_type, sarg_xy, sarg_area, sarg_range, sarg_list, sarg_getrange):
Use plain char * instead of s_char *.
(snxtitem): Assigning NS_UNDEF to NP->type is an application domain
type error not reflected in C. The former is a selection type, the
latter is a file type. Harmless, as the variable is overwritten on
all paths to successful return.
(getminleft): Parameter hours unused since the previous rev., remove.
Change parameter mpd from int * to int, because its only use is *mpd
as r-value. Callers changed.
(kw_read, kw_find, kwtab, kw_list): Were used to evaluate the hours
file until 4.2.7. Since then kw_read() is unused, and kw_find()
always returns NULL. Remove. kw_find() callers changed.
Selector rewrite: values other than long, interpret identifiers
according to context, to make `lstat * ?type#spy&spy>1' work. Closes
bug#825363, #905809, #905814 and #922968.
(nsc_type, packed_nsc_type, nsc_cat, packed_nsc_cat, nsc_flags): New.
(valstr): New. Old code encoded values in type long, which was
somewhat hard to read and could only support signed integer values.
(nscstr): Redesign. Use valstr. Typed operator.
(castr): Split ca_code into ca_type, ca_flags, ca_off. Tables
changed.
(nstr_comp, nstr_exec): Redesign and rewrite. Callers changed. They
used the old design incorrectly, which let players smash the stack
by supplying more than NCOND conditions.
(encode, nstr_comp_val, decode, nstr_exec_val): Rename, redesign, and
rewrite. Callers changed.
(nstr_coerce_val): New.
(var_ca, sect_ca, ship_ca, land_ca): Checking both var_ca[] and the
object's ca complicates proper recognition of unique abbreviations.
Copy contents of var_ca[] into the ca of objects, remove var_ca[].
(surv): Reject values with category other than NSC_OFF and types that
can't be coerced to NSC_LONG. Old code happily passed values with
category NSC_VAL to code_char(). The previous version interpreted
them correctly, but earlier versions interpreted them as NSC_OFF, then
logged `bad type in decode: 0' and evaluated them into zero.
(code_char): Used to test category NSC_VAR to decide whether to
display tens or hundreds. NSC_VAR no longer exists. Test type
instead. Makes more sense anyway.
(RANDOM, SRANDOM): New, to allow overriding the PRNG on the compiler
command line for reproducible automated tests. This is expected to be
a temporary solution until we get more capable system configuration.
Callers of random(), srandom() changed. From Marc Olzheim.
(main, write_newcap_script): Don't warn when resources were added,
that's expected nowadays. Warn when resources were not added. Don't
mention the ore program, as it doesn't work and we no longer
distribute it.
(produce_sect): Unless player->simulation, work directly on item
arrays instead of copies made by getvec(). This is safe, because the
old code made single copies and always flushed them back into the unit
structures. Else make copies by hand, not with getvec.
(starv_sects): Replace getvec() by direct, read-only item access.
(upd_buildeff, enlist, materials_charge, materials_cost, produce,
grow_people, growfood, trunc_people, do_feed, feed_people): Change
argument type to match uncopied item arrays.
(growfood): Obey ITEM_MAX.
(do_fallout, meltitems): Work directly on item arrays instead of
copies made by getvec(). This is safe, because the old code made
single copies and always flushed them back into the unit structures.
(meltitems): Don't claim more items were lost than existed.
(upd_ship, upd_land, do_plague): Work directly on item arrays instead
of copies made by getvec(). This is safe, because the new code
changes the item array precisely when the old code writes back a
changed copy.
(starv_ships, starv_units): Replace getvec() by direct, read-only item
access.
(feed_ship, feed_land): Remove parameter vec, work with sp->shp_item[]
and lp->lnd_item[] instead.
(plague_people): Change argument type to match uncopied item arrays.
(infect_people): Remove parameters vec, eff, mobil and work with
sp->sct_item, sp->sct_effic, sp->sct_mobil instead. This is safe,
because the only caller passed a copy of sp->sct_item created with
getvec(), and infect_people() doesn't change it. Caller changed.
(infect_people): Rewrite plague risk computation for clarity.
(feed_land): Simplify. Amount of food taken from ship could be off by
one due to rounding, fix. However, the fixed code is currently
unreachable, as caller runs resupply_commod() before feed_land().
(feed_ship): Simplify. No functional changes.
(shiprepair): Remove parameter vec, work with ship->shp_item[]
instead. This is safe, because the only caller passed a copy of the
latter created with getvec(), and shiprepair() doesn't change it.
Caller changed.
(feed_ship): Work directly on land item arrays instead of copies made
by getvec(). This is safe, because the new code changes the item
array precisely when the old code writes back a changed copy.
(feed_land): Work directly on ship item arrays instead of copies made
by getvec(). This is safe, because the new code changes the item
array precisely when the old code writes back a changed copy.
(set_option, delete_option): Gripe about unknown options. If multiple
options have identical names in Options[], all but the first are
ignored. This should never happen.
(get_materials): Work directly on item arrays instead of copies made
by getvec(). This is safe, because the new code changes the item
array precisely when the old code writes back a changed copy.
(dodistribute): Work directly on item arrays instead of copies made by
getvec(). This is safe, because the old code made single copies and
always flushed them back into the unit structures.
(dodeliver): Remove parameter vec, work with sp->sct_item[] instead.
This is safe, because the only caller passed a copy of the latter
created with getvec(), and dodeliver() doesn't change it. Caller
changed. Return value no longer needed, remove.
(populace): Remove parameter vec, work with sp->sct_item[] instead.
This is safe, because the only caller passed a copy of the latter
created with getvec(), and populace() doesn't change it.
(tax): Replace getvec() by direct, read-only item access.
(pln_equip, mission_pln_equip): Work directly on item arrays instead
of copies made by getvec(). This is safe, because the old code made
single copies and always flushed them back into the unit structures
before flushing those. Simplify.
(pln_equip, mission_pln_equip): Rename item to itype. Use struct
ichrstr member i_vtype instead of pointer arithmetic to map from
`struct ichrstr *' to item type. No functional changes.
(sd, shp_missile_defense): Replace getvec() by direct, read-only item
access. This is correct, because the old code doesn't use the copy
after it changes the original in the unit structure.
(dd): Remove call of getvec() that has no effect.
(quiet_bigdef): Work directly on item arrays instead of copies made by
getvec(). This is safe, because the old code made single copies and
always flushed them back into the unit structures before flushing
those, in use_ammo(), or discarded both the copy and the unit
structure.
projects / empserver / log