Commit graph

4542 commits

Author SHA1 Message Date
bb467c335d Update copyright notice
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:48 +01:00
b4c8a2238c Update known contributors comments
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:48 +01:00
1325bc179b start stop: Don't operate on dead units when used by a deity
Screwed up when start, stop were extended to units in commit eb1512d,
v4.3.6.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:48 +01:00
216470a8d5 edit: Implement edit nuke
Has been "not implemented yet" since the dawn of time.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:48 +01:00
b68b3c4589 edit: Suppress bulletin on no-op unit location change
Screwed up in commit a03d804f, v4.3.32.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:48 +01:00
5dd2cbd423 stockpile: New command, counterpart of fleetadd, wingadd, army
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:48 +01:00
76b5de8343 nukes: Enable group syntax for <NUKES> arguments
Not interesting without way to make stockpiles.  That's next.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:48 +01:00
329da055dd nukes: New selector stockpile
Not interesting without way to make stockpiles.  Coming soon.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:47 +01:00
cf1c2e9f3c start stop: Add missing <NUKES> to usage string
Forgotten in commit eb1512d, v4.3.6.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:47 +01:00
1042d08b94 ndump nuke: Fix usage string: <NUKES> instead of <SECTS>
nuke's usage string was broken in Empire 2.  ndump's usage string has
always been wrong.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:47 +01:00
e010fa5f2f info/ndump: Belatedly update for v4.3.3's nuke storage change
Commit 2e40a4b (v4.3.3) changed ndump, but not its info page.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:47 +01:00
e616af34e3 wingadd: Charge no BTUs, for consistency with fleetadd and army
Chainsaw 3 made fleetadd and army cost no BTUs, but wingadd was
forgotten.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:47 +01:00
6b0b6f174b edit: Add editing of ship, plane and land unit type
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:47 +01:00
3be53fddb3 edit: Factor edit_item() out of edit_ship(), edit_land()
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:33:37 +01:00
2936e07f41 edit: Make unit owner change away from POGO work
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>
2014-01-02 14:07:22 +01:00
3404b9ce7f tests: Factor out begin_tests(), end_tests()
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:07:22 +01:00
5de1e5ec5f tests: Drop smoke.out, actofgod.out
Uninteresting since commit 9ca3fa9, v4.3.32.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:07:22 +01:00
78d28c90ad uninstall: Fix to remove everything installed under $(datadir)
Info pages in $(datadir)/empire/info.html/ and the directory
$(datadir)/empire/ aren't removed.  Fix that.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:07:22 +01:00
e1273ae4ca install: Remove stale formatted info pages
Blow away $(einfodir) and $(ehtmldir).  Without this, formatted pages
can linger after page removal.  Matters, because info.c searches
$(einfodir) rather than the index $(einfodir)/all.  Same for web
servers and $(ehtmldir).

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2014-01-02 14:07:10 +01:00
ee1f146dd8 Update change log again for 4.3.32
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-08-25 09:56:58 +02:00
4f6a3c9aae actofgod: Simplify fmtflags()'s error checking
Permit finding length by passing no buffer.  Not currently used.

Oops at most once.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-08-25 09:51:39 +02:00
1a27107bed server: Grow small thread stacks from 50 KiB to 64 KiB
Affected are threads AcceptPlayers, MarketUpdate, shutdownSeq.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-08-17 17:57:40 +02:00
8330b6f322 lwp: Increase EventHandler's stack size from 16 KiB to 64 KiB
Stack overflow observed on IBM Power 730 Express running AIX 7.1.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-08-17 17:57:37 +02:00
41c8033346 src/client/Makefile.in: Avoid :=, it breaks traditional make
Broken in commit c4ffd0a, v4.3.0.  Observed on AIX 7.1.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-08-17 17:57:37 +02:00
26a03abfd8 configure: Fix check for term.h to include curses.h first
Traditional curses needs this.  Observed on AIX 7.1.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-08-17 17:57:37 +02:00
3cc23a3cd4 Update change log for 4.3.32
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-08-17 17:57:37 +02:00
122cb5fc3b accept: Drop outdated FIXME SO_KEEPALIVE
SO_KEEPALIVE isn't useless with long idle timeouts.  Before v4.3.30's
idle timeout changes, such long timeouts had serious drawbacks (easy
denial of service), but they're just fine since then.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-08-17 17:57:37 +02:00
682a035b7c doc/clients-howto: Document use of bell character
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-08-17 17:57:36 +02:00
1621522c1c supply: Fix harmless bug in supply from ship in same sector
Bug bites when a ship supplies the sector it's in.  First the sector
is charged zero mob for moving the stuff, and is written back.  Next,
the sector receives the stuff, and is written back, clobbering the
first write (no effect), and triggering a seqno oops.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-08-17 17:57:23 +02:00
7d78c586c6 fairland: Fix usage information to include -v
Forgotten in commit 68a7ae7, v4.3.0.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-09 17:20:37 +02:00
2a6b6c941a fairland.6: Belatedly drop reference to ore
Missed in commit e3eadcd8, v4.2.14.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-09 17:04:00 +02:00
60ffa63779 doc/xdump: Fix grammar nit
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-09 17:03:59 +02:00
d743a38257 tests/actofgod: Disable in "make check" unless LWP
Expected to work only with thread package LWP, just like the smoke
test.  Commit 7a91041 carelessly enabled it for all thread packages.
Revert, except with LWP.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-09 16:58:08 +02:00
005ba942d0 build: Factor out pick_unused_unit_uid()
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-08 13:36:57 +02:00
827e2e4cc0 edit: Trim trailing tab in output
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>
2013-06-08 13:36:57 +02:00
fbaaed0322 info/edit info/give: Add see also swapsector
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-08 13:36:57 +02:00
4c68d14cc0 break: Honor new designation of sanctuaries
Breaking sanctuary turns 100% sanctuaries into capitals, all others
into highways.  Before Empire 3, sanctuaries always became capitals.

Give deities more control over initial state of countries than
choosing between 100% capital and <100% highway sectors: turn
sanctuaries into their new designation on break.  Except make a
capital when the new designation is sanctuary (which it normally is).

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-08 13:36:32 +02:00
5900e9b279 setsector setresource: Mark as obsolete
"info setsector" claims you "can change anything that appears in dump
or peek (I think)", which has always been wrong.

edit is much more complete.  However, edit used to be more limited in
that it could change only one sector.  For mass-changes, you had to
use setsector and setresource.  Since that limitation is gone, there's
no real use left for setsector and setresource.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-06 19:59:30 +02:00
f3cb215e1f edit: Generalize edit to multiple objects
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>
2013-06-06 19:59:18 +02:00
4d99e1df37 edit: De-duplicate code in edit()'s main switch
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-06 19:55:03 +02:00
0faceac070 edit: Detect concurrent updates during interactive nation edit
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>
2013-06-06 19:55:03 +02:00
9eec1a57e7 edit: Move write-back from edit_nat() to edit(), check for errors
This is how edit() works for everything else.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-06 19:55:03 +02:00
2b4eaca8b1 edit: Clean up a few assignments within conditionals
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-06 19:55:03 +02:00
859627c416 edit: Make uninmplemented edit n fail instead of doing nothing
Doing nothing is in the way.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-06 19:55:03 +02:00
a48b24ff33 edit: Use empobj_storage
In preparation of some refactoring.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-06 19:55:03 +02:00
f2bf352e66 edit: Don't reprint edited object when done with it
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>
2013-06-06 19:55:02 +02:00
2975ea02ae edit: Add remaining missing nation change reporting
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>
2013-06-06 19:55:02 +02:00
d006791ed6 edit: Improve remaining existing nation change reporting
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>
2013-06-06 19:55:02 +02:00
93aa604b67 edit: Improve tech, research, edu, happiness change reporting
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>
2013-06-06 19:55:02 +02:00
e6c1476c2f actofgod: New divine_nat_change(), similar to divine_sct_change()
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
2013-06-06 19:55:02 +02:00