15 years agoFix XNORM() and YNORM() hvy-metal-2.2
Markus Armbruster [Mon, 12 May 2008 16:45:11 +0000 (18:45 +0200)]
Fix XNORM() and YNORM()

Broken in commit 5f764285 (v4.3.12) for negative multiples of WORLD_X
and WORLD_Y, respectively.

This could theoretically lead to buffer overruns and other
unpleasantness.  None have been reproduced, though.
(cherry picked from commit 7680acc39fd63684c6854f27e99a2a5e18712473)

15 years agoDisable incorrect use of resupply_all() in load and lload
Markus Armbruster [Mon, 12 May 2008 15:22:39 +0000 (17:22 +0200)]
Disable incorrect use of resupply_all() in load and lload

load_land_ship() and load_land_land() automatically resupply the land
units they load.  This can draw supplies from the sector where the
land units are.  When load() and lload() later update the sector, they
wipe out the update made for drawing supplies, and we get a seqno
mismatch oops.  Highly abusable.

15 years agoFix edit l, s, u, p not to wipe out concurrent updates hvy-metal-2.1
Markus Armbruster [Sat, 10 May 2008 06:40:48 +0000 (08:40 +0200)]
Fix edit l, s, u, p not to wipe out concurrent updates

Make edit() bail out if the edited object changed while edit() slept
for input.
(cherry picked from commit a1f4dc95920e579432dfbd0e7664558f8c3ca1fc)

15 years agoFix xdump nat for relations
Markus Armbruster [Sat, 10 May 2008 06:36:45 +0000 (08:36 +0200)]
Fix xdump nat for relations

Commit ee863c5d (v4.3.12) got opt_HIDDEN backwards in nstr_exec_val().
(cherry picked from commit 3dbb4dbb9364100d1e3862994202f2835c78ba5a)

15 years agoFix origin command not to prompt twice for its argument
Markus Armbruster [Wed, 7 May 2008 20:05:22 +0000 (22:05 +0200)]
Fix origin command not to prompt twice for its argument

Broken in commit b69173ee, v4.3.0.
(cherry picked from commit 27c3466aa5669b442eca850495107aee8110c228)

15 years agoCover biofuel plant in info Quick-ref
Markus Armbruster [Sat, 10 May 2008 10:49:02 +0000 (12:49 +0200)]
Cover biofuel plant in info Quick-ref

15 years agoFix markup in info Hvy-Metal
Markus Armbruster [Sat, 10 May 2008 10:48:24 +0000 (12:48 +0200)]
Fix markup in info Hvy-Metal

15 years agoDisable another incorrect use of supply_commod()
Markus Armbruster [Sat, 10 May 2008 07:27:52 +0000 (09:27 +0200)]
Disable another incorrect use of supply_commod()

navi() reads the ships into a list.  When the ships get interdicted,
and lack flak shells, ac_shipflak() tries to get one and updates the
ship.  When the ship in the list is later written back, e.g. to apply
interdiction damage, the flak shell is wiped out, and we get a seqno
mismatch oops.

Disable automatic flak shell supply in ac_ship_flak() for now.  This
is related to commit f7d61817, which disabled automatic supply of
shells in ac_doflak() and shp_missile_defense().

15 years agoMerge branch 'master' into hvy-metal-2
Markus Armbruster [Wed, 7 May 2008 08:36:54 +0000 (10:36 +0200)]
Merge branch 'master' into hvy-metal-2

Merge up to v4.3.14.  No functional change.

15 years agoFix edit command seqno oopses hvy-metal-2.0
Markus Armbruster [Mon, 5 May 2008 19:26:12 +0000 (21:26 +0200)]
Fix edit command seqno oopses

Broken by commit c58a0284.

15 years agoDebug code to help catch the phantom nuke bug
Markus Armbruster [Sat, 26 Apr 2008 07:53:47 +0000 (09:53 +0200)]
Debug code to help catch the phantom nuke bug

Thu Apr 24 12:20:52 2008 Oops: bug in ../src/lib/subs/plnsub.c:1146

#3  0x080e64f4 in oops (msg=0x0, file=0x80ff1ca "../src/lib/subs/plnsub.c",
    line=1146) at ../src/lib/gen/log.c:141
#4  0x080bce6c in pln_damage (pp=0x8415b60, x=82, y=20, type=115 's',
    nukedamp=0x84158bc, noisy=1) at ../src/lib/subs/plnsub.c:1146
#5  0x080684f2 in launch_missile (pp=0x8415b60, sublaunch=0)
    at ../src/lib/commands/laun.c:281
#6  0x08067c79 in laun () at ../src/lib/commands/laun.c:111

15 years agoUpdate info Hvy-Metal for Hvy Metal II
Markus Armbruster [Thu, 24 Apr 2008 19:13:06 +0000 (21:13 +0200)]
Update info Hvy-Metal for Hvy Metal II

15 years agoPermit ships to assault the sector they're in
Markus Armbruster [Thu, 24 Apr 2008 18:38:57 +0000 (20:38 +0200)]
Permit ships to assault the sector they're in

Ships still have to be in a sea sector to assault an adjacent sector.

15 years agoLet ships navigate bridge spans regardless of owner
Markus Armbruster [Thu, 24 Apr 2008 18:25:48 +0000 (20:25 +0200)]
Let ships navigate bridge spans regardless of owner

15 years agoDisable some incorrect uses of supply_commod()
Markus Armbruster [Thu, 24 Apr 2008 18:18:23 +0000 (20:18 +0200)]
Disable some incorrect uses of supply_commod()

Because supply_commod() updates supply sources it used, the caller
must not cache objects that could be supply sources across a supply
call.  This is very easy to get wrong.

ac_doflak() supplies flak shells if the sector hasn't enough for its
guns.  It caches the sector that receives them.  If the sector has
some shells, but not enough, it supplies them to itself, causing it to
be updated from within supply_commod().  ac_doflak() then adds the
supplied shells to its cached sector, then writes that back.  This
doubles shells already there, and triggers a a seqno mismatch oops.

shp_missile_defense() has similar problems, only for ships.

Disable ac_doflak() and shp_missile_defense() for now, to at least
reduce the oopsing to manageable levels.

Most likely other calls of supply_commod() are also wrong.  Many of
them can't be just disabled, because supply is too relevant to
gameplay there.

15 years agoOops on sequence number mismatch
Markus Armbruster [Mon, 21 Apr 2008 20:03:36 +0000 (22:03 +0200)]
Oops on sequence number mismatch

Old code only logged this, for fear of false positives.

15 years agoTrains can no longer be loaded on land units, update info Railroad
Markus Armbruster [Mon, 21 Apr 2008 20:00:06 +0000 (22:00 +0200)]
Trains can no longer be loaded on land units, update info Railroad

15 years agoFix info Railroad on spy and satellite reports
Markus Armbruster [Tue, 15 Apr 2008 06:05:46 +0000 (08:05 +0200)]
Fix info Railroad on spy and satellite reports

Fix explanation of "rl eff" value.  Mention satellite report.

15 years agoDon't store RAILWAYS track in sectors
Markus Armbruster [Tue, 15 Apr 2008 05:57:03 +0000 (07:57 +0200)]
Don't store RAILWAYS track in sectors

Storing track in sectors is problematic, because we need to update
adjacent sectors when updating a sector in a way that changes its
capability to extend railway into its neighbors.  This invalidates
cached adjacent sectors, and calling code may not be prepared for
that.  Specifically, bridge building caches the bridge head, and
writes it back later, wiping out the track update.

Replace struct sctstr member sct_track by new sct_rail_track().  Make
selector track virtual.  Remove the code to keep sct_track up-to-date:
set_railway(), update_railway().

Unfortunately, this causes cyclic dependencies between link libraries:
the virtual selector needs to be referenced from src/lib/global/nsc.c,
and it needs to reference stuff from src/lib/common/file.c.  Hack
around it in Make.mk for now.

15 years agoUpdate info Hvy-Metal for Hvy Metal II
Markus Armbruster [Sat, 5 Apr 2008 14:11:11 +0000 (16:11 +0200)]
Update info Hvy-Metal for Hvy Metal II

15 years agoMake fairland record the island number in the deity territory
Markus Armbruster [Sat, 5 Apr 2008 14:09:24 +0000 (16:09 +0200)]
Make fairland record the island number in the deity territory

Can be useful for deities when further customizing their game setup.

15 years agoDon't produce food without work
Markus Armbruster [Tue, 1 Apr 2008 18:17:52 +0000 (20:17 +0200)]
Don't produce food without work

We don't want to starve tiny populations, because that would require
players to move trivial amounts of food after explore and such.
growfood() used to simply grow at least 1f when a sector was about to
starve.  That food is almost never eaten by a tiny population, so we
effectively got some production without work.  Fix by taking away that
free food after people ate, in do_feed().

15 years agoAdd sequence numbers to game state (experimental)
Markus Armbruster [Fri, 21 Mar 2008 13:22:07 +0000 (14:22 +0100)]
Add sequence numbers to game state (experimental)

This catches output dependency violations, e.g. two threads doing a
read-modify-write without synchronization.

New struct emptypedstr member seqno.  Make sure all members of unit
empobj_storage share it.  Set it in ef_blank() and ef_set_uid(), step
it in ef_write().  fairland and files don't use ef_set_uid(); need to
set it manually in files.c's main() and file_sct_init().

Factor do_read() out of fillcache() to make it available for
new get_seqno().

15 years agoNew concept sector terrain
Markus Armbruster [Wed, 13 Feb 2008 19:54:08 +0000 (20:54 +0100)]
New concept sector terrain

A sector type's terrain (struct dchrstr member d_terrain) is the
sector type of its underlying terrain.  Sector types occuring in
d_terrain are terrain types, and must have their own type in
d_terrain.  Players can change sector types only to those with the
same terrain.

The builtin configuration defines terrain types sea, mountain,
wasteland, wilderness and plains.  It gives bridge span and tower
terrain sea, and everything else terrain wilderness.  Hence, the stock
game remains unchanged.

Deities can use terrain to create sector types that can be developed
only in limited ways.

15 years agoRemove hard-coded differences between highways and bridge heads
Markus Armbruster [Tue, 12 Feb 2008 06:10:33 +0000 (07:10 +0100)]
Remove hard-coded differences between highways and bridge heads

Let highways build and support bridges.  Allow bridge heads anywhere,
not just on the coast.

15 years agoDocument Hvy Metal refinery p.e.
Markus Armbruster [Sat, 19 Jan 2008 14:25:04 +0000 (15:25 +0100)]
Document Hvy Metal refinery p.e.

15 years agoRebase of Hvy Metal I final version
Markus Armbruster [Sat, 19 Jan 2008 14:19:13 +0000 (15:19 +0100)]
Rebase of Hvy Metal I final version

Straightforward forward port.  Drop the code to reset track on
startup.  It's not necessary, and it breaks linking of empdump.

15 years agoAvoid compiler warning v4.3.14
Markus Armbruster [Mon, 5 May 2008 19:54:02 +0000 (21:54 +0200)]
Avoid compiler warning

15 years agoUpdate change log again for 4.3.14
Markus Armbruster [Mon, 5 May 2008 04:45:02 +0000 (06:45 +0200)]
Update change log again for 4.3.14

15 years agoFix fire not to disclose retreat and wipe out target shell use
Markus Armbruster [Sun, 4 May 2008 19:58:29 +0000 (21:58 +0200)]
Fix fire not to disclose retreat and wipe out target shell use

multifire() clobbered any changes to the target ship or sector made by
defend().  This let the target fire back for free.

multifire() retreated the target ship before reporting its location to
the player.  This disclosed its new location.

Fix by damaging and retreating the target after calling defend().

15 years agoChange fire to always fire guns when the target is beyond range
Markus Armbruster [Sun, 4 May 2008 17:35:14 +0000 (19:35 +0200)]
Change fire to always fire guns when the target is beyond range

multifire() drops depth charges if the target is a submarine, else it
fires guns.  It fails if the target is out of range.  But players
could still find out whether the target is a sub then, because depth
charge shell use differs from gun fire shell use.  This loophole
existed before 4.0.6, and was reopened by commit a3ad623b (v4.3.12).

Change multifire() to always use guns if the target is out of range.

While there, treat failure from shp_dchrg() and shp_fire() the same,
so that the player can't distinguish the two cases.  Failure there
should not happen.

15 years agoMake depth charges work with just one shell
Markus Armbruster [Sun, 4 May 2008 17:02:15 +0000 (19:02 +0200)]
Make depth charges work with just one shell

Commit a3ad623b (v4.3.12) made depth charging fail when there's just
one shell.  This let players find all submarine uids.  It basically
reopened the loophole closed in commit aa26c53e (v4.2.20).

Fix by making shp_dchrg() with just one shell succeed and return
damage like fire from one gun.

15 years agoFix fire command to detect when the firing object changes
Markus Armbruster [Sun, 4 May 2008 14:44:26 +0000 (16:44 +0200)]
Fix fire command to detect when the firing object changes

multifire() failed to take into account that the firing firing sector,
ship or land unit can change while it is getting the target argument.
It thus clobbered any updates made to the firing object while it was
sleeping for the target argument.  Abusable.  Broken when Chainsaw
introduced MULTIFIRE.

15 years agoFix parsing of anchor-relative time in update schedule
Markus Armbruster [Sun, 4 May 2008 07:51:08 +0000 (09:51 +0200)]
Fix parsing of anchor-relative time in update schedule

Commit 16b811d4 (v4.3.13) broke parse_time().

15 years agoUpdate change log again for 4.3.14.
Markus Armbruster [Tue, 29 Apr 2008 20:08:03 +0000 (22:08 +0200)]
Update change log again for 4.3.14.

15 years agoJournal input of special cookies "ctld" and "aborted"
Markus Armbruster [Tue, 29 Apr 2008 19:42:17 +0000 (21:42 +0200)]
Journal input of special cookies "ctld" and "aborted"

The latter is necessary to interpret the journal correctly.  The
former isn't, as it should always lead to a logout straight away, but
treating it just the same is simple and doesn't hurt.

15 years agoRewrite recvclient() for clarity
Markus Armbruster [Tue, 29 Apr 2008 19:28:28 +0000 (21:28 +0200)]
Rewrite recvclient() for clarity

Behavior differs for the following scenario: if, while the thread
sleeps in io_input() called from recvclient(), at least one line of
input arrives and the thread gets awakened by the update aborting
commands, then the old code throws away the first line of input, but
the new code doesn't.

15 years agoFix launch not to report the same ship sunk twice
Markus Armbruster [Tue, 29 Apr 2008 19:10:33 +0000 (21:10 +0200)]
Fix launch not to report the same ship sunk twice

This happened when a marine missile with a conventional warhead sunk
its target.

15 years agoOops on nuclear-tipped anti-sat missiles
Markus Armbruster [Tue, 29 Apr 2008 19:01:54 +0000 (21:01 +0200)]
Oops on nuclear-tipped anti-sat missiles

Anti-sat code is not prepared to deal with nuclear damage.  The arm
command refuses to arm anti-sats, but better check.

15 years agoFix bugs in tracking of planes flying a sortie
Markus Armbruster [Tue, 29 Apr 2008 18:53:35 +0000 (20:53 +0200)]
Fix bugs in tracking of planes flying a sortie

Commit 7ca4f412 fixed tracking of planes flying a sortie by marking
them with flag PLN_LAUNCHED.  It failed to write SAMs and planes
flying missions back to the plane file, in sam_intercept() and
mission_pln_arm().  The only known problem with that is fairly
harmless: when the mission damages planes on the ground, the planes
flying it get damaged as if they were still sitting in their bases,
but the damage gets wiped out when they land.

The same issue applies to missiles.  So they need to be tracked as
well.  Do that in msl_hit().

While there, remove a few redundant PLN_LAUNCHED sanity checks.

15 years agoWrite planes fixed on game start to disk properly
Markus Armbruster [Tue, 29 Apr 2008 18:38:10 +0000 (20:38 +0200)]
Write planes fixed on game start to disk properly

When fixing planes stuck in the air, we fixed them only in memory, so
when a fixed plane wasn't written to disk for other reasons before the
next game start, it had to be fixed again.

Change pln_zap_transient_flags() to write them out.

15 years agoDon't let hardened missiles be loaded on ships or land units
Markus Armbruster [Mon, 28 Apr 2008 20:30:19 +0000 (22:30 +0200)]
Don't let hardened missiles be loaded on ships or land units

Fix load_plane_ship() and load_plane_land() to reject hardened planes.

15 years agoDon't let missiles loaded on land units be hardened
Markus Armbruster [Mon, 28 Apr 2008 20:27:54 +0000 (22:27 +0200)]
Don't let missiles loaded on land units be hardened

hard() already rejected missiles loaded on ships, but missed land

15 years agoDocument what happens when the update aborts commands
Markus Armbruster [Mon, 28 Apr 2008 20:24:36 +0000 (22:24 +0200)]
Document what happens when the update aborts commands

15 years agoRevert "(prmptrd, uprmptrd): Should not be called while player->aborted. Check."
Markus Armbruster [Mon, 28 Apr 2008 20:22:18 +0000 (22:22 +0200)]
Revert "(prmptrd, uprmptrd): Should not be called while player->aborted.  Check."

This reverts commit fee8ac9d8f519649ad72129cae9ffb3bbd5d7ffb.

These *are* called while player->aborted.  Could be avoided, but: the
reason for not wanting to prompt then is to have each prompt consume a
line of input.  That's actually not feasible, because when we wait for
an argument (after prompting for it) when the update aborts commands,
we can't consume the argument we prompted for.

15 years agoFix lnd_fire() ammo sanity check
Markus Armbruster [Sat, 26 Apr 2008 08:15:05 +0000 (10:15 +0200)]
Fix lnd_fire() ammo sanity check

Checking l_ammo before lnd_dam() oopses when something attempts to
fire from a land unit type that can't fire (l_dam == 0) and uses no
ammo.  Such usage is perfectly fine.  Move the check to the correct

15 years agoUpdate change log for 4.3.14
Markus Armbruster [Fri, 25 Apr 2008 20:28:40 +0000 (22:28 +0200)]
Update change log for 4.3.14

15 years agoA script for post_crash_dump_hook
Markus Armbruster [Fri, 25 Apr 2008 20:13:08 +0000 (22:13 +0200)]
A script for post_crash_dump_hook

15 years agoNew post_crash_dump_hook
Markus Armbruster [Fri, 25 Apr 2008 20:12:22 +0000 (22:12 +0200)]
New post_crash_dump_hook

Run it from crash_dump().  Useful to move core files out of the way,
alert deities by e-mail, and so forth.

15 years agoDetect and log errors in crash_dump()
Markus Armbruster [Fri, 25 Apr 2008 20:09:52 +0000 (22:09 +0200)]
Detect and log errors in crash_dump()

15 years agoMove oops actions from log.c up to application
Markus Armbruster [Fri, 25 Apr 2008 18:20:07 +0000 (20:20 +0200)]
Move oops actions from log.c up to application

Change oops() to call the new oops_handler function pointer instead of
offering a fixed set of actions.  Change server's main() to install a
handler for the action requested by -E.

15 years agoGive try_supply_commod() internal linkage
Markus Armbruster [Tue, 22 Apr 2008 19:56:35 +0000 (21:56 +0200)]
Give try_supply_commod() internal linkage

15 years agoNew server option -E to choose what to do on oops
Markus Armbruster [Mon, 21 Apr 2008 19:35:46 +0000 (21:35 +0200)]
New server option -E to choose what to do on oops

Three options: abort, crash-dump, nothing.  crash-dump works by
aborting a fork.  It isn't implemented for Windows.

The oops action is no longer tied to daemon mode, but -d still implies
-E abort for convenience.

15 years agoFlush every journal entry even when not in debug mode
Markus Armbruster [Mon, 21 Apr 2008 18:42:50 +0000 (20:42 +0200)]
Flush every journal entry even when not in debug mode

Somewhat wasteful, but useful in case of a crash.

15 years agoDon't let trains load trains
Markus Armbruster [Fri, 18 Apr 2008 19:26:15 +0000 (21:26 +0200)]
Don't let trains load trains

Doesn't affect the stock game, because its only train is heavy.

15 years agoAllow deity to display power report for all types of countries
Ron Koenderink [Sat, 19 Apr 2008 03:32:46 +0000 (21:32 -0600)]
Allow deity to display power report for all types of countries

Relax country status check of power c for deities.  Can be useful to
display NPCs.

15 years agoFix designate's check for disallowed sector types
Markus Armbruster [Wed, 16 Apr 2008 05:45:07 +0000 (07:45 +0200)]
Fix designate's check for disallowed sector types

Bug lets mortals designate all sector types, including sanctuaries.
desi() complains, but then executes anyway.  Broken in commit
8227d8c8, v4.3.12.

15 years agoBump version to 4.3.14
Markus Armbruster [Wed, 16 Apr 2008 05:38:39 +0000 (07:38 +0200)]
Bump version to 4.3.14

15 years agoFinal polish for 4.3.13 v4.3.13
Markus Armbruster [Tue, 15 Apr 2008 19:04:03 +0000 (21:04 +0200)]
Final polish for 4.3.13

15 years agoFix documented syntax of edit command.
Markus Armbruster [Tue, 15 Apr 2008 18:57:28 +0000 (20:57 +0200)]
Fix documented syntax of edit command.

While there: editing nukes isn't implemented, don't advertise it.

15 years agoDocument that nukes can be traded
Markus Armbruster [Tue, 15 Apr 2008 18:34:42 +0000 (20:34 +0200)]
Document that nukes can be traded

15 years agoFix and polish comments emitted by pconfig
Markus Armbruster [Tue, 15 Apr 2008 18:29:29 +0000 (20:29 +0200)]
Fix and polish comments emitted by pconfig

15 years ago4.3.13 late changes
Markus Armbruster [Fri, 11 Apr 2008 20:12:41 +0000 (22:12 +0200)]
4.3.13 late changes

15 years agoWrap long lines in version's list of customized tables
Markus Armbruster [Thu, 10 Apr 2008 20:01:25 +0000 (22:01 +0200)]
Wrap long lines in version's list of customized tables

Factor the wrapping print out of show_opts() into prwrap().  Use it
in show_custom().

15 years agoWork around strptime() lossage
Markus Armbruster [Mon, 7 Apr 2008 18:20:13 +0000 (20:20 +0200)]
Work around strptime() lossage

Some losing implementations of strptime() such as FreeBSD's happily
succeed when they fully consumed the first argument, regardless of
whether they matched the full second argument or not.  This causes
lines without directives to be interpreted as "next Sunday".

Work around the lossage in parse_time().

15 years agoFix emp_server manual page synopsis for Windows
Ron Koenderink [Sun, 6 Apr 2008 20:58:13 +0000 (14:58 -0600)]
Fix emp_server manual page synopsis for Windows

The -R option appears in the wrong place.

15 years agoBump client version to 4.3.13
Markus Armbruster [Sun, 6 Apr 2008 20:07:02 +0000 (22:07 +0200)]
Bump client version to 4.3.13

This was forgotten in commit ef00d650 and commit 09c21f83.  The 4.2.12
client misidentified itself as 4.2.11.

15 years agoUpdate change log for 4.3.13
Markus Armbruster [Sun, 6 Apr 2008 20:00:25 +0000 (22:00 +0200)]
Update change log for 4.3.13

15 years agoBelatedly update c_form of xdump command
Markus Armbruster [Sun, 6 Apr 2008 19:52:33 +0000 (21:52 +0200)]
Belatedly update c_form of xdump command

Update for commit da8a1dae, v4.3.12.

15 years agoPut MAXNOC in xdump version
Markus Armbruster [Sun, 6 Apr 2008 13:03:37 +0000 (15:03 +0200)]
Put MAXNOC in xdump version

Create virtual selector nsc_ver_maxnoc() for it.

15 years agoDoc fix: don't claim empdump doesn't exist yet
Markus Armbruster [Sun, 6 Apr 2008 12:48:12 +0000 (14:48 +0200)]
Doc fix: don't claim empdump doesn't exist yet

15 years agoFix initialization of realms in newcap
Markus Armbruster [Sun, 6 Apr 2008 07:49:47 +0000 (09:49 +0200)]
Fix initialization of realms in newcap

Broken in commit e1a68c72, v4.3.12.

15 years agoFix add of for status arguments active, god, delete
Markus Armbruster [Sun, 6 Apr 2008 07:16:09 +0000 (09:16 +0200)]
Fix add of for status arguments active, god, delete

Broken in commit e1a68c72, v4.3.12.

15 years agoBump version to 4.3.13
Markus Armbruster [Sun, 6 Apr 2008 05:33:14 +0000 (07:33 +0200)]
Bump version to 4.3.13

15 years agoRemove unused unit stat development macros v4.3.12
Markus Armbruster [Fri, 4 Apr 2008 18:35:09 +0000 (20:35 +0200)]
Remove unused unit stat development macros

Commit 0219bf08 hid all of them them away, but used only some of them
in their new home.  Clean up.

15 years agoUpdate change log for 4.3.12
Markus Armbruster [Wed, 2 Apr 2008 05:36:47 +0000 (07:36 +0200)]
Update change log for 4.3.12

15 years agoDon't make more babies than food permits
Markus Armbruster [Sun, 30 Mar 2008 16:28:07 +0000 (18:28 +0200)]
Don't make more babies than food permits

babies() rounded the maximum number of babies permitted by food.  When
this rounded up, grow_people() could use more food than available, and
the sector's food could become negative.  Fix by always rounding down.

15 years agoDoc fix
Markus Armbruster [Fri, 28 Mar 2008 19:53:22 +0000 (20:53 +0100)]
Doc fix

15 years agoRemove src/scripts/tag-changeling, it's specific to CVS
Markus Armbruster [Fri, 28 Mar 2008 19:52:31 +0000 (20:52 +0100)]
Remove src/scripts/tag-changeling, it's specific to CVS

15 years agoUpdate documentation to talk about git instead of CVS
Markus Armbruster [Fri, 28 Mar 2008 19:42:49 +0000 (20:42 +0100)]
Update documentation to talk about git instead of CVS

15 years agoRevert "Use XYOFFSET() instead of sctoff() in sector iterators"
Markus Armbruster [Fri, 28 Mar 2008 06:17:17 +0000 (07:17 +0100)]
Revert "Use XYOFFSET() instead of sctoff() in sector iterators"

This reverts commit d2ca7d4ed2c9ab03ba20a18fa53613d7baaa9026.

Turns out the arguments are not always normalized, e.g. after

15 years agoAdd missing thread yield system call.
Ron Koenderink [Fri, 28 Mar 2008 02:07:11 +0000 (20:07 -0600)]
Add missing thread yield system call.

This change fixes a bug where the threads were not treated
fairly.  Before the fix, empth_yield would only yield to
threads already waiting hThreadMutex mutex.  It would not
yield to other threads ready to run from the release of other
mutexes.  An example of this is that the update task did
not start when force command was issued from script sequence.

15 years agoRevert "Fix update's resupply of food to avoid starvation"
Markus Armbruster [Wed, 26 Mar 2008 21:00:35 +0000 (22:00 +0100)]
Revert "Fix update's resupply of food to avoid starvation"

This reverts commit 03811b2c97d9537cfeaf4e5a6726002b0b0d6b78.

That "fix" could actually conjure up food.  The resupply doesn't wipe
out food, because it resuppies from the sector itself.

15 years agoFix empdump to check for export write errors
Markus Armbruster [Tue, 25 Mar 2008 20:39:27 +0000 (21:39 +0100)]
Fix empdump to check for export write errors

15 years agoPass struct natstr * instead of natid to virtual selectors
Markus Armbruster [Tue, 25 Mar 2008 20:36:52 +0000 (21:36 +0100)]
Pass struct natstr * instead of natid to virtual selectors

This is because we want to define them in src/lib/global/, and code
there can't use getnatp(), because that requires
src/lib/common/file.c.  Which renders a cnum parameter pretty useless.

Virtual selectors requiring code from common/ could well come up again
in the future, but let's not worry about that now.

15 years agoNo need to assign uid after ef_blank()
Markus Armbruster [Mon, 24 Mar 2008 17:40:06 +0000 (18:40 +0100)]
No need to assign uid after ef_blank()

The redundant assignments should have been removed in commit 2da8d0c7.

15 years agoFix the obvious bogosities in info launch
Markus Armbruster [Mon, 24 Mar 2008 16:35:29 +0000 (17:35 +0100)]
Fix the obvious bogosities in info launch

15 years agoCheck pln_airbase_ok() in msl_sel()
Markus Armbruster [Mon, 24 Mar 2008 16:35:23 +0000 (17:35 +0100)]
Check pln_airbase_ok() in msl_sel()

The lack of base checking there permitted ship and land unit missile
interdiction and ballistic missile interception without a proper base.

15 years agoReplace laun()'s base checking code by pln_airbase_ok()
Markus Armbruster [Mon, 24 Mar 2008 16:17:53 +0000 (17:17 +0100)]
Replace laun()'s base checking code by pln_airbase_ok()

This outlaws launch from unowned sectors.  Also, non-VTOL missiles
require an efficient airfield now, except that such missiles don't
exist currently, because init_plchr() makes all missiles VTOL.

15 years agoChange launch not to destroy missiles stuck on foreign ships
Markus Armbruster [Mon, 24 Mar 2008 16:11:03 +0000 (17:11 +0100)]
Change launch not to destroy missiles stuck on foreign ships

When laun() refused to launch a missile because of its carrier's
nationality, it destroyed the missile.  Don't do that.

15 years agoFix launch_as() to use up supplies only when actually launching
Markus Armbruster [Mon, 24 Mar 2008 15:24:42 +0000 (16:24 +0100)]
Fix launch_as() to use up supplies only when actually launching

15 years agoFix launch to require petrol for launching satellites
Markus Armbruster [Mon, 24 Mar 2008 15:23:03 +0000 (16:23 +0100)]
Fix launch to require petrol for launching satellites

launch_sat() failed to call msl_equip().  Change msl_equip() to take
the mission character as argument, because the old hardcoded 'p' isn't
appropriate for satellites.  Best fit for satellites is 'r' for
reconnaissance, but mission_pln_equip() doesn't accept that
(pln_equip() does).  Fix that as well.

15 years agoFix empdump not to depend on POGO's origin
Markus Armbruster [Mon, 24 Mar 2008 14:06:36 +0000 (15:06 +0100)]
Fix empdump not to depend on POGO's origin

Treat NATID_BAD as deity with absolute coordinates in nstr_exec_val()
and xdinit().  Use that in dump_table().

15 years agoMake xnorm() and ynorm() use XNORM() and YNORM()
Markus Armbruster [Mon, 24 Mar 2008 13:13:58 +0000 (14:13 +0100)]
Make xnorm() and ynorm() use XNORM() and YNORM()

They duplicated them before.

15 years agoSimplify xrel() and yrel()
Markus Armbruster [Mon, 24 Mar 2008 13:09:51 +0000 (14:09 +0100)]
Simplify xrel() and yrel()

Value of XNORM() and YNORM() is in [0,WORLD_X) and [0,WORLD_Y),

15 years agoSimplify XNORM() and YNORM()
Markus Armbruster [Mon, 24 Mar 2008 13:00:59 +0000 (14:00 +0100)]
Simplify XNORM() and YNORM()

Simplify (M - (n % M)) % M  to M - (n % M), for n < 0.

15 years agoUse nstr_sect member id instead of recomputing it
Markus Armbruster [Mon, 24 Mar 2008 10:42:53 +0000 (11:42 +0100)]
Use nstr_sect member id instead of recomputing it

bmnxtsct() sets it.  The old code recomputed it with sctoff() without
checking for failure.  Not a bug, because it can't actually fail, just

15 years agoDoc fix
Markus Armbruster [Mon, 24 Mar 2008 10:38:53 +0000 (11:38 +0100)]
Doc fix

15 years agoUse XYOFFSET() instead of sctoff() in sector iterators
Markus Armbruster [Mon, 24 Mar 2008 10:38:25 +0000 (11:38 +0100)]
Use XYOFFSET() instead of sctoff() in sector iterators

Old code didn't check value of sctoff() for success.  But it can't
fail, because we already took care of the condition that can make it
fail.  Moreover, the arguments are already normalized.  Therefore, we
can just call XYOFFSET().

15 years agoMake newcap's second argument mandatory
Markus Armbruster [Mon, 24 Mar 2008 10:22:40 +0000 (11:22 +0100)]
Make newcap's second argument mandatory

The code to find a suitable sanctuary location is flawed: to find
space and resources around the location, it does a depth-first search
limited to 300 sectors.  Pretty useless when the limit is reached.  A
breadth-first search would work, but why bother?  This feature is
obscure and rarely (if ever) used: no conscientious deity would use it
for a real game, and for blitzes fairland does a better job.  Remove