Commit graph

3834 commits

Author SHA1 Message Date
6de86720b2 Fix fly and drop to report discarded cargo items correctly
When d of n cargo items are discarded for want of space, pln_dropoff()
reported -d items discarded and -d items unloaded.  Already broken in
BSD Empire 1.1.
2010-05-09 09:08:03 +02:00
464094a693 Change how client option -s interprets ':'
Old version recognizes the first ':', which prevents use of ':' in
host names.  They are used in numerical IPv6 addresses.  New version
recognizes the last ':', which prevents use of ':' in service names.

Old version treats empty host or port specially (use default).
Documentation suggests ':' is required, but the code doesn't do that.
Instead, the argument is interpreted as host, even when it's empty.

New version makes the HOST: part optional.  You can't specify host and
default the port.  Tough.  Keeps documentation and code as simple as
possible.

Compare:

                old version             new version
    argument    host    port            host    port
    ""          ""      default         default ""
    "A"         "A"     default         default "A"
    ":"         default default         ""      ""
    "A:"        "A"     default         "A"     ""
    ":B"        default "B"             ""      "B"
    "A:B"       "A"     "B"             "A"     "B"
2010-05-09 09:08:01 +02:00
Tom Dickson-Hunt
f4fe7da1fb New client option -s to specify server host and port
Overrides EMPIREHOST and EMPIREPORT.
2010-05-09 09:07:01 +02:00
7506039f1b Fix test for capability engineer in lnd_hit_mine()
Bogus array index, unpredictable result, can crash the server.  Broken
in commit ef7ea893, v4.3.24.
2010-04-07 23:35:25 +02:00
72b31dae13 Fix retreat, lretreat condition 'c'
Broken in commit bb5dfd80, v4.3.16.
2010-04-04 09:24:33 +02:00
5f08a3c04a Give deltax(), deltay() internal linkage
External linkage unnecessary since commit 3ca88271.
2010-04-04 09:23:48 +02:00
5e08b7fa55 coastwatch and skywatch could see too far
Both coas() and skyw() want to iterate over a circular area with
radius vrange.  They did that by iterating over a rectangle that
encloses the circle, skipping coordinates out of range.  To "save
time", they used a rather odd predicate for "out of range", namely
"vrange * vrange < (j * j + 3 * k * k) / 4)".

The predicate is wrong.  coastwatch and skywatch could see one sector
too far in certain directions for practical radar ranges, and up to
two sectors for not so practical tech 1900+ radar stations.

For instance, with j = 13 and k = 3, vrange = 7, the predicate
evaluates to false (49 < 48), i.e. in range.  However, the true
distance is 8, i.e. out of range.  Likewise, j = 22, k = 8, vrange =
13: 169 < 169, true distance 15.

Fix by iterating over the circle directly, without comparing
distances.
2010-04-04 07:31:06 +02:00
38befcb446 Make skywatch report satellite uid
The uid is required for launching a-sats since commit 1ee02875,
v4.3.23.

Change output to resemble coastwatch's.
2010-04-02 20:35:57 +02:00
e99ba304a5 Fix info Innards on workforce
Has always been wrong.
2010-04-02 19:39:37 +02:00
162435e690 Clean up checks for zero value of pln_damage()
Before commit a269cdd7, pln_damage() returned zero when the damage was
nuclear, and callers used that to bypass conventional damage code.
Zero value can't happen anymore.
2010-04-02 19:08:27 +02:00
3cceb59bb1 Fix client's command abort feature
The server aborts the current command when it receives a special line
of input for a prompt.  To make the client send it, you type the INTR
character (normally ^C).  This sends the client the SIGINT signal.
Unfortunately, it never quite worked.

Because we use a special line of input to signal interrupt, the client
can do that only after a complete line of input.

What if SIGINT arrives in the middle of a line?  We split the line in
two then and there, by inserting a newline.  Nasty, but it's simple,
and happens rarely.

However, we inserted the newline always, even after a complete line.
In that case, we inserted an empty line of input before the interrupt.
If you hit INTR at a server prompt, the server received an empty line
of input for that prompt, and the interrupt only for the *next*
prompt.  Which may well be too late to abort the command you wanted to
abort.

Fix by inserting the newline only when needed.
2010-04-02 18:22:52 +02:00
6c639f1481 Fix sabo not to kill the spy every time
The hack to protect the spy from sabotage damage killed it outright.
Broken in 861a6662, v4.3.17.
2010-03-29 17:39:07 +02:00
6e9dd173dd Document empire options -h and -v in manual page
Was forgotten in commit 46c0410e, v4.3.11.  Reported by Tom
Dickson-Hunt.
2010-03-27 13:16:18 +01:00
625022e1df Contract empire options in manual page synopsis 2010-03-27 13:04:27 +01:00
a3f2829358 Sort empdump options in manual page synopsis 2010-03-27 13:02:22 +01:00
aad6855094 Bump version to 4.3.26 2010-03-27 12:49:08 +01:00
0e2d533e39 Update change log again for 4.3.25 2010-03-21 09:28:23 +01:00
054eba7a1d Fix test for capability sweep in shp_hit_mine()
Bogus array index, unpredictable result, can crash the server.  Broken
in commit ef7ea893, v4.3.24.
2010-03-21 09:26:37 +01:00
83c4d37ade Update change log again for 4.3.25 2010-03-20 18:54:10 +01:00
ce51816d00 Comment fix 2010-03-20 18:46:02 +01:00
1d4fea32b8 Fix interdiction not to wipe out target ship updates
Ships can expend shells to defend against missiles, in
shp_missile_defense().  Any shell use by the target ship got wiped out
when shp_missile_interdiction() wrote back the target ship, triggering
a seqno mismatch oops.

Ships get updated when they launch planes to intercept interdicting
planes, in mission_pln_equip().  Any petrol use by the target ship got
wiped out when shp_mission_interdiction() wrote back the target ship,
triggering a seqno mismatch oops.

Fix by re-reading the target ship in shp_damage_one().  This also
affects shp_fort_interdiction(), where it is not necessary.  A bit
inefficient, but let's keep this fix simple.
2010-03-20 18:44:45 +01:00
28cc236e12 Fix navigate and march not to lay mines free of charge
do_unit_move() reads the ships into a list.  It re-reads them when it
prompts for sub-commands.  shp_nav_one_sector() writes them back when
it moves ships.

Mine-laying (sub-command 'd') updates the minelayer, invalidating the
copy in the list.  Any movement sub-command before the next prompt for
sub-commands wiped out this update, triggering a seno mismatch oops.

Happens only if 'd' is used without arguments, because remaining
sub-commands are discarded when there are arguments.

Broken when mine-laying was added in commits 2438fe7c, v4.3.7.

Same for march, commit 274c8e42, v4.3.7.

Fix by stopping after 'd' regardless of arguments.
2010-03-20 14:57:05 +01:00
45106ab91f Fix navigate and march not to prompt for number of mines to lay
When sub-command 'd' was used without arguments, do_unit_move() failed
to supply the second argument to mine(), which duly prompted for it.
This contracticted info, and could trigger a generation oops.

do_unit_move() reads the ships into a list.  It re-reads them when it
prompts for sub-commands.  shp_nav_one_sector() writes them back when
it moves ships.

The mine prompt made the list stale.  Movement sub-commands before the
next prompt for sub-commands wrote back stale ships, triggering a
generation oops.  Example: "nav 15 dg".

Broken when mine-laying was added in commits 2438fe7c, v4.3.7.

Same for march, commit 274c8e42, v4.3.7.
2010-03-20 14:24:25 +01:00
fea24d10da Update change log for 4.3.25 2010-03-16 21:42:10 +01:00
876f3424b0 Nuclear-tipped missile exploding on launch could not damage base
Commit a269cdd7 (v4.3.23) removed the nuclear damage.  But it left the
nuke on the missile, which made pln_damage() oops and return zero
damage.

Fix by destroying the nuke separately.
2010-03-16 21:28:08 +01:00
3a9d27186c Don't print Blam-blam when missile explodes on launch 2010-03-16 21:28:07 +01:00
bb5abd95e0 Fix news for torpedo attack's return torpedo
When a torpedo attack triggered a return torpedo, the news reported it
to be fired by the attacker instead of the defender.
2010-03-16 21:27:41 +01:00
2dd97dbd00 Interdiction attacked submarines with surface-only weapons
shp_mission_interdiction() used MI_INTERDICT instead of MI_SINTERDICT.
Broken in commit cd8fe31e, v4.3.24.
2010-03-10 09:41:10 +01:00
8bdb5c5c1b Fix unsafe use of shared buffers in commands drawing maps
Maps are generally drawn into static scratch buffers.  Each command
has its own buffers.

Static scratch buffers are safe as long as they're never used across
yields.  Player output can yield unless the command has flag C_MOD
set.  Commands lradar, path, radar, route, satellite, sect, survey
hadn't.  If such a command yields while using scratch buffers, another
instance of the command can clobber them.

Abuse seems tricky, but possible: if a malicious player stalls output
just right, a command yields while printing a map from the scratch
buffer.  It resumes only when the malicious player reads some output.
If another player runs the same command before that, it overwrites the
same static scratch buffer with its map.  The malicious player
receives the last such run's map.

4.2.8 fixed the same bug for bmap, lbmap, lmap, map, nmap, pbmap,
pmap, sbmap and smap.

All were broken in 4.2.0.  Except radar maps (lradar and radar) were
already broken in Empire 2 for AIX.
2010-03-10 09:41:10 +01:00
a38c47a22c Generation numbers didn't catch all potential yields on output
io_output_if_queue_long() called ef_make_stale() only for long queues.
Missed in commit 2fa5f652, v4.3.24.
2010-03-10 09:40:48 +01:00
2b4e97730d files could clobber the game when reading confirmation fails
fgets() fails on read error or EOF.  When it fails, it doesn't touch
the buffer.  Since files didn't check its return value, it read an
uninitialized character from the buffer.  If that happened to be 'y'
or 'Y', it happily clobbered the game.
2010-03-10 09:38:03 +01:00
f9d6149db3 Update link to `Recursive Make Considered Harmful' 2010-02-13 21:04:01 +01:00
e93cc9934e Less verbose make output
Many commands, compiler invocations in particular, are rather long,
and warnings tend to get lost in the noise.  Suppress the command
details.  Run make with a V=1 parameter for full output.
2010-02-13 18:48:31 +01:00
de81e4e20a Change fairland not to reject small worlds without trying
Instead, print a warning and try.  It may well work, and when it
doesn't, it fails cleanly.
2010-02-06 21:36:21 +01:00
2ba833efe2 Clean up commented out code left behind by commit eea24fb0 2010-02-06 21:28:39 +01:00
b55c56afaf Bump version to 4.3.25 2010-02-06 21:27:17 +01:00
52acb4fb3c Update change log again for 4.3.24 2010-01-26 22:30:24 +01:00
2b14f876be Fix generation numbers for order command
orde() uses a "clever" trick to get away with just one
check_ship_ok(): it makes a copy of the ship in the beginning, and
checks it at the end.  Generation numbers (commit 2fa5f652) break this
trick.  It could be fixed by manually marking the ship fresh.
Instead, check the ship the stupid, straightforward way, without a
copy.
2010-01-26 22:20:16 +01:00
b54bc83e26 Normalize order's reaction to bad input
Consistently fail the command on bad or missing argument.  Before, it
merely skipped to the next ship in some cases.
2010-01-26 22:02:34 +01:00
7ac10453a2 Get third argument of "order l" the ordinary way
Now prompts when the argument is empty.  Before, that was interpreted
as zero.  Not likely to affect players.
2010-01-26 21:48:54 +01:00
ae6ad76516 Clean up dead code in orde()
Does not change optimized code (gcc -O) apart from __LINE__.
2010-01-26 21:38:31 +01:00
Ron Koenderink
eea24fb017 Fix windows client not always exiting
The call to WSAEnumNetworkEvents() was reseting network
events in particular WSAECONNRESET was sometimes being lost
causing the client to not exit.  The WSAEnumNetworkEvents()
was called from fd_is_socket() and has been replace with
getsockopt() to determine if the fd is socket or not.

Broken in commit 4d40a275, v4.3.23
2010-01-24 20:45:51 -06:00
0e3bf4c38a Update change log for 4.3.24 2010-01-19 08:40:43 +01:00
b8f5eaff0b Clean up dead stores
Does not change optimized code (gcc -O).

Spotted by the Clang Static Analyzer.
2010-01-19 08:40:42 +01:00
3650587dab Fix navigate/march crash on funny path arguments
For an argument consisting of a valid path plus whitespace,
do_unit_move() eventually passed the whitespace suffix to parse(),
then dereferenced player->argp[0].  But that was null.

Broken in commit 0c12d837, v4.3.7.  Trivial for players to trigger.
2010-01-19 08:40:42 +01:00
6c8ba9c3fd Fix player_login() not to print null pointer
When the input line contains only whitespace, player->argp[0] is null
after parse().  This condition was not checked, comtch() returned
M_IGNORE, and code handling that printed the null pointer.  Some
systems (GNU, Windows) deal gracefully with printing null strings,
others crash.  Trivial to trigger remotely.

Before the fix, the value of parse() was assigned, but never used, and
that was spotted by the Clang Static Analyzer.
2010-01-19 08:40:42 +01:00
8195d5fb88 Clean up useless getnatp() in conv(), nav_map(), tele()
Spotted by the Clang Static Analyzer.
2010-01-19 08:40:42 +01:00
8ededa44f9 Move -h to the end of the emp_server -h output
This is consistent with the other programs.
2010-01-19 08:40:42 +01:00
390841a40a Make empire, empsched and files catch extra operands
This also avoids a dead increment ap++ in src/client/main.c reported
by the Clang Static Analyzer.
2010-01-19 08:40:42 +01:00
fe0ef18e2b Make empire and files not print usage on bad option
Point to -h instead.  This is consistent with the other programs.
2010-01-19 08:40:42 +01:00