Commit graph

1508 commits

Author SHA1 Message Date
23726b3799 (CFLAGS): Recent versions of gcc have a built-in function carg(),
which collides with our carg().  Suppress.
2006-01-21 08:06:17 +00:00
Ron Koenderink
0558a08f4d (shp_nav): Skip ships that are landlocked.
The shp_mess() frees the ship record but shp_nav() continues
processing the ship record causing a corruption of the
memory poll which results in a server crash.
2006-01-21 00:30:17 +00:00
ed6514f7f3 Work around MinGW Make's broken built-in link rule. 2006-01-20 07:48:10 +00:00
Ron Koenderink
4dfcdfeb4b (shp_check_nav): Remove the masking. This should have
be done when the d_nav's defines were replaced with a
enum d_navigation.  No functional changes.
2006-01-18 23:26:13 +00:00
Ron Koenderink
e7ed28aada (sail_ship): Only print the reached message when
the fleet actually moves.
2006-01-18 01:37:47 +00:00
Ron Koenderink
2088eab228 (sail_nav_fleet): Prevent a large fleet from sailing through
a canal.  Ensure only ships with M_CANAL can navigate a
canal.
2006-01-18 01:08:55 +00:00
Ron Koenderink
14d94c2509 (sect_has_dock): New.
(fuel, load, nav_loadship): Use it.
2006-01-17 23:38:51 +00:00
Ron Koenderink
80be15204b (load): Fix the printing of city when describing loadable sectors.
Broken in Rev. 1.21.
2006-01-17 22:23:13 +00:00
Ron Koenderink
100b39d71f (d_navigation): New.
(dchrstr): Use it.
2006-01-17 21:58:25 +00:00
Ron Koenderink
7179908cf5 (dchr): Use NAV_NONE. 2006-01-17 21:58:25 +00:00
Ron Koenderink
4f20f3dd9c (EF_SECTOR_NAVIGATION, sector_navigation): New.
(empfile): Add it.
(dchr_ca): Use it.
(NAV_NONE): New.
2006-01-17 21:42:02 +00:00
Ron Koenderink
18902e45d0 (dchrstr): Rename member d_flg to d_nav. Users changed. 2006-01-17 21:17:19 +00:00
Ron Koenderink
1d58f58e1b (check_nav, shp_check_nav, sail_nav_fleet, retreat_ship1):
Make shp_check_nav() public.
Remove check_nav(), replace with shp_check_nav().
No functional change as check_nav() and shp_check_nav() are
identical.
2006-01-17 13:11:24 +00:00
8ef5b87d90 Not used in the new build process; remove. 2006-01-15 20:11:04 +00:00
1991652cfd (dist): Implement. The client tarball doesn't work yet.
(TARNAME, VERSION, tarball, acdist, src_distgen, bld_distgen)
(dist-source, dist-client, dist-info, check-version): New.
2006-01-15 20:10:27 +00:00
f237a5e278 (ac): Fix location of autom4te.cache.
(clean): Add missing $(empth_obj).
2006-01-15 19:49:56 +00:00
987a1bac4a (info.html/TOP.html): Fix. 2006-01-15 18:19:27 +00:00
0280a43950 Reorder variable definitions. No functional changes. 2006-01-15 18:15:50 +00:00
99975ef076 (EXEEXT): New.
(util, client, server): Use it.
2006-01-15 18:07:58 +00:00
441c314f1e (distclean): Clean up another rev. 1.11 leftover. 2006-01-15 18:02:01 +00:00
aa35988ec8 (distclean): Clean up rev. 1.11 leftover. 2006-01-15 12:57:49 +00:00
7203926ea4 The code to fail when new subject's file exists failed always. Fix. 2006-01-15 08:05:13 +00:00
0fe877e1cd Remove useless width from printf conversion %c. 2006-01-14 20:06:29 +00:00
9eba732cc3 (EF_COUNTRY, cou_ca): New.
(empfile): Add it.
(xdvisible): Deal with it.
(ef_open_srv, ef_close_srv): Set it up.
(ef_init_view, ef_fina_view): New.
2006-01-14 16:28:33 +00:00
21e3c9d55e Avoid compiler warnings triggered by the previous revision. 2006-01-14 16:13:30 +00:00
48c6a88768 Fix the previous revision. 2006-01-14 16:11:22 +00:00
Ron Koenderink
d6f5688b75 (sona): Simplify the memory allocation for rad[] and vis[].
No functional changes.
2006-01-14 15:50:16 +00:00
8a3dc2d846 (list_realm): Fix type of parameter curr (broken in rev. 1.9).
Simplify.
2006-01-14 15:30:18 +00:00
8b047abe53 (real): Fix the previous revision. 2006-01-14 15:20:24 +00:00
Ron Koenderink
4898eb65e5 (sona): Fix memory allocation for rad[] and vis[]. The space request
for rad[] and vis[] is too small because it did not consider the size
of the array element.  Broken in rev. 1.15.
2006-01-13 22:56:41 +00:00
Ron Koenderink
45adbdb00e Move realms from the nation file into a new realms file:
(boundstr, realmstr): Rename, new members ef_type, r_cnum, r_uid,
r_realm, r_timestamp.
(natstr): Remove member nat_b[].
(EF_REALM, realm_ca): New.
(empfile): Add it.
(ef_open_srv, ef_close_srv, main): Deal with new file.
(getrealm, putrealm): New.
(add, new, real, list_realm, sarg_getrange): Use them.
2006-01-13 13:18:56 +00:00
Ron Koenderink
04a8b84592 (ship_bomb, deli, do_demo, fuel, grin, look_ship)
(ltend, multifire, quite_bigdef, mine, landmine)
(do_loan, prod, printdiff, sell, sona, stre)
(tend, fire_dchrg, vers, work, ac_planedamage)
(ac_shipflak, ask_off, get_mine_dsupport, att_fight)
(ask_move_in_off, detonate, sd, land_gun)
(land_unitgun, lnd_fort_interdiction, lnd_fortify)
(perform_mission, pln_mine, pln_mobcost)
(retreat_ship1, retreat_land1, shp_sweep)
(shp_fort_interdiction, shp_missle_defense)
(new_work, growfood, upd_land, land_repair)
(get_materials, do_mob_ship, do_mob_land)
(load_it, unload_it, prod_plane, produce)
(guerrilla, upd_buildeff, spread_fallout)
(upd_ship, ship_repair, min, dmin, MIN):
Remove min() and dmin() functions and replace
with a MIN macro in misc.h.  Remove local MIN
macros and use the new one in misc.h.  This
change removes the need for the special
case for _WIN32.

(fuel, look_ship, multifire, mission, sona)
(plane_sona, ef_open, player_accept, player_main)
(ac_dog, att_get_combat, calc_mobcost)
(ask_move_in_off, intelligence_report)
(build_mission_list_type, perform_mission)
(show_mission, use_supply, dodistribute)
(allocate_memory, max, dmax, MAX):
Remove max() and dmax() functions and replace
with a MAX macro in misc.h.  Remove local MAX
macros and use the new one in misc.h.  This
change removes the need for the special
case for _WIN32.
2006-01-12 14:23:55 +00:00
Ron Koenderink
b89de57d51 (EF_BAD, EF_SECTOR, EF_SHIP, EF_PLANE, EF_LAND, EF_NUKE)
(EF_NEWS, EF_TREATY, EF_TRADE, EF_POWER, EF_NATION)
(EF_LOAN, EF_MAP, EF_BMAP, EF_COMM, EF_LOST)
(EF_SECTOR_CHR, EF_SHIP_CHR, EF_PLANE_CHR)
(EF_LAND_CHR, EF_NUKE_CHR, EF_NEWS_CHR)
( EF_TREATY_FLAGS, EF_ITEM, EF_INFRASTRUCTURE)
(EF_PRODUCT, EF_TABLE, EF_SHIP_CHR_FLAGS)
(EF_PLANE_CHR_FLAGS, EF_LAND_CHR_FLAGS)
(EF_NUKE_CHR_FLAGS, EF_META)
(EF_META_TYPE, EF_META_FLAGS, EF_MISSIONS)
(EF_PLANE_FLAGS, EF_RETREAT_FLAGS, EF_NATION_FLAGS)
(EF_NATION_RELATIONS, EF_LEVEL, EF_AGREEMENT_STATUS)
(EF_PLAGUE_STAGES, EF_PACKING, EF_RESOURCES)
(EF_NATION_STATUS, EF_MAX): Turn into enumeration constants.
2006-01-10 19:53:34 +00:00
Ron Koenderink
a9c98f6c9e (acce): Remove unused variable 'n'. 2006-01-08 22:07:49 +00:00
Ron Koenderink
e28c14f023 (L_XLIGHT, lchr[], land_chr_flags[], take_plane_off_land,
put_plane_on_land, load_plane_land, can_fly):
Remove L_XLIGHT flag and replace with checks of lnd_maxlight.
Closes #758459.
2006-01-08 19:12:04 +00:00
Ron Koenderink
cf384676e8 (xuloadrow): Add support for NSC_SHORT. 2006-01-08 04:11:15 +00:00
c3ff418ed2 (share_incr): Simplify country status check for tech bleed
participation.  Only STAT_SANCT and STAT_ACTIVE receive, and only
STAT_ACTIVE bleed.  Both used to be STAT_NEW, STAT_SANCT, STAT_ACTIVE.
2006-01-07 09:35:39 +00:00
cd668a99a6 (age_levels): Simplify country status check for leaking tech. Don't
leak to countries in state STAT_NEW.
2006-01-07 09:26:49 +00:00
604fe007c0 (acce, rea, rela, snxtitem): Pass NULL as prompt when the prompt won't
be used.
2006-01-06 21:37:40 +00:00
1b63d30a51 (edit): natarg() no longer supports access to unused countries. Do
it by hand.  Switch to natargp() while we're at it.

(docountry): Remove redundant parameter nat.

(prnat): Change parameter from natid to struct natstr.
2006-01-06 21:31:11 +00:00
1b9641d6d1 (natargp): Only return countries in use. Unused countries could lead
to confusing output and were useless except perhaps for the edit
command.
2006-01-06 21:16:49 +00:00
ad05ff70a1 (acce): Use natargp() rather than natarg(), because acce() should not
require contact.

(acce): Used to show only contacted active and deity countries, except
for #0.  Change to show all countries, to match current version of
reject.
2006-01-06 21:08:18 +00:00
c3d5ed801c (reje): Do not require contact. Closes #890722. 2006-01-06 21:00:50 +00:00
39ce96c63d (nati): Use natargp() rather than natarg(), to avoid pointless
complaints about lack of contact.

(nati): Improve not-deity error message and change error code to
RET_FAIL.
2006-01-06 20:46:31 +00:00
35941f97eb (new): Simplify using new natargp().
(new): Use RET_OK instead of literal 0.

(new, isok, ok): s_char purge.
2006-01-06 20:36:53 +00:00
402c47b66e (natargp): New, factored out of natarg(). 2006-01-06 20:27:17 +00:00
ba554cbb1f (natarg): Use new cnumb() values to improve diagnostics. 2006-01-06 20:11:14 +00:00
87aa405823 (status): src/lib/subs/mtch.c rev. 1.10 broke deity commands that
require CAP or MONEY.  Fix by setting them in ncomstat.
2006-01-06 20:07:13 +00:00
ffa21cf379 (cnumb): Return the same error values as stmtch(). Callers don't
(yet) care for the difference.
2006-01-06 19:42:27 +00:00
c949d84774 (cnumb): Ignore countries not in use instead of countries with empty
names.  Clearer and safer.
2006-01-06 19:40:24 +00:00