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

14 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

14 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().

14 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.

14 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.

14 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.

14 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().

14 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.

14 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.

14 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.

14 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.

14 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.

14 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.

14 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.

14 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.

14 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
units.

14 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

14 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.

14 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
place.

14 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

14 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

14 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.

14 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()

14 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.

14 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

14 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.

14 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.

14 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.

14 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.

14 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.

14 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

14 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

14 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.

14 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

14 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

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

14 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().

14 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().

14 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.

14 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.

14 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

14 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.

14 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.

14 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

14 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.

14 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.

14 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

14 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.

14 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

14 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.

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

14 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

14 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

14 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
snxtitem_all().

14 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.

14 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.

14 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

14 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.

14 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.

14 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

14 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.

14 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.

14 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.

14 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

14 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.

14 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().

14 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.

14 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),
respectively.

14 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.

14 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
confusing.

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

14 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().

14 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
it.

14 years agoUse sctstr member sct_uid instead of recomputing it
Markus Armbruster [Mon, 24 Mar 2008 09:53:56 +0000 (10:53 +0100)]
Use sctstr member sct_uid instead of recomputing it

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

14 years agoMake would_abandon() more robust
Markus Armbruster [Mon, 24 Mar 2008 09:08:54 +0000 (10:08 +0100)]
Make would_abandon() more robust

Do the right thing when caller passes a larger amount than actually
there.

14 years agoSimplify would_abandon()
Markus Armbruster [Mon, 24 Mar 2008 09:06:52 +0000 (10:06 +0100)]
Simplify would_abandon()

14 years agoOops on unexpected mission in pln_equip() and mission_pln_equip()
Markus Armbruster [Mon, 24 Mar 2008 08:30:37 +0000 (09:30 +0100)]
Oops on unexpected mission in pln_equip() and mission_pln_equip()

14 years agoUse mission 0 instead of 'r' for air defense
Markus Armbruster [Mon, 24 Mar 2008 15:05:29 +0000 (16:05 +0100)]
Use mission 0 instead of 'r' for air defense

reco() uses 'r' for reconnaissance.  sam_intercept() and
ac_intercept() use 0 for intercept.  Switch air_defense() to use 0 as
well.  No functional change, because 'r' and 0 behave the same, just
cleanup.

14 years agoSimplify mission_pln_equip()
Markus Armbruster [Mon, 24 Mar 2008 08:28:08 +0000 (09:28 +0100)]
Simplify mission_pln_equip()

Cases 't' and 'd' are identical.

14 years agoCheck plane efficiency and capabilities earlier in pln_sel()
Markus Armbruster [Mon, 24 Mar 2008 07:04:10 +0000 (08:04 +0100)]
Check plane efficiency and capabilities earlier in pln_sel()

This way we don't complain about range to assembly point and
destination for planes that can't go regardless.

14 years agoSimplify pln_equip() and mission_pln_equip()
Markus Armbruster [Sun, 23 Mar 2008 15:18:51 +0000 (16:18 +0100)]
Simplify pln_equip() and mission_pln_equip()

Mission 'n' was removed along with nuke_bomb() many years ago.
Simplify accordingly.

14 years agoOops rather than complain to player on bad mission in bomb()
Markus Armbruster [Sun, 23 Mar 2008 15:09:32 +0000 (16:09 +0100)]
Oops rather than complain to player on bad mission in bomb()

14 years agoFix tracking of planes flying a sortie
Markus Armbruster [Sun, 23 Mar 2008 18:21:19 +0000 (19:21 +0100)]
Fix tracking of planes flying a sortie

Planes normally sit in their base (sector or carrier), where they can
be spied, damaged, captured, loaded, unloaded, upgraded and so forth.
All this must not be possible while they fly.  There are two kinds of
flying planes: satellites in orbit, and planes flying a sortie.

Satellites in orbit have always been marked with flag PLN_LAUNCHED.
Works.  What didn't work was tracking planes flying a sortie.

If you look at one sortie in isolation, up to three groups of planes
can be flying at any point of time: the primary group, which carries
out the sortie's mission (bomb, transport, ...), their escorts, and a
group of hostile planes flying interception or air defense.

The old code attempted to track these planes by passing those groups
to the places that need to know whether a plane is flying.  This was
complex and incomplete, and broke down completely for the pin-bombing
command.

It was complex, because the plane code needs to keep track of all the
call chains that can lead to a place that needs to know whether a
plane flies, and pass the groups down the call chains.  This leads to
a rather ugly passing of plane groups all over the place.

It was incomplete, because it generally failed to pass the escorts.

And the whole scheme broke down for the pin-bombing command.  That's
because pin-bombing asks the player for targets while his planes are
loitering above the target sector.  This yields the processor and lets
other code run.  Which does not get the flying planes passed.

The new code marks planes and SAMs (but not other missiles) flying a
sortie with flag PLN_LAUNCHED (the previous commit laid the groundwork
for that), and does away with passing around groups of flying planes.

This fixes the following bugs:

* Many commands could interact with foreign planes flying for a
  pin-bombing command as if they were sitting in their base.  This
  includes spying, damaging, capturing, loading, or upgrading them,
  and even getting intercepted by them.  Any changes to those planes
  were wiped out when they landed.  Abusable.

* The bomb command could bomb its own escorts, directly (pin-bomb
  planes) or through collateral damage, strategic sector damage,
  collapsing bridges or nuke damage.  The damage to the escorts was
  wiped out when they landed.

* If you asked for a plane to fly both in the primary group and the
  escort group, you got charged fuel for two sorties instead of one.

* pln_put1() and pln_put() now recognize planes that didn't take off,
  and refrain from making them land.  Intercept (since commit
  c64e2149) and air defense can do that.  Making them land had no
  ill-effects, but it was still wrong.

There's one new problem: if PLN_LAUNCHED doesn't get reset properly,
due to game crash during flight or some other bug, the plane gets
stuck in the air.  Catch and fix that on game start in ef_verify().

14 years agoDistinguish between planes "in orbit" and "launched"
Markus Armbruster [Sat, 22 Mar 2008 17:38:51 +0000 (18:38 +0100)]
Distinguish between planes "in orbit" and "launched"

Use new pln_is_in_orbit() when we want to test for orbit specifically,
and test PLN_LAUNCHED when we want to test whether the plane not
sitting in the sector (because it is flying).  This distinction is
pointless at this time, because the only way PLN_LAUNCHED gets set is
when a satellite goes into orbit.  It will become useful in a later
commit, which will use PLN_LAUNCHED to mark flying planes.

14 years agoFactor out a single plane's end of sortie into new pln_put1()
Markus Armbruster [Sat, 22 Mar 2008 13:55:30 +0000 (14:55 +0100)]
Factor out a single plane's end of sortie into new pln_put1()

Use it in pln_put() and ac_planedamage().

This changes ac_planedamage() to deal with a destroyed airbase.
Before, aborted planes happily landed there.  This bug could not
actually bite, because the code neither yields nor does damage to
potential airbases between checking the landing airbase before takeoff
and aborting planes in ac_planedamage().

It changes pln_put() to cope with dead planes.  Before, it made them
land as if they lived, fortunately without ill effects (complaints
about not being able to land were suppressed for dead planes).
ac_planedamage() removes dead planes, but pinflak_planedamage()
doesn't, and these end up in pln_put().  pinflak_planedamage() no
longer has to take shot down planes off their carriers, because
pln_put() now takes care of that.

14 years agoOops when air_defense() somehow leaks interceptors
Markus Armbruster [Sat, 22 Mar 2008 18:47:30 +0000 (19:47 +0100)]
Oops when air_defense() somehow leaks interceptors

14 years agoFix memory leak in air_defense() oops
Markus Armbruster [Sat, 22 Mar 2008 18:46:47 +0000 (19:46 +0100)]
Fix memory leak in air_defense() oops

Broken in commit 9c27a771.

14 years agoFix memory leaks in plane interception
Markus Armbruster [Sat, 22 Mar 2008 18:43:38 +0000 (19:43 +0100)]
Fix memory leaks in plane interception

Interception builds lists of planes that could intercept.  Only list
nodes for missiles were freed.  Broken since BSD Empire 1.1.

The fix frees interceptors that actually intercepted when
ac_intercept() returns, and the interceptors that didn't when
ac_encounter() returns.

The latter introduces a small bug: it passes planes that didn't fly to
pln_put().  pln_put() expects only planes that actually took off.
Same bug exists in air defense missions.  Luckily, it has no ill
effects.  To be fixed soon.

14 years agoFix explanation pdump field of laun
Markus Armbruster [Sat, 22 Mar 2008 17:38:29 +0000 (18:38 +0100)]
Fix explanation pdump field of laun

14 years agoMake pupgr() reject planes in orbit early
Markus Armbruster [Sat, 22 Mar 2008 17:25:39 +0000 (18:25 +0100)]
Make pupgr() reject planes in orbit early

It's best to check and report conditions the player can't change
before those he could.

14 years agoFix trade to enforce destination rules for satellites and asats
Markus Armbruster [Sat, 22 Mar 2008 16:41:37 +0000 (17:41 +0100)]
Fix trade to enforce destination rules for satellites and asats

Trade teleports planes to a destination chosen by the buyer, except
for satellites in orbit.  trad() failed to enforce the usual rules on
destinations for satellites (not in orbit) and asat missiles: they
could be teleported anywhere.  Abusable, because abms intercept from
anywhere, and satellites can be launched from unowned sectors, even
sea.  Broken since BSD Empire 1.1.

14 years agoSimplify calls to mpr()
Markus Armbruster [Sat, 22 Mar 2008 10:04:53 +0000 (11:04 +0100)]
Simplify calls to mpr()

mpr() does nothing when its first argument is zero.  No need to avoid
calling it in that case; remove the conditionals.

14 years agoMake mpr()'s behavior on zero first argument more obvious
Markus Armbruster [Sat, 22 Mar 2008 09:07:37 +0000 (10:07 +0100)]
Make mpr()'s behavior on zero first argument more obvious

14 years agoRemove mission_pln_arm()'s argument tech
Markus Armbruster [Fri, 21 Mar 2008 16:05:51 +0000 (17:05 +0100)]
Remove mission_pln_arm()'s argument tech

It always existed, and was never used for anything.

14 years agoRemove leftover test for anti-satellite nuke in detonate()
Markus Armbruster [Fri, 21 Mar 2008 16:03:30 +0000 (17:03 +0100)]
Remove leftover test for anti-satellite nuke in detonate()

These existed in Chainsaw many years ago.

14 years agoFix fillcache() and do_write() error handling
Markus Armbruster [Fri, 21 Mar 2008 08:13:04 +0000 (09:13 +0100)]
Fix fillcache() and do_write() error handling

Fix test for interrupted I/O.  Catch read hitting EOF unexpectedly.
Log errors in more detail.

14 years agoMake empsched less loquacious on unrecognized options
Markus Armbruster [Mon, 17 Mar 2008 18:57:58 +0000 (19:57 +0100)]
Make empsched less loquacious on unrecognized options

14 years agoFix empdump error messages to include program name
Markus Armbruster [Mon, 17 Mar 2008 18:55:42 +0000 (19:55 +0100)]
Fix empdump error messages to include program name

14 years agoChange empdump syntax
Markus Armbruster [Mon, 17 Mar 2008 18:54:08 +0000 (19:54 +0100)]
Change empdump syntax

Require -i for import, and fail when no action is requested.  Also
rename option -t to -n.

14 years agoSilence compiler warning on our getpwuid() for _WIN32
Markus Armbruster [Sun, 16 Mar 2008 11:59:48 +0000 (12:59 +0100)]
Silence compiler warning on our getpwuid() for _WIN32