Commit graph

2783 commits

Author SHA1 Message Date
4bb23dd1a6 Make econfig keys data and info work for relative names
File names in econfig need to be interpreted relative to configdir.
This wasn't the case everywhere for keys data and info.

Fix this by changing variables gamedir and infodir to hold absolute
names.  Change builtindir likewise, for consistency.  Store the values
from econfig in gamedir_conf, infodir_conf and builtindir_conf.

Uses new fnameat() to derive absolute names from possibly relative
ones.
2008-02-07 08:01:54 +01:00
7379041d26 Fix title and section header in manual pages
Commit 530deef2 failed to update .TH of fairland(6), files(6) and
pconfig(6).

Commit 530deef2 failed to update .TH of empire(6).

Commit eeb9d3cb created empsched(6) with the wrong .TH.
2008-02-07 08:01:54 +01:00
a38fad4229 Make utility programs abort on internal error
Until now, they tried to recover and continue (debug off).  That's
appropriate only for the server.  The server could be told to abort
instead (debug on, selected by option -d), but not the utility
programs.

Change debug to be on by default, and switch it off early in the
server's main().  No functional change for the server.
2008-02-07 08:01:53 +01:00
a573f44960 Fix unintentionally broad patterns in .gitignore
The patterns intended to match exactly weren't anchored.  In
particular, pattern lib make anything below src/lib/ invisible.
Anchor them all.
2008-02-07 08:01:53 +01:00
Ron Koenderink
70c03561bb Switch nightlybuilds to git
Create a local git repository on the SuSE nightly build machine.
Update local git repository from the Markus's public repository
at the beginnning of the nightlybuilds for SuSE and WIN32.
For the SuSE and WIN32 nightlybuilds drawn from the local
git repository on SuSE machine.
2008-02-04 20:26:46 -06:00
77e95bd788 Clean up library dependencies
Move stuff to untangle the ugly cyclic dependencies between the
archives built for selected subdirectories of src/lib/:

* Move common/io.c to empthread/ because it requires empthread stuff

* Move parts of subs/nstr.c to common/nstreval.c to satisfy
  common/ef_verify.o

* Move getstarg.c getstring.c onearg.c from gen/ to subs/ because they
  require stuff from there

* Move bridgefall.c check.c damage.c empobj.c journal.c maps.c
  sectdamage.c from common/ to subs/ because they require stuff from
  there

* Move cnumb.c from subs/ to common/ to satisfy common/type.o

* Move log.c fsize.c from common/ to gen/ because they really belong
  there

* Move emp_config.c mapdist.c from gen/ to common/ because they really
  belong there, and require stuff from libglobal.a

Also package as/ as libas.a to satisfy common/path.o.

Remaining dependencies:

    lib             needs
    --------------------------------------------
    libas.a         libglobal.a
    libcommon.a     libas.a libglobal.a libgen.a
    libgen.a
    libglobal.a
    liblwp.a        libgen.a
    libw32.a[*]     libgen.a

    [*] Except for service.o, which can only be linked into the server

Link order now: liblwp.a libcommon.a libas.a libgen.a libglobal.a
libw32.a.  The position of libw32.a is not quite right, but works
anyway.
2008-02-03 08:11:13 +01:00
1cbb37d4fb Get rid of src/lib/gen/copy.c
The function that gave its name to this file is long gone, the file's
description is bogus, and it contains just one definition.  Move that
to ../subs/border.c, and delete the file.
2008-02-03 07:44:20 +01:00
3d2518a724 Get rid of src/lib/common/land.c
There are several files with land unit subroutines.  This one is in an
awkward place: it depends on stuff from ../subs, which contributes to
libcommon.a's ugly dependencies.  Move its contents to logical places
(use internal linkage where possible), and remove it.
2008-02-03 07:37:16 +01:00
312e6d4c5b Document econfig key info setting for running without installing 2008-02-02 16:15:40 +01:00
b58bc70d07 Remove telfil, use teldir instead. 2008-02-02 09:22:10 +01:00
f80af5c7da Belatedly update c_form of of show command
It lacked item and news since 4.3.0.
2008-02-02 07:56:49 +01:00
b8a9136242 Trim extra newline from documentation of econfig key update_demand 2008-02-02 07:53:19 +01:00
4fb5f76326 Remove unused non-terminal <VAR> from output of list command
It's been unused since commit 5dec30d6, and its explanation was bogus
before.
2008-02-02 07:50:26 +01:00
Ron Koenderink
eb473a6a24 Add missing expansion island
The number of islands was off by one.  The last island was
created, but not actually placed on the map.
2008-01-27 14:20:51 +01:00
36044a0534 Fix empsched's name in its manual page 2008-01-19 10:32:02 +01:00
db02dda32f Update copyright notice 2008-01-19 10:15:37 +01:00
c297edfb0f Remove bogus comment 2008-01-19 09:00:32 +01:00
d1ebdec5a9 Note generator script in output 2008-01-17 22:12:55 +01:00
853b29dd43 Fix bogus file names in error messages 2008-01-13 11:25:32 +01:00
bcdcbab19c Replace .cvsignore files by .gitignore files 2008-01-13 11:22:33 +01:00
35db407da0 Convert the build process from CVS to git
Detect .git instead of CVS.  Use git-ls-files with git, else
$(srcdir)/sources.mk.  info/findsubj.pl now gets the info files as
arguments rather than from sources.mk.

Remaking info subjects doesn't quite work, but it was broken similarly
before.
2008-01-13 11:17:26 +01:00
544612ed8c 4.3.11 late changes. 2008-01-01 19:22:59 +00:00
e424baab8b (player_coms): Clean up c_form of announce, break, bye and list. 2008-01-01 19:09:38 +00:00
Ron Koenderink
353cb3209b Add HTML links.
Improve description for Autotrading.
2008-01-01 16:26:58 +00:00
Ron Koenderink
20a8cceb0e Add HTML link for info pages. 2008-01-01 16:22:41 +00:00
Ron Koenderink
28d61ca2f2 Rename Autofeed to be Autofish and add information on doing automatic
off-shore drilling like automatic fishing.  Fix the formatting to be
more consistent with other info pages.

Add see also reference for Autofish to Autonav.
2008-01-01 15:20:08 +00:00
Ron Koenderink
dabee52bc9 Remove quit as it sometimes confuses the client.
Known problem with 4.3.11, depend on the EOF.
2007-12-25 17:26:50 +00:00
Ron Koenderink
d4227f9ff8 Remove the symbolic link to empire and use the empire executable
directly.  Symbolic link fails for WIN32 empire because empire has
exe extension.
2007-12-23 22:16:37 +00:00
Ron Koenderink
84399281fe Scheduled task script file for win32 nightly build 2007-12-23 16:08:34 +00:00
Ron Koenderink
6872002d66 Configuration file for win32 nightly build 2007-12-23 16:06:59 +00:00
ff4ada21b9 (sect_ca): New selector elev. It's set by fairland, but has no effect
on the game.  It can be useful for deities to customize a world
created by fairland.
2007-12-22 08:11:21 +00:00
91505ef798 Clarify -2.
Warn about passwords on the command line.
2007-12-22 08:07:55 +00:00
13a465edca Fix the previous revision. 2007-12-22 07:57:07 +00:00
Ron Koenderink
9988c79cb6 Add sysdep_w32.o to the list of objects for the client.
Used for WIN32 clients.
2007-12-18 02:42:15 +00:00
Ron Koenderink
402e6a1cf7 (w32_socket) [_WIN32]: Correct the return type to SOCKET
for the select() call.
2007-12-17 13:18:19 +00:00
Ron Koenderink
c55abd60bd (w32_socket) [_WIN32]: Change result to be unsigned to
match the WIN32 return value from socket().
2007-12-16 21:31:51 +00:00
Ron Koenderink
81d87bae17 Move the patch level to above the empserver level. 2007-12-16 20:14:31 +00:00
Ron Koenderink
d1e3e9ddfc Add mingw specific patch for nightly build for win32.i386. 2007-12-16 15:45:09 +00:00
Ron Koenderink
97de159045 (sysdep_stdin_init) [_WIN32]: Add missing void for the parameter list. 2007-12-16 04:02:16 +00:00
Ron Koenderink
e2f795044f (w32_openfd) [_WIN32]: Correct extern reference. 2007-12-16 04:00:19 +00:00
846212197a Update for 4.3.11. 2007-12-15 07:18:40 +00:00
0f4b95caa8 Update for current code. Fix description of login commands option
and play.  Document protocol's C_EXECUTE flaws.  Clarify extent of
redirections.  Spelling fixes and such.
2007-12-15 07:10:53 +00:00
c87f824253 (parseid): Switch id encoding from base 16 to base 36. This gives us
another 20 single digit ids before we have to risk breaking clients by
going to multiple digits.
2007-12-15 06:52:50 +00:00
63a88dbb1d Comment cautioning about protocol version change. 2007-12-15 06:27:55 +00:00
265e71efa8 Remove superfluous parenthesis. 2007-12-14 07:49:58 +00:00
45b9d65129 (retreat_ship1, retreat_land1): Simplify slightly. 2007-12-14 07:48:50 +00:00
cd41560fbc (play): Failed to initialized sa.sa_mask. 2007-12-14 07:45:46 +00:00
2b312fd943 (expect): Simplify, no functional change. 2007-12-14 07:44:46 +00:00
225f0f5132 (parseid): New, factored out of recvline() and recv_output().
(recvline, recv_output): Use it.
2007-12-14 07:44:12 +00:00
c9c9305c2f (recvline): Cope with multiple-digit ids. Server doesn't send such
ids at this time.
2007-12-14 07:36:27 +00:00