Two bugs. First, multifire() checks the condition only for surface
ships, not for submarines. Second, multifire() neglects to write back
the ship after retreating it. The player is told the ship retreats,
but it actually stays where it is.
Broken since retreat was added in Chainsaw. Previous fixes (commit
8065fe8, v4.3.1 and commit de2651e, v4.3.19) "fixed" only the
bulletin.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
It's not firing, yet.
While there, trim an unwanted blank line before reporting the first
sector ready.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Can't actually happen with the current damage formulas. If it could,
then the special treatment would be inconsistent with sectors and land
units.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
We check all necessary conditions for being able to fire before
prompting for a target. Except for land unit guns. Clean that up.
fort_fire(), shp_fire() or lnd_fire() fail only when the fort, ship or
land unit can't fire. If that happens, our checking is incomplete.
Oops then.
We recheck some of the necessary conditions after getting the target.
However, because the command fails when the firing sector, ship or
land unit has changed since the first check, these rechecks can't
fail. Drop them.
Note that the rechecks were just as useless before commit 66165f3
fixed fire to fail on change, because they rechecked the unchanged
cached copy instead of the possibly changed original.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Adding or removing a command to/from a test has unfortunate effects:
* Before the previous commit: if the command consumes pseudorandom
numbers, all subsequent users of pseudorandom numbers get different
ones. This has always been a major headache.
* Since the previous commit: all subsequent users of pseudorandom
numbers get different ones whether the command consumes any or not.
That's even worse.
* If the command uses BTUs, subsequent prompts are changed. Not
nearly as bad as the above, but still annoying.
Create a new command __cmd to allow compensating for adding/removing
commands for tests. Throw in the ability to compensate treasury
changes for good measure. Three arguments: command count, BTU use,
money use.
Usage example: say you add a convert command to a test, and it uses 3
BTUs and $15. Then you compensate by adding "__cmd added 1 3 15"
right after it.
The command must not be available unless running_test_suite is on, of
course. Make it require the new player command capability TESTING,
and give that to all players when running_test_suite is on.
The command is intentionally not documented in info. Switch
running_test_suite off for info-test, to hide it (and any future
TESTING commands) from info-test.
Suppress the command counter increment for TESTING commands, so they
can be used without upsetting pseudorandom numbers
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Normally, git's pre-commit hook protects us from them. However, when
expected test output contains trailing white space, we have to bypass
commit hooks. Unwanted space can then slip in if you don't pay
attention. I obviously didn't; clean up.
The previous commit should reduce the need for such hook suppression.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Units owned by POGO are not in use. Giving a unit to POGO destroys
it. The opposite doesn't work, however: the unit prewrite hooks give
it right back to POGO, because efficiency is below the minimum. Make
it work by also increasing efficiency to minimum.
Note that you can't use this to create a unit that doesn't already
exist in the respective file. That's because edit's second argument
selects from existing objects only.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
print_plane() ends its output with '\t' instead of '\n'. Next is a
prompt, which supplies the missing newline (see pr_id()).
Ugly, clean up.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Accept general <SECTS|SHIPS|PLANES|LANDS|NATS> argument instead of
just <SECT|SHIP|PLANE|LAND|NAT>.
edit with <KEY> <VALUE>... arguments applies the arguments to all
selected objects. Without such arguments, edit lets you edit the
selected objects interactively one after the other.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Unlike other edits, editing a country modifies the object in-place.
It has to, because editing may send bulletins, which updates nat_tgms,
and writing back a copy would clobber these updates, triggering a
seqno mismatch oops.
However, the in-place editing neglects to detect concurrent updates.
Fix that.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Interactive edit prints the edited object, then reads player input.
If it gets key and value, it applies them to the object, and repeats.
If it gets nothing, it prints the edited object again, and stops.
Remove this last print, because it's not really useful. The object is
commonly the same after reading input as before. Except when a nation
gets updated while "edit c" is waiting for input: then the second
print actually reflects the updates. Has always been that way.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Print a message describing the actual change for keys 't' (nat_tgms)
and 's' (nat_status). The message is necessary to give the deity a
chance to catch unexpected changes, e.g. a player reading telegrams
just before the deity edits nat_tgms.
Send a bulletin to the country for key 's'.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Print "FOO of CNAME (#CNUM)" instead of just "FOO". Print "unchanged"
instead of "changed from X to X" on no-op.
Send a bulletin to the country and report news when appropriate.
Affected keys:
key struct member before after notes
-------------------------------------------
n nat_cnam -- BN 1
r nat_pnam -- B- 2
b nat_btu -- BN 3
m nat_reserve BN BN
c nat_xcap,ycap -- B-
o nat_xorg,yorg -- B-
u nat_timeused -- BN
M nat_money B- BN
Notes:
1. Reports N_NAME_CHNG rather than N_AIDS/N_HURTS.
2. Message improved to accurately reflect string truncation.
3. Greengrocers' apostrophe in message fixed.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Print "Technology" instead of "Tech". Print "FOO of CNAME (#CNUM)"
instead of just "FOO". Print "unchanged" instead of "changed from X
to X" on no-op.
Send a bulletin to the unit owner and report news on change.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Print a message (always), send a bulletin to the unit owner and report
news (sometimes).
The message is necessary to give the deity a chance to catch
unexpected changes, e.g. a player spending mobility right before the
deity edits it. Watching out for such changes is especially important
with non-interactive edit.
Affected keys:
cmd key struct member action
----------------------------------
edit s L shp_x,y B-
E shp_effic BN
M shp_mobil BN
F shp_fleet B-
T shp_tech BN
a shp_pstage --
b shp_ptime --
R shp_rpath B-
edit p l pln_x,y B-
e pln_effic BN
m pln_mobil BN
w pln_wing B-
t pln_tech BN
r pln_range B-
edit u L lnd_x,y B-
e lnd_effic BN
M lnd_mobil BN
a lnd_army B-
t lnd_tech BN
F lnd_harden BN
Z lnd_retreat B-
R lnd_rpath B-
The two characters in column action show whether the command sends a
bulletin (B) or not (-), and whether it reports news (N) or not (-).
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Print a message, send bulletin to owner. Affects ship key 'W', land
unit key 'W', and plane key 'f'. The message is necessary to give the
deity a chance to catch unexpected changes, e.g. a player modifying
retreat conditions right before the deity edits them. Watching out
for such changes is especially important with non-interactive edit.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
They really need to stay with their carrier. Else, cargo gets
silently teleported to its carrier when the carrier moves.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Print a message, send bulletin to owner. Affects plane keys 's', 'y',
and land unit keys 'S', 'Y'. The message is necessary to give the
deity a chance to catch unexpected changes, e.g. a player loading a
plane right before the deity edits it. Watching out for such changes
is especially important with non-interactive edit.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Send bulletin to owner and report news exactly like for key 'O' or
sector key 'L'.
Print a "duplicated" message, just for consistency with other keys.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Two failure modes:
* When the argument is negative, edit() attempts an invalid write,
triggering an oops. edit() detects the write failure, and returns
RET_FAIL.
Detect the negative argument instead, and return RET_SYN, like we do
for other invalid edit arguments.
* When the argument requires the table to be extended, but the
extension fails, edit() returns RET_FAIL.
Additionally report the failure to the player.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Print a message describing the actual change. Necessary to give the
deity a chance to catch unexpected changes, e.g. a player boarding a
ship right before the deity edits it. Watching out for such changes
is especially important with non-interactive edit.
Code already sends bulletins. Also report news.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Print a message describing the actual change. Necessary to give the
deity a chance to catch unexpected changes, e.g. a player unloading
stuff right before the deity edits it, leaving fewer items than the
deity intends to take. Watching out for such changes is especially
important with non-interactive edit.
Send bulletin to owner and report news exactly like the give command.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Print "unchanged" instead of "changed from X to X". Affects edit,
setresource, setsector. Suppress bulletin and news. Affects only
edit sector key 'L'.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Most places use "FOO of X,Y changed", some use "FOO in X,Y changed",
"FOO in X,Y was changed", "FOO of sector X,Y changed". Normalize to
the former.
Most places do not end the message with a period, some do. Normalize
to no period.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Key 'L' copies the source sector to a destination sector. Bug: it
doesn't copy, it messes up the source sector badly instead, and can
smash the stack on some machines.
Root cause: doland() passes § instead of sect to ef_set_uid().
Impact:
1. ef_setuid() clobbers a few bytes at §.
When the bitfield and uid fit into sizeof(sect) bytes, it clobbers
just sect, which has no effect, because doland() returns without
using it again. This is the case on a typical 64-bit machine: bit
field and uid are both 4 bytes, sizeof(sect) is 8.
When they don't fit, whatever is adjacent to sect gets clobbered.
On a typical 32-bit machine with stack growing down, that's p.
Again, no effect, because doland() returns without using it again.
With stack growing up, it could well be the return address,
crashing the server.
2. ef_setuid() fails to update *sect. Impact (when we survive 1):
sect->sct_uid remains unchanged. putsect() writes to the source
sector instead of the destination sector, clobbering the source's
sct_x, sct_y. Breaks invariant sctoff(sct_x, sct_y) == sct_uid!
Subsequent edits are all applied to the source sector.
sect->sct_seqno remains unchanged. No effect, because we write to
the source sector, and the unchanged sequence number is the right
one there.
Broken in commit 536ef0b0, v4.3.15.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
