Commit graph

1181 commits

Author SHA1 Message Date
2e64ebbb3a (update_removewants): Clearing WUPD_WANT trashed all the other bits.
They are currently unused.
2006-01-04 18:28:50 +00:00
85bb851c04 (status): Enforce m_m_p_d only for active countries, not for deities,
visitors and such.
2006-01-04 17:58:16 +00:00
c53472e2f2 (demand_check): Slight simplification. 2006-01-04 16:48:43 +00:00
b69173eea4 (orig): Allow moving origin to another country's origin. This is a
superset of the offset command.
(offs): Redundant, underdocumented, remove.

(orig): Allow deities to reset origin to absolute 0,0.
2006-01-04 14:36:21 +00:00
c13a592bf5 (STAT_ABS): Only set by files program for country #0. Prevents offset
and origin commands from working.  Remove.
2006-01-04 14:27:10 +00:00
Ron Koenderink
4abeea5de9 (termio) [_WIN32]: Add a variable (record) to match the pointer type
for console functions.  Add error checks for console functions.
2006-01-04 03:30:04 +00:00
9101fe2bd9 Fix the previous revision. 2006-01-03 19:07:53 +00:00
de8aea7a0f (xdvisible): New.
(xditem): Use it.  This plugs all known information leaks.  It also
avoids dumping of unused records.
2006-01-03 17:07:41 +00:00
Ron Koenderink
6245d97358 (main) [_WIN32]: Fix logerror format to "lu" for GetLastError(). 2006-01-01 20:43:37 +00:00
Ron Koenderink
eec6fe6207 (service_ctrl_handler) [_WIN32]: Add static declaration.
Fix logerror format to "lu" for GetLastError().
2006-01-01 20:41:45 +00:00
Ron Koenderink
940d35a71a (tcp_listen) [_WIN32]: Move the undef NS_ALL to after include winsock2.h.
The undef is present to prevent namespace conflict the selector code.
2006-01-01 20:38:21 +00:00
Ron Koenderink
0b37d8f508 (tcp_listen) [_WIN32]: Add the WIN32 include files for accessing
the socket functions.

(tcp_listen): Add prototypes.h to verify the extern prototype.
2006-01-01 20:27:24 +00:00
Ron Koenderink
025135bad0 (loc_RunThisThread, loc_BlockThisThread) [_WIN32]:
Add void to parameter declarations.

(empth_threadMain) [_WIN32]: Add static declaration for the function.

(empth_init) [_WIN32]: Change the format "lu" for GetLastError()
in logerror() calls.
2006-01-01 20:23:51 +00:00
Ron Koenderink
ce4190caf7 (info) [_WIN32]: Add brackets to ensure the right combination of
ORs and ANDs.

(apro) [_WIN32]: Remove space to fix formatting for logerror().
Fix printing type for lhitlim in the format string for logerror() call.
2006-01-01 19:55:53 +00:00
Ron Koenderink
f1d9a5eba3 (info, apro) [_WIN32]: Correct parameter order for calls
to logerror() where GetLastError() is used.
Change the format to "lu" for printing GetLastError().
2006-01-01 19:47:46 +00:00
Ron Koenderink
6f51053336 (verify_row): Add cast to an int for a call to sizeof().
This removes a warning.
2006-01-01 19:32:52 +00:00
Ron Koenderink
8a25029c75 (disassoc) [_WIN32]: Add #ifndef _WIN32 around disassoc() as
WIN32 does not use it and does not support fork().
2006-01-01 19:29:12 +00:00
Ron Koenderink
354af75dd6 (empth_threadMain) [_WIN32]: Add include file for time(). 2006-01-01 15:56:35 +00:00
Ron Koenderink
4871a10a9b (xundump): Add the ability to support the parsing of the human
readable form.

(xucolumnheader): New function.
2006-01-01 03:44:41 +00:00
Ron Koenderink
15e40c55cd (xundump): Move the header parsing into a separate function xuheader().
Move the trailer parsing into a separate function xutrailer().

(xuheader, xutrailer): New functions.
2006-01-01 03:37:36 +00:00
Ron Koenderink
9fcb96e010 (ac_flak_dam): Fix FLAK_MAX to be last element of the array.
This fixes >8 case which was accessing one past the last element
of the array and getting an invalid value for flak max.
Broken in rev. 1.18
2005-12-31 22:37:51 +00:00
c3900f8424 (empfile, fileinit, lnd_init, lnd_postread, lnd_prewrite, nuk_init)
(nuk_postread, nuk_prewrite, pln_init, pln_postread, pln_prewrite)
(sct_postread, sct_prewrite, shp_init, shp_postread, shp_prewrite)
(ef_extend): Use void * for generic pointer parameter.
2005-12-31 12:52:18 +00:00
3db4e34ba4 (natstr): Members nat_xstart, nat_ystart are used write-only. Remove.
Users changed.
2005-12-31 10:50:24 +00:00
028a1bf3d8 (EF_RESOURCES, resources): New.
(empfile): Add it.
(pchr_ca): Use it.
2005-12-31 10:29:32 +00:00
747fb90407 Fix rev. 1.65. 2005-12-31 10:20:00 +00:00
027e9b5a34 (nat_ca): New selector dayno. 2005-12-31 10:03:06 +00:00
Ron Koenderink
27fe2e7be6 (prod): Add material limit for resource depletion to prod()
that is in place in the normal update sequence.
2005-12-31 02:42:55 +00:00
f7898f41e0 (ichr_ca): New selector melt_denom. Should have been done together
with item.h rev. 1.15.

(nuke_ca): Fix ca_table for selector types.  Broken in rev. 1.50.
2005-12-30 17:32:55 +00:00
acd2c7c2a8 (cuto, show_mission): Fix justification of coordinate output. 2005-12-30 17:28:24 +00:00
498d9fbfaa (M_SPY): Unused, remove. 2005-12-30 17:22:03 +00:00
1969a3890a (opt_UPDATESCHED): Remove nooption UPDATESCHED. It had no effect on
the actual update, only on the update command.  Believed to be broken
since Empire2.
2005-12-29 13:38:57 +00:00
fa52e6944d Normalize inclusion guards: use NAME_H for name.h. Some headers
lacked them, others used reserved identifiers.
2005-12-29 10:16:01 +00:00
c9589a89fb Fix the previous revision. 2005-12-28 23:07:24 +00:00
01624e9316 Fix rev. 1.29. 2005-12-28 23:06:14 +00:00
aff6cfcafe src/lib/commands/sona.c rev. 1.6 changed first argument of
line_of_sight() to char *.  The changeset failed to change callers.
Fix.
2005-12-28 22:43:39 +00:00
686eadad37 (att_mode, xyas, ownxy, prbuf): Get rid of s_char. Users changed.
(ATTRIBUTE): Don't disable use of gcc __attribute__ when s_char is
signed char.  All format strings are now char *.
2005-12-28 22:30:52 +00:00
24a07cd249 player.h rev. 1.9 changed struct player member argp to char *. The
changeset failed to adapt some s_char * operands.  Fix.
2005-12-28 22:21:42 +00:00
6fdbf215d0 Remove superflous includes. 2005-12-28 21:26:30 +00:00
0d267e0b24 There's no reason to include <time.h> in empio.h, except it's missing
in a couple of other files.  Include it where it's needed.
2005-12-28 21:25:39 +00:00
3b90d0cb81 (PP_MAIN, PP_UPDATE, PP_SHUTDOWN, PP_SCHED, PP_TIMESTAMP, PP_PLAYER)
(PP_ACCEPT, PP_KILLIDLE): Move from player.h to empthread.h and turn
into enumeration constants.
2005-12-28 21:21:15 +00:00
0772d47546 (login): Fix error messages. 2005-12-28 19:03:29 +00:00
19d88af312 Support for IPv6:
(tcp_listen, player_addrlen): New.  IPv4-only code factored out of
player_init().
(player_init): Use them.
(player_accept): Address family independence.
(tcp_connect): New.
(main): Use it.
(hostaddr, hostconnect, hostport): Internal linkage.
2005-12-28 18:50:08 +00:00
75a511a749 (main, intr) [!_WIN32]: signal() is a portability headache. Switch to
sigaction().
2005-12-28 16:59:20 +00:00
1ec32d97c4 Fix the previous revision. 2005-12-28 16:38:19 +00:00
87ace6afe4 (handleintr): Move to main.c. Internal linkage. Remove empty
handle.c
(interrupt): Internal linkage.

(interrupt): Use proper type for access from signal handler.
(intr): Don't increment to set, it's unobvious and it could overflow.
2005-12-28 16:16:41 +00:00
69150d10fc (EMPTH_LWP, EMPTH_POSIX, EMPTH_W32): Define in config.h instead of
compiler command line.  Don't bother to conditionalize code in .c
files that are only compiled when their thread package is used.

(_EMPTH_LWP, EMPTH_LWP, _EMPTH_POSIX, EMPTH_POSIX, _EMPTH_WIN32)
(EMPTH_W32): Identifiers beginning with an underscore and an uppercase
letter are reserved for any use.  Rename.
2005-12-28 14:27:15 +00:00
083f0ea350 (lwpInitSelect): The code to query the system's limit on file
descriptors was not portable.  Simply use FD_SETSIZE instead.  The
lower of the two applies, so this wastes storage if the system's limit
is significantly below FD_SETSIZE.  Not an issue, as FD_SETSIZE is
fairly small.
(lwpSleepFd): Return if fd is too large.  Returning isn't nice,
but better than the buffer overruns in the old code.
(lwpSelect): Member nfile unused, remove.
2005-12-27 19:22:07 +00:00
3aebb68ee7 Include config.h. 2005-12-27 18:04:19 +00:00
ea820f3b99 Fix missing include. 2005-12-27 17:56:57 +00:00
Ron Koenderink
233181c50d (player_new, player_accept, update_wait, market_update) [_WIN32]:
Move assignment of hostaddr and hostname from player_new() to
player_accept().  This solves the necessary of adding the socket include
file to prototypes.h for player_new().  The socket include file creates
a namespace conflict for WIN32.
2005-12-26 03:53:21 +00:00