From d702068457bc95d4e3ba05708516ce16ab206d68 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 17 Sep 2008 21:09:14 -0400 Subject: [PATCH] Fix trailing whitespace --- CREDITS | 4 +- GNUmakefile.in | 20 ++-- Make.mk | 20 ++-- configure.ac | 20 ++-- doc/CHANGES4.X | 60 +++++----- doc/README | 4 +- doc/coding | 4 +- doc/xdump | 2 +- include/budg.h | 2 +- include/com.h | 4 +- include/combat.h | 2 +- include/commands.h | 4 +- include/commodity.h | 2 +- include/damage.h | 2 +- include/distribute.h | 4 +- include/econfig-spec.h | 2 +- include/empio.h | 4 +- include/empobj.h | 6 +- include/empthread.h | 2 +- include/file.h | 2 +- include/game.h | 2 +- include/ioqueue.h | 2 +- include/item.h | 4 +- include/journal.h | 2 +- include/land.h | 2 +- include/loan.h | 4 +- include/lost.h | 2 +- include/lwp.h | 4 +- include/map.h | 4 +- include/match.h | 4 +- include/misc.h | 4 +- include/mission.h | 2 +- include/nat.h | 2 +- include/news.h | 2 +- include/nsc.h | 2 +- include/nuke.h | 2 +- include/optlist.h | 2 +- include/path.h | 4 +- include/plague.h | 4 +- include/plane.h | 2 +- include/player.h | 2 +- include/power.h | 4 +- include/product.h | 4 +- include/proto.h | 2 +- include/prototypes.h | 16 +-- include/queue.h | 4 +- include/retreat.h | 2 +- include/sect.h | 2 +- include/server.h | 2 +- include/service.h | 2 +- include/ship.h | 2 +- include/tel.h | 4 +- include/trade.h | 2 +- include/treaty.h | 2 +- include/types.h | 2 +- include/unit.h | 4 +- include/update.h | 4 +- include/version.h | 2 +- include/xdump.h | 2 +- include/xy.h | 2 +- info/Attacking.t | 4 +- info/Autonav.t | 2 +- info/Basics.t | 4 +- info/CHANGES.CHAINSAW.t | 32 +++--- info/Clients.t | 2 +- info/Empire2.t | 4 +- info/Empire3.t | 2 +- info/Empire4.t | 60 +++++----- info/Flak.t | 2 +- info/Infrastructure.t | 2 +- info/Land-units.t | 12 +- info/Novice.t | 14 +-- info/Old-empire.t | 6 +- info/Overview.t | 4 +- info/Research.t | 2 +- info/Sector-types.t | 8 +- info/Syntax.t | 4 +- info/Taxes.t | 2 +- info/Technology.t | 2 +- info/Trade-ships.t | 2 +- info/anti.t | 4 +- info/assault.t | 2 +- info/bdes.t | 2 +- info/bestpath.t | 2 +- info/bmap.t | 4 +- info/board.t | 2 +- info/bomb.t | 8 +- info/build.t | 12 +- info/cargo.t | 2 +- info/coastwatch.t | 2 +- info/convert.t | 2 +- info/cutoff.t | 2 +- info/deliver.t | 2 +- info/distribute.t | 2 +- info/drop.t | 2 +- info/dump.t | 2 +- info/fly.t | 2 +- info/launch.t | 4 +- info/lbmap.t | 4 +- info/lcargo.t | 2 +- info/ldump.t | 2 +- info/level.t | 2 +- info/lload.t | 4 +- info/lmap.t | 2 +- info/load.t | 14 +-- info/lost.t | 2 +- info/lrange.t | 2 +- info/lretreat.t | 6 +- info/map.t | 2 +- info/mission.t | 16 +-- info/move.t | 2 +- info/nbmap.t | 4 +- info/ndump.t | 2 +- info/nmap.t | 2 +- info/order.t | 42 +++---- info/paradrop.t | 2 +- info/pbmap.t | 4 +- info/pdump.t | 2 +- info/pmap.t | 2 +- info/power.t | 2 +- info/qorder.t | 8 +- info/read.t | 2 +- info/recon.t | 4 +- info/retreat.t | 6 +- info/sail.t | 2 +- info/sbmap.t | 4 +- info/sdump.t | 2 +- info/shark.t | 2 +- info/sinfrastructure.t | 2 +- info/smap.t | 2 +- info/sonar.t | 4 +- info/sorder.t | 2 +- info/spy.t | 4 +- info/supply.t | 2 +- info/sweep.t | 4 +- info/territory.t | 2 +- info/wire.t | 2 +- scripts/xdump.pl | 2 +- src/client/Makefile.in | 20 ++-- src/client/configure.ac | 20 ++-- src/client/expect.c | 2 +- src/client/host.c | 2 +- src/client/ipglob.c.in | 2 +- src/client/linebuf.c | 2 +- src/client/linebuf.h | 2 +- src/client/login.c | 2 +- src/client/main.c | 2 +- src/client/misc.h | 2 +- src/client/play.c | 6 +- src/client/ringbuf.c | 2 +- src/client/ringbuf.h | 2 +- src/client/secure.c | 2 +- src/client/secure.h | 2 +- src/client/servcmd.c | 2 +- src/client/sysdep_w32.c | 8 +- src/client/sysdep_w32.h | 4 +- src/client/termlib.c | 2 +- src/lib/as/README | 4 +- src/lib/as/as.h | 2 +- src/lib/commands/acce.c | 4 +- src/lib/commands/add.c | 2 +- src/lib/commands/anti.c | 2 +- src/lib/commands/arm.c | 2 +- src/lib/commands/army.c | 4 +- src/lib/commands/assa.c | 2 +- src/lib/commands/atta.c | 2 +- src/lib/commands/bdes.c | 4 +- src/lib/commands/best.c | 4 +- src/lib/commands/boar.c | 2 +- src/lib/commands/bomb.c | 2 +- src/lib/commands/brea.c | 2 +- src/lib/commands/budg.c | 4 +- src/lib/commands/buil.c | 2 +- src/lib/commands/buy.c | 2 +- src/lib/commands/capi.c | 2 +- src/lib/commands/carg.c | 4 +- src/lib/commands/cede.c | 2 +- src/lib/commands/cens.c | 2 +- src/lib/commands/chan.c | 2 +- src/lib/commands/coas.c | 2 +- src/lib/commands/coll.c | 2 +- src/lib/commands/comm.c | 4 +- src/lib/commands/cons.c | 4 +- src/lib/commands/conv.c | 2 +- src/lib/commands/coun.c | 4 +- src/lib/commands/cuto.c | 2 +- src/lib/commands/decl.c | 4 +- src/lib/commands/deli.c | 4 +- src/lib/commands/demo.c | 2 +- src/lib/commands/desi.c | 2 +- src/lib/commands/disa.c | 2 +- src/lib/commands/dist.c | 4 +- src/lib/commands/drop.c | 2 +- src/lib/commands/dump.c | 2 +- src/lib/commands/echo.c | 2 +- src/lib/commands/edit.c | 2 +- src/lib/commands/enab.c | 2 +- src/lib/commands/enli.c | 4 +- src/lib/commands/expl.c | 2 +- src/lib/commands/fina.c | 2 +- src/lib/commands/flash.c | 2 +- src/lib/commands/flee.c | 4 +- src/lib/commands/fly.c | 2 +- src/lib/commands/foll.c | 2 +- src/lib/commands/forc.c | 2 +- src/lib/commands/fort.c | 2 +- src/lib/commands/give.c | 2 +- src/lib/commands/grin.c | 2 +- src/lib/commands/hard.c | 2 +- src/lib/commands/head.c | 4 +- src/lib/commands/improve.c | 2 +- src/lib/commands/info.c | 6 +- src/lib/commands/land.c | 2 +- src/lib/commands/laun.c | 4 +- src/lib/commands/lboard.c | 2 +- src/lib/commands/ldump.c | 2 +- src/lib/commands/ledg.c | 2 +- src/lib/commands/leve.c | 2 +- src/lib/commands/load.c | 2 +- src/lib/commands/look.c | 2 +- src/lib/commands/lost.c | 2 +- src/lib/commands/lstat.c | 2 +- src/lib/commands/lten.c | 2 +- src/lib/commands/map.c | 2 +- src/lib/commands/marc.c | 2 +- src/lib/commands/mark.c | 2 +- src/lib/commands/mfir.c | 2 +- src/lib/commands/mine.c | 4 +- src/lib/commands/miss.c | 4 +- src/lib/commands/mobq.c | 2 +- src/lib/commands/mora.c | 2 +- src/lib/commands/move.c | 4 +- src/lib/commands/name.c | 2 +- src/lib/commands/nati.c | 4 +- src/lib/commands/navi.c | 4 +- src/lib/commands/ndump.c | 2 +- src/lib/commands/new.c | 2 +- src/lib/commands/newe.c | 2 +- src/lib/commands/news.c | 4 +- src/lib/commands/nuke.c | 2 +- src/lib/commands/offe.c | 2 +- src/lib/commands/orde.c | 10 +- src/lib/commands/orig.c | 2 +- src/lib/commands/para.c | 2 +- src/lib/commands/path.c | 2 +- src/lib/commands/payo.c | 2 +- src/lib/commands/pdump.c | 2 +- src/lib/commands/peek.c | 2 +- src/lib/commands/plan.c | 2 +- src/lib/commands/play.c | 2 +- src/lib/commands/powe.c | 2 +- src/lib/commands/prod.c | 2 +- src/lib/commands/pstat.c | 2 +- src/lib/commands/rada.c | 4 +- src/lib/commands/rang.c | 2 +- src/lib/commands/rea.c | 2 +- src/lib/commands/real.c | 4 +- src/lib/commands/reco.c | 2 +- src/lib/commands/reje.c | 4 +- src/lib/commands/rela.c | 4 +- src/lib/commands/relo.c | 2 +- src/lib/commands/repa.c | 4 +- src/lib/commands/repo.c | 2 +- src/lib/commands/rese.c | 2 +- src/lib/commands/reso.c | 2 +- src/lib/commands/retr.c | 2 +- src/lib/commands/rout.c | 4 +- src/lib/commands/sabo.c | 2 +- src/lib/commands/sail.c | 2 +- src/lib/commands/sate.c | 2 +- src/lib/commands/scra.c | 2 +- src/lib/commands/scut.c | 2 +- src/lib/commands/sdump.c | 2 +- src/lib/commands/sect.c | 2 +- src/lib/commands/sell.c | 2 +- src/lib/commands/set.c | 2 +- src/lib/commands/setres.c | 2 +- src/lib/commands/setsect.c | 2 +- src/lib/commands/shar.c | 2 +- src/lib/commands/shark.c | 2 +- src/lib/commands/shi.c | 2 +- src/lib/commands/shoo.c | 2 +- src/lib/commands/show.c | 2 +- src/lib/commands/shut.c | 2 +- src/lib/commands/sinf.c | 2 +- src/lib/commands/skyw.c | 2 +- src/lib/commands/sona.c | 4 +- src/lib/commands/spy.c | 2 +- src/lib/commands/sstat.c | 2 +- src/lib/commands/stop.c | 4 +- src/lib/commands/stre.c | 2 +- src/lib/commands/strv.c | 4 +- src/lib/commands/supp.c | 2 +- src/lib/commands/surv.c | 2 +- src/lib/commands/swap.c | 2 +- src/lib/commands/tele.c | 2 +- src/lib/commands/tend.c | 2 +- src/lib/commands/terr.c | 2 +- src/lib/commands/thre.c | 2 +- src/lib/commands/togg.c | 2 +- src/lib/commands/torp.c | 2 +- src/lib/commands/trad.c | 2 +- src/lib/commands/tran.c | 2 +- src/lib/commands/trea.c | 4 +- src/lib/commands/turn.c | 2 +- src/lib/commands/upda.c | 2 +- src/lib/commands/upgr.c | 2 +- src/lib/commands/vers.c | 2 +- src/lib/commands/wing.c | 4 +- src/lib/commands/wipe.c | 2 +- src/lib/commands/work.c | 2 +- src/lib/commands/xdump.c | 2 +- src/lib/commands/zdon.c | 2 +- src/lib/common/bestpath.c | 6 +- src/lib/common/btu.c | 2 +- src/lib/common/cargo.c | 2 +- src/lib/common/cnumb.c | 4 +- src/lib/common/conftab.c | 2 +- src/lib/common/ef_verify.c | 10 +- src/lib/common/emp_config.c | 2 +- src/lib/common/file.c | 2 +- src/lib/common/filetable.c | 2 +- src/lib/common/game.c | 4 +- src/lib/common/hap_fact.c | 2 +- src/lib/common/hours.c | 2 +- src/lib/common/mailbox.c | 4 +- src/lib/common/mapdist.c | 4 +- src/lib/common/move.c | 2 +- src/lib/common/nat.c | 2 +- src/lib/common/nsc.c | 2 +- src/lib/common/nstreval.c | 2 +- src/lib/common/path.c | 2 +- src/lib/common/rdsched.c | 4 +- src/lib/common/res_pop.c | 2 +- src/lib/common/stmtch.c | 2 +- src/lib/common/tfact.c | 2 +- src/lib/common/type.c | 2 +- src/lib/common/wantupd.c | 2 +- src/lib/common/xdump.c | 2 +- src/lib/common/xundump.c | 2 +- src/lib/common/xy.c | 2 +- src/lib/empthread/io.c | 2 +- src/lib/empthread/lwp.c | 2 +- src/lib/empthread/ntthread.c | 10 +- src/lib/empthread/posix.c | 2 +- src/lib/empthread/pthread.c | 2 +- src/lib/gen/chance.c | 4 +- src/lib/gen/disassoc.c | 2 +- src/lib/gen/fnameat.c | 2 +- src/lib/gen/fsize.c | 2 +- src/lib/gen/ioqueue.c | 4 +- src/lib/gen/log.c | 2 +- src/lib/gen/numstr.c | 2 +- src/lib/gen/parse.c | 4 +- src/lib/gen/plur.c | 4 +- src/lib/gen/queue.c | 4 +- src/lib/gen/round.c | 4 +- src/lib/gen/scthash.c | 2 +- src/lib/gen/tcp_listen.c | 2 +- src/lib/global/constants.c | 4 +- src/lib/global/dir.c | 2 +- src/lib/global/init.c | 2 +- src/lib/global/item.c | 4 +- src/lib/global/land.c | 2 +- src/lib/global/news.c | 4 +- src/lib/global/nuke.c | 4 +- src/lib/global/options.c | 2 +- src/lib/global/path.c.in | 2 +- src/lib/global/plane.c | 2 +- src/lib/global/product.c | 4 +- src/lib/global/sect.c | 2 +- src/lib/global/ship.c | 2 +- src/lib/global/symbol.c | 2 +- src/lib/global/updtime.c | 2 +- src/lib/global/version.c | 4 +- src/lib/lwp/arch.c | 2 +- src/lib/lwp/lwp.c | 2 +- src/lib/lwp/lwpint.h | 2 +- src/lib/lwp/queue.c | 2 +- src/lib/lwp/rwlock.c | 2 +- src/lib/lwp/sel.c | 4 +- src/lib/lwp/sig.c | 4 +- src/lib/lwp/status.c | 2 +- src/lib/player/accept.c | 2 +- src/lib/player/dispatch.c | 2 +- src/lib/player/empdis.c | 2 +- src/lib/player/empmod.c | 2 +- src/lib/player/init_nats.c | 2 +- src/lib/player/login.c | 2 +- src/lib/player/nat.c | 2 +- src/lib/player/player.c | 2 +- src/lib/player/recvclient.c | 2 +- src/lib/subs/aircombat.c | 2 +- src/lib/subs/askyn.c | 2 +- src/lib/subs/aswplnsubs.c | 4 +- src/lib/subs/attsub.c | 8 +- src/lib/subs/bigmap.c | 4 +- src/lib/subs/border.c | 4 +- src/lib/subs/bridgefall.c | 2 +- src/lib/subs/bsanct.c | 4 +- src/lib/subs/caploss.c | 2 +- src/lib/subs/check.c | 2 +- src/lib/subs/coastal.c | 2 +- src/lib/subs/control.c | 2 +- src/lib/subs/damage.c | 2 +- src/lib/subs/detonate.c | 2 +- src/lib/subs/disloan.c | 2 +- src/lib/subs/distrea.c | 4 +- src/lib/subs/empobj.c | 2 +- src/lib/subs/fileinit.c | 2 +- src/lib/subs/fortdef.c | 4 +- src/lib/subs/getbit.c | 2 +- src/lib/subs/getele.c | 4 +- src/lib/subs/getstarg.c | 4 +- src/lib/subs/getstring.c | 4 +- src/lib/subs/journal.c | 4 +- src/lib/subs/land.c | 2 +- src/lib/subs/landgun.c | 2 +- src/lib/subs/list.c | 2 +- src/lib/subs/lndsub.c | 4 +- src/lib/subs/lostsub.c | 2 +- src/lib/subs/maps.c | 2 +- src/lib/subs/mission.c | 4 +- src/lib/subs/move.c | 4 +- src/lib/subs/mslsub.c | 2 +- src/lib/subs/mtch.c | 2 +- src/lib/subs/natarg.c | 2 +- src/lib/subs/natsub.c | 2 +- src/lib/subs/neigh.c | 4 +- src/lib/subs/nreport.c | 2 +- src/lib/subs/nstr.c | 2 +- src/lib/subs/nuke.c | 2 +- src/lib/subs/nxtitem.c | 2 +- src/lib/subs/nxtsct.c | 2 +- src/lib/subs/onearg.c | 4 +- src/lib/subs/paths.c | 2 +- src/lib/subs/plane.c | 2 +- src/lib/subs/plnsub.c | 4 +- src/lib/subs/pr.c | 4 +- src/lib/subs/radmap.c | 4 +- src/lib/subs/rej.c | 2 +- src/lib/subs/retreat.c | 2 +- src/lib/subs/sarg.c | 4 +- src/lib/subs/satmap.c | 2 +- src/lib/subs/sect.c | 2 +- src/lib/subs/sectdamage.c | 2 +- src/lib/subs/ship.c | 2 +- src/lib/subs/show.c | 6 +- src/lib/subs/shpsub.c | 8 +- src/lib/subs/snxtitem.c | 2 +- src/lib/subs/snxtsct.c | 2 +- src/lib/subs/supply.c | 4 +- src/lib/subs/takeover.c | 2 +- src/lib/subs/trdsub.c | 2 +- src/lib/subs/trechk.c | 4 +- src/lib/subs/unitsub.c | 2 +- src/lib/subs/whatitem.c | 4 +- src/lib/subs/wu.c | 4 +- src/lib/update/age.c | 2 +- src/lib/update/anno.c | 2 +- src/lib/update/bp.c | 2 +- src/lib/update/deliver.c | 4 +- src/lib/update/distribute.c | 2 +- src/lib/update/finish.c | 2 +- src/lib/update/human.c | 2 +- src/lib/update/land.c | 2 +- src/lib/update/main.c | 2 +- src/lib/update/material.c | 2 +- src/lib/update/mobility.c | 2 +- src/lib/update/move_sat.c | 4 +- src/lib/update/nat.c | 2 +- src/lib/update/nav_ship.c | 8 +- src/lib/update/nav_util.c | 12 +- src/lib/update/nxtitemp.c | 2 +- src/lib/update/plague.c | 2 +- src/lib/update/plane.c | 2 +- src/lib/update/populace.c | 2 +- src/lib/update/prepare.c | 2 +- src/lib/update/produce.c | 4 +- src/lib/update/removewants.c | 4 +- src/lib/update/revolt.c | 2 +- src/lib/update/sail.c | 2 +- src/lib/update/sect.c | 4 +- src/lib/update/ship.c | 2 +- src/lib/w32/arpa/inet.h | 2 +- src/lib/w32/netdb.h | 2 +- src/lib/w32/netinet/in.h | 2 +- src/lib/w32/posixfile.c | 2 +- src/lib/w32/posixio.c | 6 +- src/lib/w32/service.c | 108 +++++++++--------- src/lib/w32/sys/socket.h | 2 +- src/lib/w32/sys/uio.h | 2 +- src/lib/w32/unistd.h | 2 +- src/lib/w32/w32misc.h | 2 +- src/scripts/nightly/nightlybuild.sh | 16 +-- .../nightly/patches/All/common_file.c.patch | 2 +- src/scripts/nightly/patches/All/lost.c.patch | 2 +- src/scripts/nightly/patches/All/pr.c.patch | 4 +- .../nightly/patches/All/pre_update.patch | 2 +- src/server/idle.c | 2 +- src/server/main.c | 2 +- src/server/marketup.c | 2 +- src/server/shutdown.c | 2 +- src/server/update.c | 6 +- src/util/empdump.c | 2 +- src/util/empsched.c | 2 +- src/util/fairland.c | 2 +- src/util/files.c | 2 +- src/util/pconfig.c | 2 +- 509 files changed, 922 insertions(+), 922 deletions(-) diff --git a/CREDITS b/CREDITS index 8d3789442..fb4520886 100644 --- a/CREDITS +++ b/CREDITS @@ -27,7 +27,7 @@ projects building on the projects before it): Steve McClure (ionica@empire.cx) (Wolfpack) It is due to these above people pulling projects together that the -Empire server has gotten to where it is today. +Empire server has gotten to where it is today. Empire is copyrighted and released by the 5 people above under the GNU GPL. See files README, COPYING and CREDITS for related information @@ -98,7 +98,7 @@ Steven Grimm (koreth@ucscb.UCSC.EDU) Karl Hagen Doug Hay (Doug_Hay@tsb.ca) Ken Huisman -Ray Hyatt (Ray.Hyatt@gmail.com) +Ray Hyatt (Ray.Hyatt@gmail.com) Lewis R. Jansen (lrj@helios.tn.cornell.edu) Mike St. Johns (stjohns@edn-vax.arpa) Beorn Johnson diff --git a/GNUmakefile.in b/GNUmakefile.in index 95e376779..b25bbb427 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,36 +1,36 @@ -# +# # Empire - A multi-player, client/server Internet based war game. # Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak, # Ken Stevens, Steve McClure -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# +# # --- -# +# # See files README, COPYING and CREDITS in the root of the source # tree for related information and legal notices. It is expected # that future projects/authors will amend these files as needed. -# +# # --- -# +# # @configure_input@ # GNUmakefile.in: Makefile template for configure -# +# # Known contributors to this file: # Markus Armbruster, 2005-2008 -# +# # The real meat is in Make.mk, which see. diff --git a/Make.mk b/Make.mk index 696e4aec8..803ebf2f3 100644 --- a/Make.mk +++ b/Make.mk @@ -1,35 +1,35 @@ -# +# # Empire - A multi-player, client/server Internet based war game. # Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak, # Ken Stevens, Steve McClure -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# +# # --- -# +# # See files README, COPYING and CREDITS in the root of the source # tree for related information and legal notices. It is expected # that future projects/authors will amend these files as needed. -# +# # --- -# +# # Make.mk: The real Makefile, included by GNUmakefile -# +# # Known contributors to this file: # Markus Armbruster, 2005-2008 -# +# # This makefile was inspired by `Recursive Make Considered Harmful', # Peter Miller, 1997. diff --git a/configure.ac b/configure.ac index dffe8cabb..52695da93 100644 --- a/configure.ac +++ b/configure.ac @@ -1,35 +1,35 @@ -# +# # Empire - A multi-player, client/server Internet based war game. # Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak, # Ken Stevens, Steve McClure -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# +# # --- -# +# # See files README, COPYING and CREDITS in the root of the source # tree for related information and legal notices. It is expected # that future projects/authors will amend these files as needed. -# +# # --- -# +# # configure.ac: Autoconf input file -# +# # Known contributors to this file: # Markus Armbruster, 2005-2008 -# +# # Process this file with autoconf to produce a configure script. # Autoconf makes checking for and programming around assorted ancient diff --git a/doc/CHANGES4.X b/doc/CHANGES4.X index 362a4caf4..7dd59172f 100644 --- a/doc/CHANGES4.X +++ b/doc/CHANGES4.X @@ -515,7 +515,7 @@ Changes to Empire 4.3.10 - Thu Sep 6 17:59:53 UTC 2007 shutdown aborted it. The bug allowed players to delay update and shutdown indefinitely. * Thread priorities are only implemented by LWP and no longer used. - With LWP, they let players with a sufficiently fast connection + With LWP, they let players with a sufficiently fast connection starve out the threads that clean the lost file and kill idle connections. Drop them. * Show nuke rounded required research incorrectly. @@ -727,7 +727,7 @@ Changes to Empire 4.3.6 - Tue Jun 20 18:46:18 UTC 2006 in 4.0.2), and trains could be sent down paths without rail (never worked). Also fixes unit reaction path cost. * The custom table reader can now deal with sector, item, product and - infra tables more comfortably. + infra tables more comfortably. * Remove option BIG_CITY. Deities can customize the sect table to get the same effect. * Many more selectors can now be compared with names, not just @@ -1632,7 +1632,7 @@ Changes to Empire 4.2.13 - Fri Feb 13 22:12:36 UTC 2004 * News no longer call all sub-launched missiles nuclear. * Incoming missiles are now reported with coordinates. * Removed some code that served no purpose except crashing on - Windows. + Windows. * Fixed Mac OSX and AIX build problems. * Don't resolve player IP addresses for now, because it can crash with certain versions of GNU libc. @@ -1727,7 +1727,7 @@ Changes to Empire 4.2.8 - Mon Oct 9 17:35:35 MDT 2000 * Updated order of firing flak in Flak.t. * Fixed 80% efficient planes on ships must be maintained. * Fixed initial MOB_ACCESS check thread sleep time was set by an uninitialized - variable. + variable. * Removed "TEMPORARILY DISABLED" message from mission command for escort missions. Escort missions have been re-enabled since 4.0.15. * Using sonar from the navigate command will print the sonar map. @@ -1862,7 +1862,7 @@ Changes to Empire 4.2.6 - Fri Jun 4 05:55:20 PDT 1999 * Fixed bug in sectors that don't revolt not showing up as lost items. * Fixed bug where maps with an X of exactly 200 is not drawing third line. * Fixed bug where MOB_ACCESS was not updating the mobility just before - the update. + the update. * Fixed bug in the way treaties are examined and sometimes produce wrong results. * Fixed edit to allow creating negative mobility for sectors. @@ -1893,7 +1893,7 @@ Changes to Empire 4.2.5 - Mon Mar 1 06:42:24 PST 1999 * Fixed bug where scrapping land units was creating military. * Fixed description of sect_mob_neg_factor in econfig file. * Increased speed of PT boats. - + Changes to Empire 4.2.4 - Tue Feb 2 05:47:44 PST 1999 * Added check to make military values match up correctly for land units. @@ -1905,7 +1905,7 @@ Changes to Empire 4.2.4 - Tue Feb 2 05:47:44 PST 1999 * Fixed bug in explore command not setting mobility to correct value when MOB_ACCESS was enabled. * Fixed bug in enlist setting mobility incorrectly sometimes. - * Added doc/backup file for deities which recommends how backups and + * Added doc/backup file for deities which recommends how backups and restores of the data directory should be done. Changes to Empire 4.2.3 - Wed Jan 13 06:02:35 PST 1999 @@ -2030,7 +2030,7 @@ Changes to Empire 4.2.2 - Sun Dec 27 12:46:34 PST 1998 * Fixed bug where satellites were not orbiting the world during the update. * Fixed bug in torpedos being too smart. They knew how to jump over - land! :) Now the "line_of_sight" routine is used to determine if a + land! :) Now the "line_of_sight" routine is used to determine if a torpedo has a straight path to the destination. If it doesn't, the torpedo no longer jumps over land, but instead slams into it. This was an interesting bug because you could torp ships on the other side of @@ -2046,9 +2046,9 @@ Changes to Empire 4.2.2 - Sun Dec 27 12:46:34 PST 1998 destination sector. Goods are now attempted to be returned to the start sector, and apporpriate steps taken if the start sector is no longer available. - * Fixed march to prompt you before you abandon a sector you own by + * Fixed march to prompt you before you abandon a sector you own by marching out the last land unit. - * Fixed check functions to only check the relevant portions of the structure + * Fixed check functions to only check the relevant portions of the structure and not the timestamp info that doesn't affect how the object functions. * Fixed bug in spy command that always told you if a spy unit was in a non-owned sector. @@ -2096,7 +2096,7 @@ Changes to Empire 4.2.2 - Sun Dec 27 12:46:34 PST 1998 gained information that you wouldn't normally know.) * Merged bestpath and bestownedpath and wrote new wrappers, "BestShipPath" and "BestAirPath" to use it properly. It is also good to note that - bestownedpath is used to determine paths for ships and for planes, + bestownedpath is used to determine paths for ships and for planes, and that best_path (which uses the A* algorithm) is used for all land based paths, and that the two are never interchanged. * Removed "jet recon" plane (it slipped in during the PLANENAMES conversion, @@ -2109,7 +2109,7 @@ Changes to Empire 4.2.1 - Tue Nov 3 12:56:20 PST 1998 properly, and thus causing crashes when accessing certain plane routines. This happened during the move to make the PLANENAMES option run-time configurable. - + Changes to Empire 4.2.0 - Thu Oct 29 06:27:15 PST 1998 * Bumped rev to 4.2.0 since this is a major release (the server is now run-time configurable for just about everything and is released under @@ -2272,7 +2272,7 @@ Changes to Empire 4.0.18 - Thu Sep 24 06:54:27 PDT 1998 * Updated Education.t * Modified (increased) chances of hitting mines slightly. * Removed unused variables from shp_check_mines. - + Changes to Empire 4.0.17 - Fri Jul 31 06:12:21 PDT 1998 * Added ability in edit to change coastal flag for sectors. * Added ability in edit to edit plague values for ships. @@ -2290,7 +2290,7 @@ Changes to Empire 4.0.17 - Fri Jul 31 06:12:21 PDT 1998 (works for sea and land mines, used "lmine" to distinguish it from "min" which determines mineral (iron) content of a sector.) * No longer able to pin bomb land units on a ship. - * Land units are required to have at least one military loaded to perform + * Land units are required to have at least one military loaded to perform a mission. * Firing land units are required to have at least on military loaded to be able to fire (or return fire.) @@ -2306,7 +2306,7 @@ Changes to Empire 4.0.17 - Fri Jul 31 06:12:21 PDT 1998 they were not cargo capable. * Fixed bug in potentially crashing in update code for nations tech/research. * Fixed bug in execute putting you into execute mode incorrectly. - * Fixed bug in board not allowing land units to board from 0 mobility + * Fixed bug in board not allowing land units to board from 0 mobility sectors. * Fixed bug where interdicted land units that were missed displayed a "SPLASH! Bombs miss your ships" message. @@ -2396,7 +2396,7 @@ Changes to Empire 4.0.16 - Fri Jun 12 08:52:06 EDT 1998 before.) * Fixed bug in neweff not reporting stopped sectors. It now (correctly) reports them as not changing eff. - + Changes to Empire 4.0.15 - Wed May 20 12:35:53 EDT 1998 * Fixed the spelling of Markus' name in CHANGES4.0 files. * Added Markus' patches/fixes. Some are detailed below. @@ -2417,7 +2417,7 @@ Changes to Empire 4.0.15 - Wed May 20 12:35:53 EDT 1998 * Fixed bug in setsector telling the deity coordinates of sectors being granted/taken away. * Fixed bug in setting budget of enlistment sectors to 0. - + Changes to Empire 4.0.14 - Wed Apr 8 08:47:54 EDT 1998 * Fixed time_t problem in common/log.c * Fixed bug in headlines @@ -2427,7 +2427,7 @@ Changes to Empire 4.0.14 - Wed Apr 8 08:47:54 EDT 1998 * Fixed bug in printing of "No ship(s)" twice in cargo command when no ships were selected. * Temporarily disabled escort missions until a fix is found. They are - randomly crashing the server. + randomly crashing the server. * Fixed morale.t to reflect that retreat percentage is based off of morale_base and not 75. * Fixed bug in bridgefall where planes and units on ship in a sector @@ -2437,7 +2437,7 @@ Changes to Empire 4.0.14 - Wed Apr 8 08:47:54 EDT 1998 * Fixed bug in produce command reporting incorrect costs (sometimes). * Land units on ships will now try to draw supply from the ship they are on. - + Changes to Empire 4.0.13 - Mon Mar 2 11:04:28 EST 1998 * Fixed bug in distribute when world sizes are other than 64x32 * Fixed bug in getcommand (not really a bug, just made it work like @@ -2446,10 +2446,10 @@ Changes to Empire 4.0.13 - Mon Mar 2 11:04:28 EST 1998 * Fixed building of POSIX threads on Alpha running Digital Unix. * Fixed line_of_sight prototype in sona.c * Fixed fairland not to conuse stupid C++ compilers. - + Changes to Empire 4.0.12 - Tue Feb 24 11:27:31 EST 1998 * Fixed client build on linux (whoops) - + Changes to Empire 4.0.11 - Tue Feb 10 10:53:10 EST 1998 * AIX build seems to only work with gcc right now (but at least that works) * Vax Ultrix (vaxultrix) build should work now (hopefully) out of the box. @@ -2464,7 +2464,7 @@ Changes to Empire 4.0.11 - Tue Feb 10 10:53:10 EST 1998 * Fixed bug where spies were not dying when damaged. * Fixed bug in HIDDEN mods in declare command not printing country # of uncontacted country correctly (or at all as a matter of fact) - + Changes to Empire 4.0.10 - Mon Aug 18 12:34:58 EDT 1997 * Fixed bug where fleets were being interdicted but the damage was being spread to ships not in the same sectors. @@ -2498,7 +2498,7 @@ Changes to Empire 4.0.10 - Mon Aug 18 12:34:58 EDT 1997 a sector. * Documented mountains only holding and using 1/10th of the normal sector population in Sector-types.t. - * Fixed documentation on ship's firing ranges in fire.t to be less + * Fixed documentation on ship's firing ranges in fire.t to be less ambiguous. * Updated nukes in nuke.t * Added apropos command (thanks to Mike Wise) @@ -2506,7 +2506,7 @@ Changes to Empire 4.0.10 - Mon Aug 18 12:34:58 EDT 1997 there are two files of the same name, and you don't get a complete match, then whichever file is found first in the directory is used. * Changed documentation in wantupd.h - + Changes to Empire 4.0.9 - Sat Apr 19 23:01:51 EDT 1997 * Fixed dump info pages that were getting formatted funny. * Fixed improve info page. @@ -2574,7 +2574,7 @@ Changes to Empire 4.0.8 - Wed Feb 26 23:00:51 EST 1997 This was major because it affected timestamp values which are more than 65535. * Fixed bug in sdump.c for typo in reporting the trade ships origin. - + Changes to Empire 4.0.7 - Mon Feb 24 22:48:54 EST 1997 * Fixed bug in aircombat.c when calculating the air combat odds. Negative numbers were screwing things up good... @@ -2609,7 +2609,7 @@ Changes to Empire 4.0.7 - Mon Feb 24 22:48:54 EST 1997 * Spies caught in Neutral or Friendly countries cause the Neutral or Friendly country to go Hostile towards the owner of the spy. * Tweaked ammunition numbers for artillery units. - * No more automatic declarations of War should be made. You will go + * No more automatic declarations of War should be made. You will go hostile, but since going to war doesn't increase your countries defenses, and is purely political, it is left to the player to go that final step. @@ -2703,7 +2703,7 @@ Changes to Empire 4.0.4 - Mon Dec 9 11:00:00 EST 1996 * Fixed doconfig.c to create directories with right modes. * Fixed install macros in makefiles to move binaries to the right places. - + Changes to Empire 4.0.3 - Wed Dec 4 22:46:53 EST 1996 * Added HP/UX port. * Fixed doconfig.c (put exit(0) at the end of main.) @@ -2738,7 +2738,7 @@ Changes to Empire 4.0.2 - Mon Oct 14 12:26:40 EDT 1996 * Fixed attack value in attack_val in lndsub.c * Fixed lload in commands/load.c * Fixed defense_val in lndsub.c - Made it a minimum of 1, so that units will - always fight until dead or retreating. 0 makes them get stuck. + always fight until dead or retreating. 0 makes them get stuck. * Fixed update/deliver.c - no delivery of non-oldowned civvies (or anything else for that matter.) * Fixed llook in commands/look.c @@ -2822,7 +2822,7 @@ Changes to Empire 4.0.0 - Wed Aug 21 1996 * Added NO_LCMS, NO_HCMS and NO_OIL options. When any of these options are enabled, you don't need any of that type of material to build things. If NO_HCMS is enabled, you don't need HCMS to build bridges, you need - lcms. If both NO_HCMS and NO_LCMS are enabled, then you don't need + lcms. If both NO_HCMS and NO_LCMS are enabled, then you don't need any materials to build a bridge. * There is no mobility cost for assigning missions. But, there is also no longer any benefit for being on a mission either. @@ -2877,7 +2877,7 @@ Changes to Empire 4.0.0 - Wed Aug 21 1996 * Che can now be lessened by making happiness. If you have more happiness than your conquered populace, they don't fight as hard or recruit as much. If you have less than them, they fight harder and recruit more. - It's not much though - it ranges from 2.0 in your favor to only 0.8 + It's not much though - it ranges from 2.0 in your favor to only 0.8 against you (whereas it was always 1.0 before.) So, it definitely favors the attackers to make lots of happy now. * Bridgeheads can only be built on coasts. diff --git a/doc/README b/doc/README index 7d485c1b8..d16e50cf8 100644 --- a/doc/README +++ b/doc/README @@ -16,7 +16,7 @@ clients-howto troubleshooting Some common problems and solutions. -configuration +configuration How to turn options on and off, change game parameters, etc... debugging @@ -35,7 +35,7 @@ pthreads Sasha Mikheev's notes on Empire's threading abstraction, and its LWP and POSIX threads implementation. -coding +coding Guidelines for coding style unicode diff --git a/doc/coding b/doc/coding index 652c3deb7..e3d8c6945 100644 --- a/doc/coding +++ b/doc/coding @@ -462,7 +462,7 @@ player->aborted; if it is set after a read, the read failed. git --- -Commit related changes together, unrelated changes separately. +Commit related changes together, unrelated changes separately. Write meaningfull commit messages. Start with a single short line (ideally less than 50 characters) summarizing the change, followed by @@ -507,7 +507,7 @@ a procedure, something may well be amiss. Sasha Mikheev on indentation: -The empire indentation style can be achived by using +The empire indentation style can be achived by using indent -orig -i8 foo.c or in old c-mode emacs (versions before 19.29): diff --git a/doc/xdump b/doc/xdump index e0adf04b5..0a228fe1a 100644 --- a/doc/xdump +++ b/doc/xdump @@ -468,7 +468,7 @@ requirements than dumps: - No comment syntax. * Each table is self-contained. You don't have to look into other - tables to make sense of it. + tables to make sense of it. This conflicts with xdump's separation of data and meta-data. You need the table's meta-data to identify fields, and the referenced diff --git a/include/budg.h b/include/budg.h index 653ffe19a..7cd055044 100644 --- a/include/budg.h +++ b/include/budg.h @@ -26,7 +26,7 @@ * --- * * budg.h: Budget related definitions - * + * * Known contributors to this file: * Ville Virrankoski, 1995 */ diff --git a/include/com.h b/include/com.h index 2509b2219..6174c1b89 100644 --- a/include/com.h +++ b/include/com.h @@ -26,9 +26,9 @@ * --- * * com.h: Definitions used to parse Empire commands - * + * * Known contributors to this file: - * + * */ #ifndef COM_H diff --git a/include/combat.h b/include/combat.h index 62bf34e2e..a62a40dde 100644 --- a/include/combat.h +++ b/include/combat.h @@ -26,7 +26,7 @@ * --- * * combat.h: Definitions for things having to do with combat - * + * * Known contributors to this file: * Ken Stevens, 1995 */ diff --git a/include/commands.h b/include/commands.h index f3aa6ac1f..594d2632d 100644 --- a/include/commands.h +++ b/include/commands.h @@ -26,9 +26,9 @@ * --- * * commands.h: Definitions used for command stuff - * + * * Known contributors to this file: - * + * */ #ifndef COMMANDS_H diff --git a/include/commodity.h b/include/commodity.h index d515364e7..1808fb43b 100644 --- a/include/commodity.h +++ b/include/commodity.h @@ -27,7 +27,7 @@ * * commodity.h: Definitions for buy/market/sell commands in a time delay * market - * + * * Known contributors to this file: * Pat Loney, 1992 * Steve McClure, 1996 diff --git a/include/damage.h b/include/damage.h index c6a6cf39c..8bd6c6349 100644 --- a/include/damage.h +++ b/include/damage.h @@ -26,7 +26,7 @@ * --- * * damage.h: Damage formulas - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1998 diff --git a/include/distribute.h b/include/distribute.h index 301146b3f..e99002456 100644 --- a/include/distribute.h +++ b/include/distribute.h @@ -26,9 +26,9 @@ * --- * * distribute.h: Definitions for distribution stuff - * + * * Known contributors to this file: - * + * */ #ifndef DISTRIBUTE_H diff --git a/include/econfig-spec.h b/include/econfig-spec.h index e2a85ce6e..756bed167 100644 --- a/include/econfig-spec.h +++ b/include/econfig-spec.h @@ -26,7 +26,7 @@ * --- * * econfig-spec.h: Combined include for optlist.h and emp_config.c - * + * * Known contributors to this file: * Marc Olzheim, 2004 * Markus Armbruster, 2004-2008 diff --git a/include/empio.h b/include/empio.h index 06eba67f1..2ca28badc 100644 --- a/include/empio.h +++ b/include/empio.h @@ -26,9 +26,9 @@ * --- * * empio.h: Describes io pointers used in Empire - * + * * Known contributors to this file: - * + * */ #ifndef EMPIO_H diff --git a/include/empobj.h b/include/empobj.h index 63931c106..fd9bb8ee8 100644 --- a/include/empobj.h +++ b/include/empobj.h @@ -26,7 +26,7 @@ * --- * * empobj.h: General empire objects. - * + * * Known contributors to this file: * Ron Koenderink, 2006 * Markus Armbruster, 2006-2008 @@ -68,7 +68,7 @@ struct empobj { signed char effic; signed char mobil; unsigned char off; - short tech; + short tech; char group; /* valid if EFF_GROUP is in table's flags */ coord opx, opy; short mission; @@ -83,7 +83,7 @@ union empobj_storage { struct lndstr land; struct lonstr loan; struct loststr lost; - struct natstr nat; + struct natstr nat; struct nwsstr news; struct nukstr nuke; struct plnstr plane; diff --git a/include/empthread.h b/include/empthread.h index 37c96fb0f..dc7fd3b80 100644 --- a/include/empthread.h +++ b/include/empthread.h @@ -26,7 +26,7 @@ * --- * * empthread.h: Definitions for Empire threading - * + * * Known contributors to this file: * Sasha Mikheev * Doug Hay, 1998 diff --git a/include/file.h b/include/file.h index 5d5fc9206..0f470c14d 100644 --- a/include/file.h +++ b/include/file.h @@ -26,7 +26,7 @@ * --- * * file.h: Describes Empire tables (`files' for historical reasons) - * + * * Known contributors to this file: * Markus Armbruster, 2005-2008 */ diff --git a/include/game.h b/include/game.h index 112b06476..f24a5a060 100644 --- a/include/game.h +++ b/include/game.h @@ -26,7 +26,7 @@ * --- * * game.h: The game file - * + * * Known contributors to this file: * Markus Armbruster, 2007-2008 */ diff --git a/include/ioqueue.h b/include/ioqueue.h index 1fd4e63be..bfd2d69a2 100644 --- a/include/ioqueue.h +++ b/include/ioqueue.h @@ -28,7 +28,7 @@ * ioqueue.h: Stores and frees data associated with a file descriptor. * uses writev to write, and read to read * Known contributors to this file: - * + * */ #ifndef IOQUEUE_H diff --git a/include/item.h b/include/item.h index 1c9e4cd5b..ccd17077e 100644 --- a/include/item.h +++ b/include/item.h @@ -26,9 +26,9 @@ * --- * * item.h: Definitions for item characteristics stuff - * + * * Known contributors to this file: - * + * */ #ifndef ITEM_H diff --git a/include/journal.h b/include/journal.h index f23443044..879f19d01 100644 --- a/include/journal.h +++ b/include/journal.h @@ -26,7 +26,7 @@ * --- * * journal.h: Log a journal of events to a file - * + * * Known contributors to this file: * Markus Armbruster, 2004-2008 */ diff --git a/include/land.h b/include/land.h index 24f40cd80..0414e361c 100644 --- a/include/land.h +++ b/include/land.h @@ -26,7 +26,7 @@ * --- * * land.h: Definitions for land units - * + * * Known contributors to this file: * Thomas Ruschak, 1992 * Ken Stevens, 1995 diff --git a/include/loan.h b/include/loan.h index d18c4d88a..847442b68 100644 --- a/include/loan.h +++ b/include/loan.h @@ -26,9 +26,9 @@ * --- * * loan.h: Definitions for loans - * + * * Known contributors to this file: - * + * */ #ifndef LOAN_H diff --git a/include/lost.h b/include/lost.h index 6ceb1706f..9c0ca5931 100644 --- a/include/lost.h +++ b/include/lost.h @@ -26,7 +26,7 @@ * --- * * lost.h: Definitions for lost items - * + * * Known contributors to this file: * Steve McClure, 1997 */ diff --git a/include/lwp.h b/include/lwp.h index 4a7ca2ce8..d63f4f8fc 100644 --- a/include/lwp.h +++ b/include/lwp.h @@ -6,12 +6,12 @@ * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. - * + * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the Free * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. diff --git a/include/map.h b/include/map.h index b87a21035..9590f6ecf 100644 --- a/include/map.h +++ b/include/map.h @@ -26,9 +26,9 @@ * --- * * map.h: Definitions for making maps - * + * * Known contributors to this file: - * + * */ #ifndef MAP_H diff --git a/include/match.h b/include/match.h index b87c1495e..e82d4d64c 100644 --- a/include/match.h +++ b/include/match.h @@ -26,9 +26,9 @@ * --- * * match.h: Used for string compare matching - * + * * Known contributors to this file: - * + * */ #ifndef MATCH_H diff --git a/include/misc.h b/include/misc.h index 1cc47d065..758a6e788 100644 --- a/include/misc.h +++ b/include/misc.h @@ -27,7 +27,7 @@ * * misc.h: Misc. definitions which don't really belong anywhere, * but have to go somewhere! - * + * * Known contributors to this file: * Doug Hay, 1998 */ @@ -95,7 +95,7 @@ void exit_nomem(void) ATTRIBUTE((noreturn)); extern char *getstarg(char *input, char *prompt, char buf[]); extern char *getstring(char *prompt, char buf[]); extern char *ugetstring(char *prompt, char buf[]); - + extern char *prbuf(char *format, ...) ATTRIBUTE((format (printf, 1, 2))); diff --git a/include/mission.h b/include/mission.h index 2d67b4351..73ff44b44 100644 --- a/include/mission.h +++ b/include/mission.h @@ -26,7 +26,7 @@ * --- * * mission.h: Definitions for things having to do with missions. - * + * * Known contributors to this file: * Ken Stevens, 1995 */ diff --git a/include/nat.h b/include/nat.h index ba6268fbc..f150de381 100644 --- a/include/nat.h +++ b/include/nat.h @@ -26,7 +26,7 @@ * --- * * nat.h: Definitions for things having to do with nations - * + * * Known contributors to this file: * Thomas Ruschak * Ken Stevens, 1995 diff --git a/include/news.h b/include/news.h index 5665a92fa..9e5e2a3d3 100644 --- a/include/news.h +++ b/include/news.h @@ -26,7 +26,7 @@ * --- * * news.h: Definitions for Empire News - * + * * Known contributors to this file: * Dave Pare * Thomas Ruschak diff --git a/include/nsc.h b/include/nsc.h index a5c0d3af3..11c01ea65 100644 --- a/include/nsc.h +++ b/include/nsc.h @@ -26,7 +26,7 @@ * --- * * nsc.h: Definitions for Empire conditionals - * + * * Known contributors to this file: * Dave Pare, 1989 * Markus Armbruster, 2004-2008 diff --git a/include/nuke.h b/include/nuke.h index ef176d4b8..9f6caba17 100644 --- a/include/nuke.h +++ b/include/nuke.h @@ -26,7 +26,7 @@ * --- * * nuke.h: Definitions for things having to do with nukes - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/include/optlist.h b/include/optlist.h index 27da78b94..571c468b5 100644 --- a/include/optlist.h +++ b/include/optlist.h @@ -26,7 +26,7 @@ * --- * * optlist.h: Definitions of option listings - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1998 diff --git a/include/path.h b/include/path.h index 04c2d8f1b..c927a88a9 100644 --- a/include/path.h +++ b/include/path.h @@ -26,9 +26,9 @@ * --- * * path.h: Definitions for directions, paths, etc. - * + * * Known contributors to this file: - * + * */ #ifndef PATH_H diff --git a/include/plague.h b/include/plague.h index a57fb0f8f..661e89825 100644 --- a/include/plague.h +++ b/include/plague.h @@ -26,9 +26,9 @@ * --- * * plague.h: plague defines. - * + * * Known contributors to this file: - * + * */ #ifndef PLAGUE_H diff --git a/include/plane.h b/include/plane.h index d15289044..e392050dc 100644 --- a/include/plane.h +++ b/include/plane.h @@ -26,7 +26,7 @@ * --- * * plane.h: Definitions for planes and plane types - * + * * Known contributors to this file: * Dave Pare, 1986 * Ken Stevens, 1995 diff --git a/include/player.h b/include/player.h index f6ab9b563..64c589fe1 100644 --- a/include/player.h +++ b/include/player.h @@ -26,7 +26,7 @@ * --- * * player.h: Definitions for player information (threads) - * + * * Known contributors to this file: * Dave Pare, 1994 * Doug Hay, 1998 diff --git a/include/power.h b/include/power.h index 41a54ff8a..f77e5db09 100644 --- a/include/power.h +++ b/include/power.h @@ -26,9 +26,9 @@ * --- * * power.h: Definitions for things having to do with the power report. - * + * * Known contributors to this file: - * + * */ #ifndef POWER_H diff --git a/include/product.h b/include/product.h index ed45dfc2d..795e4d381 100644 --- a/include/product.h +++ b/include/product.h @@ -26,9 +26,9 @@ * --- * * product.h: Definitions for things having to do with products - * + * * Known contributors to this file: - * + * */ #ifndef PRODUCT_H diff --git a/include/proto.h b/include/proto.h index 183e0008d..8b1327ffb 100644 --- a/include/proto.h +++ b/include/proto.h @@ -26,7 +26,7 @@ * --- * * proto.h: Protocol for client - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/include/prototypes.h b/include/prototypes.h index cfc98cb80..ca671226a 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -26,7 +26,7 @@ * --- * * prototypes.h: Prototypes for server functions - * + * * Known contributors to this file: * Curtis Larsen, 1998 * Steve McClure, 1998,2000 @@ -54,7 +54,7 @@ extern void finish_server(void); /* in empthread.h */ /* - * src/lib/commands/ *.c + * src/lib/commands/ *.c */ extern int check_market(void); extern void gift(natid, natid, void *, char *); @@ -253,7 +253,7 @@ int xedit(void); int zdon(void); /* - * src/lib/common/ *.c + * src/lib/common/ *.c */ /* bestpath.c */ extern char *bestownedpath(char *, char *, int, int, int, int, int); @@ -315,7 +315,7 @@ extern int demandupdatecheck(void); /* in xdump.h */ /* - * src/lib/gen/ *.c + * src/lib/gen/ *.c */ /* fnameat.c */ extern char *fnameat(const char *, const char *); @@ -344,13 +344,13 @@ extern char *plurize(char *buf, int max_len, int n); /* more in misc.h */ /* - * src/lib/global/ *.c + * src/lib/global/ *.c */ extern void global_init(void); /* - * src/lib/player/ *.c + * src/lib/player/ *.c */ /* accept.c */ extern void player_init(void); @@ -392,7 +392,7 @@ extern void stop_service(void); /* more in service.h */ /* - * src/lib/subs/ *.c + * src/lib/subs/ *.c */ /* askyn.c */ extern int confirm(char *); @@ -701,7 +701,7 @@ extern int typed_wu(natid, natid, char *, int); extern int wu(natid, natid, char *, ...) ATTRIBUTE((format (printf, 3, 4))); /* - * src/lib/update/ *.c + * src/lib/update/ *.c */ /* age.c */ extern void age_levels(int); diff --git a/include/queue.h b/include/queue.h index 73d3eac12..a7d11a1dd 100644 --- a/include/queue.h +++ b/include/queue.h @@ -26,9 +26,9 @@ * --- * * queue.h: Generic vax-like doubly linked list queues - * + * * Known contributors to this file: - * + * */ #ifndef QUEUE_H diff --git a/include/retreat.h b/include/retreat.h index 5046d64ef..481f2982c 100644 --- a/include/retreat.h +++ b/include/retreat.h @@ -26,7 +26,7 @@ * --- * * retreat.h: Things having to do with retreating - * + * * Known contributors to this file: * Ken Stevens, 1995 */ diff --git a/include/sect.h b/include/sect.h index c1bce2639..d0f14bfe3 100644 --- a/include/sect.h +++ b/include/sect.h @@ -26,7 +26,7 @@ * --- * * sect.h: Definitions for things having to do with sectors. - * + * * Known contributors to this file: * Dave Pare * Ken Stevens, 1995 diff --git a/include/server.h b/include/server.h index d7d45fccb..3cf987ddd 100644 --- a/include/server.h +++ b/include/server.h @@ -26,7 +26,7 @@ * --- * * server.h: Server startup, control and shutdown - * + * * Known contributors to this file: * Markus Armbruster, 2004-2008 */ diff --git a/include/service.h b/include/service.h index af574688b..135518c14 100644 --- a/include/service.h +++ b/include/service.h @@ -26,7 +26,7 @@ * --- * * service.h: Windows services support - * + * * Known contributors to this file: * Ron Koenderink, 2004 */ diff --git a/include/ship.h b/include/ship.h index c660be296..38efe9f9a 100644 --- a/include/ship.h +++ b/include/ship.h @@ -26,7 +26,7 @@ * --- * * ship.h: Definitions for things having to do with ships - * + * * Known contributors to this file: * Dave Pare * Thomas Ruschak, 1992 diff --git a/include/tel.h b/include/tel.h index 0454a6909..fef925038 100644 --- a/include/tel.h +++ b/include/tel.h @@ -26,9 +26,9 @@ * --- * * tel.h: Definitions for things having to do with telegrams - * + * * Known contributors to this file: - * + * */ #ifndef TEL_H diff --git a/include/trade.h b/include/trade.h index 074a77da4..581d245b8 100644 --- a/include/trade.h +++ b/include/trade.h @@ -27,7 +27,7 @@ * * trade.h: Definitions for trading units/ships/planes in a time delay * system - * + * * Known contributors to this file: * Dave Pare * Pat Loney, 1992 diff --git a/include/treaty.h b/include/treaty.h index 31491eeff..2f8f2d919 100644 --- a/include/treaty.h +++ b/include/treaty.h @@ -26,7 +26,7 @@ * --- * * treaty.h: Definitions for treaties - * + * * Known contributors to this file: * Steve McClure, 1998 */ diff --git a/include/types.h b/include/types.h index affa913c0..128234db4 100644 --- a/include/types.h +++ b/include/types.h @@ -26,7 +26,7 @@ * --- * * types.h: Empire types - * + * * Known contributors to this file: * Markus Armbruster, 2006-2007 */ diff --git a/include/unit.h b/include/unit.h index b9fe96bc6..e072bb579 100644 --- a/include/unit.h +++ b/include/unit.h @@ -26,12 +26,12 @@ * --- * * unit.h: Generalize unit data structures and functions. - * + * * Known contributors to this file: * Ron Koenderink, 2006-2007 * Markus Armbruster, 2006 */ - + #ifndef UNIT_H #define UNIT_H diff --git a/include/update.h b/include/update.h index 6fd58d75a..36d89cbee 100644 --- a/include/update.h +++ b/include/update.h @@ -26,9 +26,9 @@ * --- * * update.h: Include headers used for updates - * + * * Known contributors to this file: - * + * */ #ifndef UPDATE_H diff --git a/include/version.h b/include/version.h index b4aed2c6f..6ffa7d929 100644 --- a/include/version.h +++ b/include/version.h @@ -26,7 +26,7 @@ * --- * * version.h: Version information - * + * * Known contributors to this file: * Thomas Ruschak, 1992 * Ken Stevens, 1995 diff --git a/include/xdump.h b/include/xdump.h index 8010fbad1..5a27dbf53 100644 --- a/include/xdump.h +++ b/include/xdump.h @@ -26,7 +26,7 @@ * --- * * xdump.h: Extended dumps - * + * * Known contributors to this file: * Markus Armbruster, 2008 */ diff --git a/include/xy.h b/include/xy.h index b3c1cbe67..cf176b46c 100644 --- a/include/xy.h +++ b/include/xy.h @@ -26,7 +26,7 @@ * --- * * xy.h: Constants having to do with world locations. - * + * * Known contributors to this file: * Steve McClure, 1998 */ diff --git a/info/Attacking.t b/info/Attacking.t index 18a139edc..a30249507 100644 --- a/info/Attacking.t +++ b/info/Attacking.t @@ -60,7 +60,7 @@ If you are not paradropping, then you will be asked for mil and units you would like to attack with. You must always leave at least 1 mil in the sector or ship you are attacking from, so you may never attack -with all of your mil out of a sector or ship. +with all of your mil out of a sector or ship. The following limitations apply to the aggressor's mil: .NF Attack: You are limited by the mobility of the attacking sector @@ -335,7 +335,7 @@ in "assault", "paradrop", "board" or "lboard"). When you move your mil into the target sector after an attack, you will risk the same chances of interdiction (number of mil / 200) and stepping on land mines (see "info lmine") as -if you were moving them using the "move" command. +if you were moving them using the "move" command. .s1 Similarly, once you have specified which land units you'd like to move into the conquered sector, then all of your units will move in at diff --git a/info/Autonav.t b/info/Autonav.t index 6fcc34bc0..15ee1e6e9 100644 --- a/info/Autonav.t +++ b/info/Autonav.t @@ -11,7 +11,7 @@ specified destination. This is done via the \*Qorder\*U command. Each ship can be ordered to proceed to a destination. During each update, the ship will try and use ALL the mobility it has and use the shortest possible path. It will also avoid any known mines (sectors marked -with an 'X' or 'x' on your bmap). Note that this movement is all +with an 'X' or 'x' on your bmap). Note that this movement is all done before mobility is accumulated, so that after the update is complete the ship will have a full updates worth of mobility in case you need to move it by hand. Should a ship be fired upon diff --git a/info/Basics.t b/info/Basics.t index 604b249a9..4b76a39c7 100644 --- a/info/Basics.t +++ b/info/Basics.t @@ -29,10 +29,10 @@ as he/she/it will be watching who is playing what. .s1 Bugs: if you find a bug, you are REQUIRED to report it to the deity. -I will not let other people know about the bug +I will not let other people know about the bug and in most cases, you may exploit it until it is fixed. Punishment for use without telling: at least $50,000 or -getting your country removed from the game. +getting your country removed from the game. .s1 Denial-of-service attacks are forbidden. Any form of attack that prevents a player from connecting to the server is against the rules. diff --git a/info/CHANGES.CHAINSAW.t b/info/CHANGES.CHAINSAW.t index afde02c26..da13e6b57 100644 --- a/info/CHANGES.CHAINSAW.t +++ b/info/CHANGES.CHAINSAW.t @@ -70,7 +70,7 @@ ways to kill them, but not by shelling or bombing. A bridge can be built in any sector adjacent to one of yours, providing that the target sector is adjacent to a non-sea, non-bridge sector. Since bridgeheads are not required, you can't collapse bridges by killing the head. -(You can still kill them by taking the bridge below 20%) This also fixes a +(You can still kill them by taking the bridge below 20%) This also fixes a problem with planes on bridges not dying when the bridge dies. (This was partly fixed before, but the fix didn't work all the time) .s1 @@ -210,7 +210,7 @@ assaulted, or shelled. .s1 Your ships/sects will no longer shoot themselves in defense. You can cheerfully blast your own ships/sects without fear of -retaliation from your own forces. You can also torp your own +retaliation from your own forces. You can also torp your own ships, and they will resignedly watch as the torps slam into them. .s1 Gun ranges are no longer truncated. Instead, there is a % chance equal to the @@ -248,7 +248,7 @@ You may now upgrade allied ships. (If ALLYHARBOR is used) .s1 Your civs will work on allied ships in your harbors. (If ALLYHARBOR is used) .s1 -You may assault your own sectors. Mil assaulting are simply added to the +You may assault your own sectors. Mil assaulting are simply added to the number in the sector. .s1 You may now land planes on a carrier in an allied harbor. (If ALLYHARBOR is @@ -301,7 +301,7 @@ a fuel usage of 1 get 10 mob for every 1 fuel, ships with 2 fuel usage get 10 mob for 2 fuel, etc. Ships with no fuel do not get mobility. Ships with a fuel usage of 0 do not need fuel. (Sailing ships & nuc ships/subs) .s1 -A new command, "fuel" is added. It allows fueling from a harbor sector, or a +A new command, "fuel" is added. It allows fueling from a harbor sector, or a ship or ships with the "oiler" flag. When fueling, petrol and/or oil in the harbor or on the oiler is exchanged for fuel points, which are loaded on the ship. Petrol is used first, if available, at a rate of 1 pet = 10 fuel. If @@ -433,12 +433,12 @@ Changes to the Chainsaw code in version 2.1 Chainsaw 2.1 has some minor differences from Chainsaw 2.0. .s1 Now, when navigating, sonar or radar commands will -default to the current ship, or the first (lowest +default to the current ship, or the first (lowest numbered) ship in a group. You may override this by specifying the desired ship on the command line. (I.e. "r 12" or "radar 212", etc) .s1 -The chance of a plane aborting is changed to +The chance of a plane aborting is changed to (100-eff)%. This means that if a 100% plane takes a hit for 30% damage, it has a 30% chance to abort. If it then takes another hit for 20% more, a total of 50% damage, @@ -449,11 +449,11 @@ aborting until after all ships have fired, rather than rolling every time the plane takes a flak hit from a ship. .s1 -A new command has been added, the 'payoff' command. +A new command has been added, the 'payoff' command. It shows the value of trade ships if scuttled at the current sect (check info payoff). .s1 -Constants have been added to control ship & plane +Constants have been added to control ship & plane efficiency growth rate. It is now possible to allow 2xETUS growth in efficiency, 3x, etc. .s1 @@ -466,7 +466,7 @@ reads only telegrams & bulletins. .s1 When assaulting, troops will always leave at least 1 food on the ship. .s1 -You may now build multiples of an item by adding a build count at the +You may now build multiples of an item by adding a build count at the end of your build command. (see info build) .s1 You may now give comments in the hours file. Comment lines start with a @@ -486,9 +486,9 @@ Chainsaw 2.2 has some minor differences from Chainsaw 2.1. .s1 A new option, SNEAK_ATTACK is included. It can only be used in conjunction with SLOW_WAR. It allows you to attack a sector of -someone you're not at war with. Once attacked, the attacker +someone you're not at war with. Once attacked, the attacker automatically declares war against the defender, and pays $5K. -At that point, the attacker has to go through the normal SLOW_WAR +At that point, the attacker has to go through the normal SLOW_WAR procedure before attacking again. See info attack, info assault. SNEAK_ATTACKs may not be done by parachute. .s1 @@ -565,7 +565,7 @@ will attempt to load or unload food as necessary to get ship 4 to 10 food. Land units have been added. There are many new commands for dealing with them. Look at info Land-units for a general overview. .s1 -Sectors that don't have enough food at the update will now attempt to +Sectors that don't have enough food at the update will now attempt to draw food from supply sources. (see info supply for details on supply sources. Conquered sectors will not draw food) Other sectors/ships/units will now draw supplies (mostly shells) when they @@ -585,7 +585,7 @@ them all at once. See info build for more details. Distribution has been changed. Each sector now has a distribution sector rather than a distribution path (during the update, the least-cost path is found and used) Also, importing & exporting via distribute now happen -in separate phases, rather than being mingled. See info distribute +in separate phases, rather than being mingled. See info distribute and info update-sequence for a full description. Read info distribute, or don't cry. .s1 @@ -609,12 +609,12 @@ may also take lcms or hcms to build. Show sector build will show this. A new command, cede, allows you to give a sector or ship to a neighbor. See info cede for more details. .s1 -There are several new information commands, such as neweff and +There are several new information commands, such as neweff and starvation. See the info pages for details. .s1 Sectors are damaged by combat occurring in them. See info attack for details. .s1 -Missions may be given to ships/planes/units, allowing them to interdict +Missions may be given to ships/planes/units, allowing them to interdict enemy movement, support friendly attacks & defense, and other things. See info mission for details. .s1 @@ -634,7 +634,7 @@ you first lose uw's, then civs, then mil. As before, no more than 1/2 the total population of a sector can starve in one update. Example: if you have 200 uw's, 100 mil, and 500 civilians, and no food, normally you'd have 100 uw's, 50 mil, and 250 civs after the update. With NEW_STARVE in effect, you'd have 0 uw's, -300 civilians, and 100 mil. +300 civilians, and 100 mil. .s1 NEW_WORK: When moving civs to or from a sector with low work, the new loyalty and work percentage of the destination sector is computed proportionally. diff --git a/info/Clients.t b/info/Clients.t index 936d626fa..23b32df24 100644 --- a/info/Clients.t +++ b/info/Clients.t @@ -44,7 +44,7 @@ See the various info pages on these for complete documentation on how they work and how you can use them to help improve your clients. .s1 In addition, there is a "timestamp" field on each object (sectors, ships, -land units, planes, nuclear stockpiles, lost items) that you can use to +land units, planes, nuclear stockpiles, lost items) that you can use to compare against to keep data between clients and the database in sync with each other. These timestamps are kept in systems seconds, so they should be accurate down to 1 second. Every time an object is changed, it's diff --git a/info/Empire2.t b/info/Empire2.t index 056400714..201b073c1 100644 --- a/info/Empire2.t +++ b/info/Empire2.t @@ -287,9 +287,9 @@ then it will just keep resupplying itself until it finishes the job. Also, it now costs engineers 1 point of mobility per mine laid. .L - If land units are accompanied by engineers, then their chance of -hitting a land mine is reduced by a factor of 3. E.g. if there +hitting a land mine is reduced by a factor of 3. E.g. if there are 25 mines in the sector, then a land unit has a 33% -chance of hitting a land mine. If it is accompanied by an +chance of hitting a land mine. If it is accompanied by an engineer, then that chance drops to 11%. .L - If an engineer sweeps a land mine that it cannot carry, it drops diff --git a/info/Empire3.t b/info/Empire3.t index 56c4cfbcb..09f5f60b1 100644 --- a/info/Empire3.t +++ b/info/Empire3.t @@ -110,7 +110,7 @@ You now have 50 realms. Each country now has two bmaps, their 'working' bmap and their 'true' bmap. The true bmap contains only information put there by the server. The working bmap also contains information put there by the bdes and sharebmap commands. The 'bmap' command usually displays the -working bmap unless the player specifies 'bmap true'. +working bmap unless the player specifies 'bmap true'. If the players working bmap becomes corrupted somehow, then they can type 'bmap revert' to revert their working bmap back to their true bmap. This change was necessary to prevent abuse of the new 'sharebmap' command (which compares the players true bmaps when diff --git a/info/Empire4.t b/info/Empire4.t index f9be59491..a892fdbe0 100644 --- a/info/Empire4.t +++ b/info/Empire4.t @@ -524,7 +524,7 @@ Changes to Empire 4.3.10 - Thu Sep 6 17:59:53 UTC 2007 shutdown aborted it. The bug allowed players to delay update and shutdown indefinitely. * Thread priorities are only implemented by LWP and no longer used. - With LWP, they let players with a sufficiently fast connection + With LWP, they let players with a sufficiently fast connection starve out the threads that clean the lost file and kill idle connections. Drop them. * Show nuke rounded required research incorrectly. @@ -736,7 +736,7 @@ Changes to Empire 4.3.6 - Tue Jun 20 18:46:18 UTC 2006 in 4.0.2), and trains could be sent down paths without rail (never worked). Also fixes unit reaction path cost. * The custom table reader can now deal with sector, item, product and - infra tables more comfortably. + infra tables more comfortably. * Remove option BIG_CITY. Deities can customize the sect table to get the same effect. * Many more selectors can now be compared with names, not just @@ -1641,7 +1641,7 @@ Changes to Empire 4.2.13 - Fri Feb 13 22:12:36 UTC 2004 * News no longer call all sub-launched missiles nuclear. * Incoming missiles are now reported with coordinates. * Removed some code that served no purpose except crashing on - Windows. + Windows. * Fixed Mac OSX and AIX build problems. * Don't resolve player IP addresses for now, because it can crash with certain versions of GNU libc. @@ -1736,7 +1736,7 @@ Changes to Empire 4.2.8 - Mon Oct 9 17:35:35 MDT 2000 * Updated order of firing flak in Flak.t. * Fixed 80% efficient planes on ships must be maintained. * Fixed initial MOB_ACCESS check thread sleep time was set by an uninitialized - variable. + variable. * Removed "TEMPORARILY DISABLED" message from mission command for escort missions. Escort missions have been re-enabled since 4.0.15. * Using sonar from the navigate command will print the sonar map. @@ -1871,7 +1871,7 @@ Changes to Empire 4.2.6 - Fri Jun 4 05:55:20 PDT 1999 * Fixed bug in sectors that don't revolt not showing up as lost items. * Fixed bug where maps with an X of exactly 200 is not drawing third line. * Fixed bug where MOB_ACCESS was not updating the mobility just before - the update. + the update. * Fixed bug in the way treaties are examined and sometimes produce wrong results. * Fixed edit to allow creating negative mobility for sectors. @@ -1902,7 +1902,7 @@ Changes to Empire 4.2.5 - Mon Mar 1 06:42:24 PST 1999 * Fixed bug where scrapping land units was creating military. * Fixed description of sect_mob_neg_factor in econfig file. * Increased speed of PT boats. - + Changes to Empire 4.2.4 - Tue Feb 2 05:47:44 PST 1999 * Added check to make military values match up correctly for land units. @@ -1914,7 +1914,7 @@ Changes to Empire 4.2.4 - Tue Feb 2 05:47:44 PST 1999 * Fixed bug in explore command not setting mobility to correct value when MOB_ACCESS was enabled. * Fixed bug in enlist setting mobility incorrectly sometimes. - * Added doc/backup file for deities which recommends how backups and + * Added doc/backup file for deities which recommends how backups and restores of the data directory should be done. Changes to Empire 4.2.3 - Wed Jan 13 06:02:35 PST 1999 @@ -2039,7 +2039,7 @@ Changes to Empire 4.2.2 - Sun Dec 27 12:46:34 PST 1998 * Fixed bug where satellites were not orbiting the world during the update. * Fixed bug in torpedos being too smart. They knew how to jump over - land! :) Now the "line_of_sight" routine is used to determine if a + land! :) Now the "line_of_sight" routine is used to determine if a torpedo has a straight path to the destination. If it doesn't, the torpedo no longer jumps over land, but instead slams into it. This was an interesting bug because you could torp ships on the other side of @@ -2055,9 +2055,9 @@ Changes to Empire 4.2.2 - Sun Dec 27 12:46:34 PST 1998 destination sector. Goods are now attempted to be returned to the start sector, and apporpriate steps taken if the start sector is no longer available. - * Fixed march to prompt you before you abandon a sector you own by + * Fixed march to prompt you before you abandon a sector you own by marching out the last land unit. - * Fixed check functions to only check the relevant portions of the structure + * Fixed check functions to only check the relevant portions of the structure and not the timestamp info that doesn't affect how the object functions. * Fixed bug in spy command that always told you if a spy unit was in a non-owned sector. @@ -2105,7 +2105,7 @@ Changes to Empire 4.2.2 - Sun Dec 27 12:46:34 PST 1998 gained information that you wouldn't normally know.) * Merged bestpath and bestownedpath and wrote new wrappers, "BestShipPath" and "BestAirPath" to use it properly. It is also good to note that - bestownedpath is used to determine paths for ships and for planes, + bestownedpath is used to determine paths for ships and for planes, and that best_path (which uses the A* algorithm) is used for all land based paths, and that the two are never interchanged. * Removed "jet recon" plane (it slipped in during the PLANENAMES conversion, @@ -2118,7 +2118,7 @@ Changes to Empire 4.2.1 - Tue Nov 3 12:56:20 PST 1998 properly, and thus causing crashes when accessing certain plane routines. This happened during the move to make the PLANENAMES option run-time configurable. - + Changes to Empire 4.2.0 - Thu Oct 29 06:27:15 PST 1998 * Bumped rev to 4.2.0 since this is a major release (the server is now run-time configurable for just about everything and is released under @@ -2281,7 +2281,7 @@ Changes to Empire 4.0.18 - Thu Sep 24 06:54:27 PDT 1998 * Updated Education.t * Modified (increased) chances of hitting mines slightly. * Removed unused variables from shp_check_mines. - + Changes to Empire 4.0.17 - Fri Jul 31 06:12:21 PDT 1998 * Added ability in edit to change coastal flag for sectors. * Added ability in edit to edit plague values for ships. @@ -2299,7 +2299,7 @@ Changes to Empire 4.0.17 - Fri Jul 31 06:12:21 PDT 1998 (works for sea and land mines, used "lmine" to distinguish it from "min" which determines mineral (iron) content of a sector.) * No longer able to pin bomb land units on a ship. - * Land units are required to have at least one military loaded to perform + * Land units are required to have at least one military loaded to perform a mission. * Firing land units are required to have at least on military loaded to be able to fire (or return fire.) @@ -2315,7 +2315,7 @@ Changes to Empire 4.0.17 - Fri Jul 31 06:12:21 PDT 1998 they were not cargo capable. * Fixed bug in potentially crashing in update code for nations tech/research. * Fixed bug in execute putting you into execute mode incorrectly. - * Fixed bug in board not allowing land units to board from 0 mobility + * Fixed bug in board not allowing land units to board from 0 mobility sectors. * Fixed bug where interdicted land units that were missed displayed a "SPLASH! Bombs miss your ships" message. @@ -2405,7 +2405,7 @@ Changes to Empire 4.0.16 - Fri Jun 12 08:52:06 EDT 1998 before.) * Fixed bug in neweff not reporting stopped sectors. It now (correctly) reports them as not changing eff. - + Changes to Empire 4.0.15 - Wed May 20 12:35:53 EDT 1998 * Fixed the spelling of Markus' name in CHANGES4.0 files. * Added Markus' patches/fixes. Some are detailed below. @@ -2426,7 +2426,7 @@ Changes to Empire 4.0.15 - Wed May 20 12:35:53 EDT 1998 * Fixed bug in setsector telling the deity coordinates of sectors being granted/taken away. * Fixed bug in setting budget of enlistment sectors to 0. - + Changes to Empire 4.0.14 - Wed Apr 8 08:47:54 EDT 1998 * Fixed time_t problem in common/log.c * Fixed bug in headlines @@ -2436,7 +2436,7 @@ Changes to Empire 4.0.14 - Wed Apr 8 08:47:54 EDT 1998 * Fixed bug in printing of "No ship(s)" twice in cargo command when no ships were selected. * Temporarily disabled escort missions until a fix is found. They are - randomly crashing the server. + randomly crashing the server. * Fixed morale.t to reflect that retreat percentage is based off of morale_base and not 75. * Fixed bug in bridgefall where planes and units on ship in a sector @@ -2446,7 +2446,7 @@ Changes to Empire 4.0.14 - Wed Apr 8 08:47:54 EDT 1998 * Fixed bug in produce command reporting incorrect costs (sometimes). * Land units on ships will now try to draw supply from the ship they are on. - + Changes to Empire 4.0.13 - Mon Mar 2 11:04:28 EST 1998 * Fixed bug in distribute when world sizes are other than 64x32 * Fixed bug in getcommand (not really a bug, just made it work like @@ -2455,10 +2455,10 @@ Changes to Empire 4.0.13 - Mon Mar 2 11:04:28 EST 1998 * Fixed building of POSIX threads on Alpha running Digital Unix. * Fixed line_of_sight prototype in sona.c * Fixed fairland not to conuse stupid C++ compilers. - + Changes to Empire 4.0.12 - Tue Feb 24 11:27:31 EST 1998 * Fixed client build on linux (whoops) - + Changes to Empire 4.0.11 - Tue Feb 10 10:53:10 EST 1998 * AIX build seems to only work with gcc right now (but at least that works) * Vax Ultrix (vaxultrix) build should work now (hopefully) out of the box. @@ -2473,7 +2473,7 @@ Changes to Empire 4.0.11 - Tue Feb 10 10:53:10 EST 1998 * Fixed bug where spies were not dying when damaged. * Fixed bug in HIDDEN mods in declare command not printing country # of uncontacted country correctly (or at all as a matter of fact) - + Changes to Empire 4.0.10 - Mon Aug 18 12:34:58 EDT 1997 * Fixed bug where fleets were being interdicted but the damage was being spread to ships not in the same sectors. @@ -2507,7 +2507,7 @@ Changes to Empire 4.0.10 - Mon Aug 18 12:34:58 EDT 1997 a sector. * Documented mountains only holding and using 1/10th of the normal sector population in Sector-types.t. - * Fixed documentation on ship's firing ranges in fire.t to be less + * Fixed documentation on ship's firing ranges in fire.t to be less ambiguous. * Updated nukes in nuke.t * Added apropos command (thanks to Mike Wise) @@ -2515,7 +2515,7 @@ Changes to Empire 4.0.10 - Mon Aug 18 12:34:58 EDT 1997 there are two files of the same name, and you don't get a complete match, then whichever file is found first in the directory is used. * Changed documentation in wantupd.h - + Changes to Empire 4.0.9 - Sat Apr 19 23:01:51 EDT 1997 * Fixed dump info pages that were getting formatted funny. * Fixed improve info page. @@ -2583,7 +2583,7 @@ Changes to Empire 4.0.8 - Wed Feb 26 23:00:51 EST 1997 This was major because it affected timestamp values which are more than 65535. * Fixed bug in sdump.c for typo in reporting the trade ships origin. - + Changes to Empire 4.0.7 - Mon Feb 24 22:48:54 EST 1997 * Fixed bug in aircombat.c when calculating the air combat odds. Negative numbers were screwing things up good... @@ -2618,7 +2618,7 @@ Changes to Empire 4.0.7 - Mon Feb 24 22:48:54 EST 1997 * Spies caught in Neutral or Friendly countries cause the Neutral or Friendly country to go Hostile towards the owner of the spy. * Tweaked ammunition numbers for artillery units. - * No more automatic declarations of War should be made. You will go + * No more automatic declarations of War should be made. You will go hostile, but since going to war doesn't increase your countries defenses, and is purely political, it is left to the player to go that final step. @@ -2712,7 +2712,7 @@ Changes to Empire 4.0.4 - Mon Dec 9 11:00:00 EST 1996 * Fixed doconfig.c to create directories with right modes. * Fixed install macros in makefiles to move binaries to the right places. - + Changes to Empire 4.0.3 - Wed Dec 4 22:46:53 EST 1996 * Added HP/UX port. * Fixed doconfig.c (put exit(0) at the end of main.) @@ -2747,7 +2747,7 @@ Changes to Empire 4.0.2 - Mon Oct 14 12:26:40 EDT 1996 * Fixed attack value in attack_val in lndsub.c * Fixed lload in commands/load.c * Fixed defense_val in lndsub.c - Made it a minimum of 1, so that units will - always fight until dead or retreating. 0 makes them get stuck. + always fight until dead or retreating. 0 makes them get stuck. * Fixed update/deliver.c - no delivery of non-oldowned civvies (or anything else for that matter.) * Fixed llook in commands/look.c @@ -2831,7 +2831,7 @@ Changes to Empire 4.0.0 - Wed Aug 21 1996 * Added NO_LCMS, NO_HCMS and NO_OIL options. When any of these options are enabled, you don't need any of that type of material to build things. If NO_HCMS is enabled, you don't need HCMS to build bridges, you need - lcms. If both NO_HCMS and NO_LCMS are enabled, then you don't need + lcms. If both NO_HCMS and NO_LCMS are enabled, then you don't need any materials to build a bridge. * There is no mobility cost for assigning missions. But, there is also no longer any benefit for being on a mission either. @@ -2886,7 +2886,7 @@ Changes to Empire 4.0.0 - Wed Aug 21 1996 * Che can now be lessened by making happiness. If you have more happiness than your conquered populace, they don't fight as hard or recruit as much. If you have less than them, they fight harder and recruit more. - It's not much though - it ranges from 2.0 in your favor to only 0.8 + It's not much though - it ranges from 2.0 in your favor to only 0.8 against you (whereas it was always 1.0 before.) So, it definitely favors the attackers to make lots of happy now. * Bridgeheads can only be built on coasts. diff --git a/info/Flak.t b/info/Flak.t index 502763223..beb85dfb5 100644 --- a/info/Flak.t +++ b/info/Flak.t @@ -20,7 +20,7 @@ The way that flak works when planes fly over a sector is: scaled by unit tech factor. .fi .s1 -In addition, if you are pin-bombing a land unit or a ship, when +In addition, if you are pin-bombing a land unit or a ship, when you make your bombing run, the specific unit/ship you are bombing gets to fire flak at you again. This number of guns firing flak in these cases does NOT saturate. diff --git a/info/Infrastructure.t b/info/Infrastructure.t index 688275ada..e83cb3aaf 100644 --- a/info/Infrastructure.t +++ b/info/Infrastructure.t @@ -53,7 +53,7 @@ Use the "improve" command to improve the infrastructure of your sectors. To find out the required amounts of materials, mobility, and money use the "show sect build" command. .s1 -Also, defensive infrastructure is not always improvable. See the version +Also, defensive infrastructure is not always improvable. See the version info to see if the DEFENSE_INFRA option is enabled or not. If it is not enabled, the defense infrastructure of the sector is always the same as the efficiency of the sector. If it is enabled, you must improve your diff --git a/info/Land-units.t b/info/Land-units.t index a7abe25b6..89b4169bd 100644 --- a/info/Land-units.t +++ b/info/Land-units.t @@ -8,10 +8,10 @@ abilities. With the addition of land units, mil are now more or less considered to be militia instead of military, and are less important. .s1 The way that military are incorporated into units are that the mil are -loadable commodities of the unit. The offensive or defensive +loadable commodities of the unit. The offensive or defensive .s1 Commands for land units are generally similar to those of planes/ships, and -will usually start with 'l'. +will usually start with 'l'. .s1 .L "Land unit characteristics" .s1 @@ -58,7 +58,7 @@ morale checks, see info \*QAttacking\*U) Just as you can use \*Qrange\*U to chan range of your planes and control how far away they'll intercept, you can change the reaction radius for land units with \*Qlrange\*U. Units with a base reaction radius of 0, or those whose radius you have set to 0, will not react. -When built, the unit will have as its reaction radius set to zero. +When built, the unit will have as its reaction radius set to zero. .s1 .L Cargo .s1 @@ -126,7 +126,7 @@ in other sector types, but at a much reduced efficiency (1/3rd normal gain) .s1 .L "Land unit statistics" .s1 -Each land unit has certain vital statistics which show how it will +Each land unit has certain vital statistics which show how it will operate. These are obtainable from the show command: .s1 .EX show land statistics @@ -175,7 +175,7 @@ units' visibility (see info \*Qllookout\*U for more details). Spy is the other side of the equation, i.e. how well can the unit find things? A unit with a low spy won't be very good at locating other units, and won't be able to report much when it encounters them in battle. A high-spy unit -will be able to use the \*Qllookout\*U command with more chance of success, and +will be able to use the \*Qllookout\*U command with more chance of success, and will be able to more accurately report information about the units it runs into in battle. (See info \*QAttacking\*U for information about intelligence reports) Units with radar capacity also use their spy value to determine how @@ -291,7 +291,7 @@ When you decide to attack a sector, you can use mil and units from adjacent sectors. The attack value of your forces is the combined attack values of all attacking land units, plus the number of mil coming in from adjacent sectors. .s1 -The defense value is equal to the mil in the defending sector, plus +The defense value is equal to the mil in the defending sector, plus the defense values of any defending units in the sector, as well as any that react and move there. .s1 diff --git a/info/Novice.t b/info/Novice.t index ed75a7821..fb5ea5dd3 100644 --- a/info/Novice.t +++ b/info/Novice.t @@ -238,7 +238,7 @@ The first thing you want is land. Lots of land. A whole hell of a lot of land. You should try to expand your country from the very beginning. -From there, you'll meet your neighbors who are doubtlessly +From there, you'll meet your neighbors who are doubtlessly doing the same thing you're doing. Expanding wildly. Now comes the first of a series of decisions you have to make. @@ -255,13 +255,13 @@ about 20% agribusinesses (later dropping to 10%, 5%, or even none at all!), and a few schools, research, parks, etc. to fill up some of the other space. -The most important thing to have is a good transportation system +The most important thing to have is a good transportation system in the form of your highways. Anywhere from 20-40% of your country should be highways. You'll find them infinitely useful in moving food to a starving sector, taking people to a new settlement, -or transporting troops to a local revolution, highways are vital! +or transporting troops to a local revolution, highways are vital! .s1 Another important consideration is \*Qdo you want really want to win?\*U This implies the idea of competing @@ -335,7 +335,7 @@ Try to get a hold of nukes to devastate them. Form a cartel with other small nations and try to run over a big country. As in real life, the possibilities are endless! -Look at the Middle East, they're having fun, right? +Look at the Middle East, they're having fun, right? .s1 This is just a game, and from this point on, you don't have to worry about watching over your nation too closely. @@ -410,7 +410,7 @@ You can do this for all of your sectors using a command like And give a threshold for each of your sectors as prompted. .s1 Now at each update, -Empire will move food to and from your warehouse +Empire will move food to and from your warehouse in an attempt to satisfy all your threshold requirements. If for example a certain sector has more than its allotted threshold of a certain product @@ -435,7 +435,7 @@ Empire would move all iron off your iron mine (except for one unit), try to put 45 iron on your lcm factory and take all lcm's (except for one) off your lcm plant -(possibly to be used somewhere else). +(possibly to be used somewhere else). .s1 Note: the order in which this happens is predictable, but not always desirable. @@ -489,7 +489,7 @@ Sector -2,0 (the distribution sector for 4,0) will attempt to keep 400 units of food in 4,0 by importing or exporting as necessary. .s1 -.EX thresh oil 4,0 100 +.EX thresh oil 4,0 100 This command is the same as above, but will instead attempt to keep 100 units of oil. .s1 diff --git a/info/Old-empire.t b/info/Old-empire.t index 2a0ef6361..10bc5aa9b 100644 --- a/info/Old-empire.t +++ b/info/Old-empire.t @@ -10,7 +10,7 @@ So you want to try the New Empire Huh? Okay, I have written this document with YOU in mind! Welcome to the University of California at Berkeley's Empire! (From now on called UCB Empire). -There are a whole bunch of changes in the game +There are a whole bunch of changes in the game since we last played, so I need to bring you up to date. .s1 Our OLD EMPIRE game was Version 1.2 - @@ -40,7 +40,7 @@ and you can make an \*Qannouncement\*U to the World. In the OLD game - you simply dug up ORE and sent it to the Shell, Defense, etc. factory to have it processed into something else -(make guns, shells, etc). +(make guns, shells, etc). .s1 But in the NEW game - sectors are a lot more complex. For one thing curtain sectors CAN'T even PRODUCE @@ -55,7 +55,7 @@ Uranium Mines (need at least 40 TECH) Other sectors can produce normally, even though your TECH level is still 0. Keep in mind that you CAN DESIGNATE the ABOVE sectors - -but they won't produce until you reach the desired TECH LEVEL. +but they won't produce until you reach the desired TECH LEVEL. .s1 Also, it takes more \*QMaterials\*U to make 1 Unit of a finished product. diff --git a/info/Overview.t b/info/Overview.t index 265126d09..d3ee1529c 100644 --- a/info/Overview.t +++ b/info/Overview.t @@ -110,7 +110,7 @@ Most commands that are not merely informative cost BTU's. .s1 BTU's are generated by your country's capital. The more efficient your capital, the more BTU's that are generated. -The number of BTU's also depend on the game's settings.. See the +The number of BTU's also depend on the game's settings.. See the output of the 'version' command for an estimate of BTU generation speeds. However, you may have a maximum of 512 BTU's at any one time. And once your BTU's reach zero, you may not issue any commands @@ -226,7 +226,7 @@ code, most notably, Dave Pare added plane units in 1986, Jeff Bailey added many configurable options in the KSU distribution, Thomas Ruschak added land units and missions in 1992-1993 and released the "Chainsaw" server, and Ken Stevens rewrote much of the server code in -1995 and released the "Empire2" server, and Steve McClure and the Wolfpack +1995 and released the "Empire2" server, and Steve McClure and the Wolfpack made lots of other changes and released the "Empire4" server in August of 1996. .in diff --git a/info/Research.t b/info/Research.t index c3b79344f..b7eb20eb8 100644 --- a/info/Research.t +++ b/info/Research.t @@ -3,7 +3,7 @@ .LV Expert .sp .s1 -If the RES_POP option is in use, +If the RES_POP option is in use, the research level of a country determines the maximum number of civilians and uw's that can live in a sector. For ordinary sectors, the maximum is: diff --git a/info/Sector-types.t b/info/Sector-types.t index 8ab9d65d6..372389ac4 100644 --- a/info/Sector-types.t +++ b/info/Sector-types.t @@ -71,9 +71,9 @@ described in \*Qinfo capital \*U. Capitals are typically better at defending against attack than other sectors, except fortresses. .s1 -PARK - Parks are provided solely for the convenience of the +PARK - Parks are provided solely for the convenience of the people. -Parks require construction materials to provide maintenance +Parks require construction materials to provide maintenance services and add to a nation's \*Qhappiness\*U level. .s1 @@ -118,7 +118,7 @@ FINANCIAL .s1 BANK - Banks are used for smelting and storing gold bars. They include a smelter to refine gold dust into gold bars. -While the bars are stored in the bank the busy little bankers +While the bars are stored in the bank the busy little bankers invest them and return a profit on their use. Banks are of the Fort Knox variety; they are more impervious to shelling than most other sectors, and military in them fight harder @@ -170,7 +170,7 @@ AGRIBUSINESS - These sectors are large farms and provide food. Agribusiness sectors produce much more food than other sectors. .s1 OIL - Oil fields produce oil by pumping it out of the ground. -.s1 +.s1 REFINERY - Refineries produce petroleum by processing oil. .s1 LIGHT - Light manufacturing plants produce light construction materials diff --git a/info/Syntax.t b/info/Syntax.t index 8e7178b44..6e68fa01d 100644 --- a/info/Syntax.t +++ b/info/Syntax.t @@ -10,7 +10,7 @@ The Empire Shell (command interpreter) expects input in the form: .EX VERB ARG1 ARG2 ... VERB is any one of the Empire commands on the \*Qcommand list\*U -(what you see when you type \*Qlist\*U-- e.g. +(what you see when you type \*Qlist\*U-- e.g. \*Qmap\*U, \*Qmove\*U, \*Qinfo\*U, etc). .s1 The number of ARGs varies from command to command. @@ -92,7 +92,7 @@ have food delivery. Note that \*Qhix\*U, \*Qhiy\*U, and \*Q?cond\*U are all optional. Also, the entire \*Qlox:hix,loy:hiy\*U section may be replaced by either \*Q#\*U, \*Q#0\*U, \*Q#1\*U, \*Q#2\*U, -or \*Q#3\*U, ... which refer to +or \*Q#3\*U, ... which refer to \*Qrealm\*Us which you can define. (See \*Qinfo realm\*U.) Note that \*Q#\*U and \*Q#0\*U are equivalent. Also \*Q*\*U refers to diff --git a/info/Taxes.t b/info/Taxes.t index 966ef78c4..d6d29c92f 100644 --- a/info/Taxes.t +++ b/info/Taxes.t @@ -32,5 +32,5 @@ already have made the technological investment. .s1 Also note that captured civilians only pay 1/4 the normal taxes. They like to hide money until they are all finally agree to become naturalized -citizens of their new government. +citizens of their new government. .SA "Updates, Nations" diff --git a/info/Technology.t b/info/Technology.t index 20ec5afa9..8411bb767 100644 --- a/info/Technology.t +++ b/info/Technology.t @@ -85,7 +85,7 @@ chance that your tech level will increase by one third of the difference between your tech level and the minimum tech. .fi .s1 -Note that if the TECH_POP option is enabled, technology costs +Note that if the TECH_POP option is enabled, technology costs proportionately more $$$ to make as your civilian population grows past 50,000 civilians. .s1 diff --git a/info/Trade-ships.t b/info/Trade-ships.t index ce29cadd4..3a3c69c20 100644 --- a/info/Trade-ships.t +++ b/info/Trade-ships.t @@ -40,7 +40,7 @@ Currently, the return rates are: For example, if you sail the ship 10 sectors from the harbor where it was built and scuttle it in a harbor there, you would get 125% of the money you paid for it, or $2188. If you sailed it 15 sectors to a harbor and scuttled it, -you would get 153%, or $2678. +you would get 153%, or $2678. .s1 Use the \*Qpayoff\*U command to see how much the trade ship would pay were it scuttled in a harbour at its present location. diff --git a/info/anti.t b/info/anti.t index 4086a3450..c0a4bcaf0 100644 --- a/info/anti.t +++ b/info/anti.t @@ -27,8 +27,8 @@ Units do not participate in the anti command. A sector can revert to the old owner while your units are stuck in it. .s1 Note that che are finicky. If you manage to lose a sector fighting them, -they do unpredictable things. -They may all come out of hiding to join the +they do unpredictable things. +They may all come out of hiding to join the military. A few may stay in hiding while the majority come out to join the military. Who knows what else they may do. .s1 diff --git a/info/assault.t b/info/assault.t index e8c8a0275..b255d5e57 100644 --- a/info/assault.t +++ b/info/assault.t @@ -17,7 +17,7 @@ This represents the use of the Admiral's gig, the Captain's barge, etc. Note that some ships will have the semi-lander flag, which allows them to land 25% of their troops. .s1 -If you have land units with the 'assault' ability +If you have land units with the 'assault' ability aboard the ship assaulting, you will be asked if you wish them to join in the assault as well. Assaulting units pay one update's worth of mobility, except for marine diff --git a/info/bdes.t b/info/bdes.t index eda649b11..d5a0444b1 100644 --- a/info/bdes.t +++ b/info/bdes.t @@ -7,7 +7,7 @@ Bdes allows you to change a sector of your bmap. .s1 Bmap differs from map in that it reflects everything you've learned about the world. If, for example, you navigate near a sector and find -out that it is as sea, it will show up on your bmap as sea, even if it +out that it is as sea, it will show up on your bmap as sea, even if it doesn't show up on your map. .s1 When you get new information, it will overwrite the designation you put in diff --git a/info/bestpath.t b/info/bestpath.t index 6318feb07..f51347266 100644 --- a/info/bestpath.t +++ b/info/bestpath.t @@ -3,7 +3,7 @@ .LV Expert .SY "bestpath " .s1 -The bestpath command shows you the best path from any sector +The bestpath command shows you the best path from any sector to any sector. You must own both sectors. .s1 The path shown by bestpath is the cheapest diff --git a/info/bmap.t b/info/bmap.t index 08a8a559f..c03cdb564 100644 --- a/info/bmap.t +++ b/info/bmap.t @@ -10,7 +10,7 @@ A bmap gives you a graphic representation of all or part of your country. .s1 Bmap differs from map in that it reflects everything you've learned about the world. If, for example, you navigate near a sector and find -out that it is sea, it will show up on your bmap as sea, even if it +out that it is sea, it will show up on your bmap as sea, even if it doesn't show up on your map. .s1 Note that bmap shows the \*QLAST KNOWN INFORMATION\*U you have about @@ -65,7 +65,7 @@ and also put the bmap in the file called \*Qmapfil\*U. You can also give the number of a ship, and bmap will give you a small bmap centered on the location of that ship, provided you own it. .s1 -If you use lbmap, you can get a bmap around a land unit. +If you use lbmap, you can get a bmap around a land unit. If you use pbmap, you can get a bmap around a plane. If you use sbmap, you can get a bmap around a ship. If you use nbmap, you can get a bmap around a nuke. diff --git a/info/board.t b/info/board.t index e2cca18d1..b32a6e3e2 100644 --- a/info/board.t +++ b/info/board.t @@ -7,7 +7,7 @@ combat. To board ship #16 from ship #93 you might type: .EX board 16 .s1 -The program will ask from which ship or sector you wish to board, +The program will ask from which ship or sector you wish to board, (you may only board from one ship at a time), how many troops to board with, and which land units (having "assault" capability) to board with. .s1 diff --git a/info/bomb.t b/info/bomb.t index f4bc083b3..c77fa73fe 100644 --- a/info/bomb.t +++ b/info/bomb.t @@ -36,7 +36,7 @@ The assembly point must be owned by you or an ally, or you or an ally must have a ship there. It must not be more than four sectors away from any of the planes selected for the mission. .s1 -Route is a normal empire path specification. You may also give a +Route is a normal empire path specification. You may also give a destination sector on the command line, or at any time while giving the route, and empire will use the best path from the current sector to the desired destination sector. @@ -67,14 +67,14 @@ at the target sector, your force must still contend with any flak guns which your enemy has stationed there. What's more, any enemy ship in the target sector will also shoot at each of your bombers before any attacks are performed. -Any enemy land units with the 'flak' ability will also fire at +Any enemy land units with the 'flak' ability will also fire at all your planes at this time. .s1 A well-equipped fleet of battleships in a heavily-defended harbor can be very risky to attack, even though hitting ships in harbor is like shooting fish in a barrel. .s1 -When bombing ships/planes/units, entering a '~' character will cause a +When bombing ships/planes/units, entering a '~' character will cause a particular plane not to bomb. Other planes on the mission will still be asked for their targets. .s1 @@ -93,7 +93,7 @@ sector which has fuel in it. .s1 When you pin-bomb a land unit, it will fire flak at the plane bombing it, unless -it has an AA fire rating of 0. +it has an AA fire rating of 0. .s1 In the case of pinpoint bombing, see \*Qinfo Hitchance\*U for the formula determining whether a plane hits its target. diff --git a/info/build.t b/info/build.t index 10ede4b32..28a40e4bd 100644 --- a/info/build.t +++ b/info/build.t @@ -56,7 +56,7 @@ military crew. So, for maximum efficiency growth, put full crews on your newly built ships and leave them in harbor until they reach 100%. .s1 -The work required to add a point of efficiency to a ship is +The work required to add a point of efficiency to a ship is .s1 .NF (20 + (lcm_to_build + 2 * hcm_to_build))/100 @@ -66,7 +66,7 @@ Ships at sea have only their crews to make repairs. A small crew on a large ship may not be able to make any repairs at all. (Moral: keep your ships fully crewed in anticipation of future damage.) -Repairs at sea do not use any lcms or hcms, but may not push the +Repairs at sea do not use any lcms or hcms, but may not push the efficiency of a ship over 80%. .s1 AIRFIELD SECTORS & BUILDING PLANES @@ -80,7 +80,7 @@ A plane is not capable of leaving the ground until it has reached 40% efficiency. Planes below 10% efficiency are destroyed. .s1 -The work required to add a point of efficiency to a plane is +The work required to add a point of efficiency to a plane is .s1 .NF (20 + (lcm_to_build + 2 * hcm_to_build))/100 @@ -89,7 +89,7 @@ The work required to add a point of efficiency to a plane is Planes will also gain efficiency in non-airport sectors, but at only 1/3rd the normal rate. .s1 -Planes on carriers will also gain +Planes on carriers will also gain efficiency. The amount of work available is based on the carrier's crew, and the rate is the same as a non-airport sector. Repairs at sea do not use any materials, but may not push the @@ -101,11 +101,11 @@ Land units are built in headquarters sectors. In order to build a land unit, you must have 10% of the items listed by \*Qshow\*U available at the time of building. The land unit will appear at 10% efficiency (a unit of less than 10% efficiency is -dead). Then, +dead). Then, each update, the unit will grow in efficiency, and use up more of the required goods until it reaches 100%. .s1 -The work required to add a point of efficiency to a land unit is +The work required to add a point of efficiency to a land unit is .s1 .NF (20 + (lcm_to_build + 2 * hcm_to_build))/100 diff --git a/info/cargo.t b/info/cargo.t index af302571f..446761c1b 100644 --- a/info/cargo.t +++ b/info/cargo.t @@ -3,7 +3,7 @@ .LV Basic .SY "cargo [ | ]" .SY "lcargo [ | ]" -The cargo command lists the commodities on board your ships +The cargo command lists the commodities on board your ships in readable format. The lcargo command does the same for land units. .s1 The , , and arguments are diff --git a/info/coastwatch.t b/info/coastwatch.t index 4de64d919..df45aab42 100644 --- a/info/coastwatch.t +++ b/info/coastwatch.t @@ -22,7 +22,7 @@ Pandora (#5) oil derrick #74 @3, -9 Galexis (#2) destroyer #35 @-3, 11 .FI .s1 -Note that subs will NOT show up on coastwatch, unless they are in a +Note that subs will NOT show up on coastwatch, unless they are in a sector you own. .s1 .SA "skywatch, lookout, Sector-types, radar, Ships, Detection" diff --git a/info/convert.t b/info/convert.t index 1a8914512..3c2fbcd5b 100644 --- a/info/convert.t +++ b/info/convert.t @@ -11,7 +11,7 @@ is no longer occupied (i.e. you become the "oldowner" of the sector). After the program has collected any necessary information it will list each sector where civilians are converted. .s1 -Note: you must have enough military in the sectors to force the +Note: you must have enough military in the sectors to force the populace to become uncompensated workers -- about 10%. Land units count toward this at a value equal to the number of mil required to build them. Security units are even more efficient, counting for diff --git a/info/cutoff.t b/info/cutoff.t index 3a95bd9f6..bb6053a51 100644 --- a/info/cutoff.t +++ b/info/cutoff.t @@ -2,7 +2,7 @@ .NA cutoff "List delivery thresholds" .LV Expert .SY "cutoff " -The cutoff report provides information about the various +The cutoff report provides information about the various delivery cutoff levels in some or all of the sectors that you occupy. .s1 diff --git a/info/deliver.t b/info/deliver.t index 91ebc6b35..dc18adcb5 100644 --- a/info/deliver.t +++ b/info/deliver.t @@ -40,7 +40,7 @@ Will set iron delivery threshold to 80 in all mines. Will list all lcm delivery specifications. (Sectors with no delivery threshold or direction will not be listed). .s1 -The census and commodity reports will indicate deliveries by the +The census and commodity reports will indicate deliveries by the same characters used to specify them in this command. .s1 If, during an update, the destination sector is not owned by you, diff --git a/info/distribute.t b/info/distribute.t index fc3d55107..9d6af56c8 100644 --- a/info/distribute.t +++ b/info/distribute.t @@ -82,7 +82,7 @@ will flow to and from the warehouse. .s1 .L "Finding sectors with not dist point set" .s1 -If you want to find sectors with no distribution point set, use the +If you want to find sectors with no distribution point set, use the xdist and ydist selectors: .s1 .EX level # ?xdist=xloc&ydist=yloc diff --git a/info/drop.t b/info/drop.t index d3db42dfd..00039930e 100644 --- a/info/drop.t +++ b/info/drop.t @@ -24,7 +24,7 @@ four sectors away from any of the planes selected for the mission. is the name of a commodity which is to be carried along on all of the planes which have a transport capacity. .s1 -Route is a normal empire path specification. You may also give a +Route is a normal empire path specification. You may also give a destination sector on the command line, or at any time while giving the route, and empire will use the best path from the current sector to the desired destination sector. diff --git a/info/dump.t b/info/dump.t index 8b848ca20..400511e8b 100644 --- a/info/dump.t +++ b/info/dump.t @@ -3,7 +3,7 @@ .LV Expert .SY "dump []" The dump command displays all information on -some or all of the sectors you occupy. +some or all of the sectors you occupy. dump is a combination of census, commodity, cutoff and level. Each sector's information is printed on one very long line. Fields are separated by a single space. diff --git a/info/fly.t b/info/fly.t index 09339679f..b426c2ff7 100644 --- a/info/fly.t +++ b/info/fly.t @@ -24,7 +24,7 @@ four sectors away from any of the planes selected for the mission. on all of the planes which have a transport capacity. If nothing is specified, then nothing will be carried. .s1 -Route is a normal empire path specification. You may also give a +Route is a normal empire path specification. You may also give a destination sector on the command line, or at any time while giving the route, and empire will use the best path from the current sector to the desired destination sector. diff --git a/info/launch.t b/info/launch.t index bb39b0cbe..974f4c226 100644 --- a/info/launch.t +++ b/info/launch.t @@ -44,7 +44,7 @@ The formula for the chance that a missile hits its target is in .s1 In the case of non-marine tactical missiles, if there are any HOSTILE abm's within range of the target sector, then two of them will fire in -an attempt to intercept the incoming missile. +an attempt to intercept the incoming missile. .s1 Similarly, two AT_WAR a-sat's will attempt to intercept any satellites you attempt to launch within their range. Also, if the sector you are @@ -52,7 +52,7 @@ launching your satellite at is owned by a non-allied country, then they will get a telegram informing them of the positioning of the satellite. See below for details of a satellite's orbit path. .s1 -When launching missiles, there is a +When launching missiles, there is a % chance equal to (5 + 100 - efficiency) * (1 - techfactor) that the missile will blow up on the launching pad instead of launching. diff --git a/info/lbmap.t b/info/lbmap.t index 091ec0e72..a2a9e4821 100644 --- a/info/lbmap.t +++ b/info/lbmap.t @@ -10,7 +10,7 @@ A bmap gives you a graphic representation of all or part of your country. .s1 Bmap differs from map in that it reflects everything you've learned about the world. If, for example, you navigate near a sector and find -out that it is sea, it will show up on your bmap as sea, even if it +out that it is sea, it will show up on your bmap as sea, even if it doesn't show up on your map. .s1 Note that bmap shows the \*QLAST KNOWN INFORMATION\*U you have about @@ -67,7 +67,7 @@ and also put the bmap in the file called \*Qmapfil\*U. You can also give the number of a ship, and bmap will give you a small bmap centered on the location of that ship, provided you own it. .s1 -If you use lbmap, you can get a bmap around a land unit. +If you use lbmap, you can get a bmap around a land unit. If you use pbmap, you can get a bmap around a plane. If you use sbmap, you can get a bmap around a ship. If you use nbmap, you can get a bmap around a nuke. diff --git a/info/lcargo.t b/info/lcargo.t index 12827422c..8b0833430 100644 --- a/info/lcargo.t +++ b/info/lcargo.t @@ -3,7 +3,7 @@ .LV Basic .SY "cargo [ | ]" .SY "lcargo [ | ]" -The cargo command lists the commodities on board your ships +The cargo command lists the commodities on board your ships in readable format. The lcargo command does the same for land units. .s1 The , , and arguments are diff --git a/info/ldump.t b/info/ldump.t index 3ab5215a7..a9f584c16 100644 --- a/info/ldump.t +++ b/info/ldump.t @@ -3,7 +3,7 @@ .LV Expert .SY "ldump []" The ldump command displays all information on -some or all of your land units. +some or all of your land units. ldump is a combination of land, lcargo, and lstat. Each ship's information is printed on one very long line. Fields are separated by a single space. diff --git a/info/level.t b/info/level.t index b26d859ed..1bbcb41f1 100644 --- a/info/level.t +++ b/info/level.t @@ -2,7 +2,7 @@ .NA level "List distribution thresholds" .LV Basic .SY "level " -The level report provides information about the various +The level report provides information about the various distribution thresholds in some or all of the sectors that you occupy. .s1 diff --git a/info/lload.t b/info/lload.t index 0c3a9ee57..4d2b33400 100644 --- a/info/lload.t +++ b/info/lload.t @@ -6,7 +6,7 @@ .SY "lload land " The load command carries out the loading of units. Commodities (like guns, civs, food) can be loaded onto any unit capable -of carrying them (to see what cargos a unit can carry, use the show command). +of carrying them (to see what cargos a unit can carry, use the show command). .s1 Some land units can carry extra-light planes (typically these are SAM's) @@ -26,7 +26,7 @@ than that amount, the commodity will be unloaded. For example, .EX load food 3 -100 .s1 will cause unit 3 to load or unload food so that it has 100. -If it had 120 food, 20 would be unloaded. If it had 50 food, +If it had 120 food, 20 would be unloaded. If it had 50 food, 50 would be loaded. .s1 .SY "lload plane " diff --git a/info/lmap.t b/info/lmap.t index 6ecb1304e..333aa04d5 100644 --- a/info/lmap.t +++ b/info/lmap.t @@ -53,7 +53,7 @@ own it). If you use nmap, you can get a map that shows new sector designations instead of old sector designations of your own country. .s1 -If you use lmap, you can get a map around a land unit. +If you use lmap, you can get a map around a land unit. If you use pmap, you can get a map around a plane. If you use smap, you can get a map around a ship. If you use nmap, you can get a map around a nuke. diff --git a/info/load.t b/info/load.t index 78f296207..6ac474dbc 100644 --- a/info/load.t +++ b/info/load.t @@ -5,14 +5,14 @@ .SY "load plane " .SY "load land " The load command carries out the loading of ships. -Commodities (like guns, civs, food) can be loaded onto any ship. +Commodities (like guns, civs, food) can be loaded onto any ship. Missiles can be loaded onto nuke subs and planes can be loaded onto carriers. Land units may be loaded onto many ships. .s1 The ship(s) must be in a harbor and the harbor must be at least 2% efficient. -.s1 +.s1 .SY "load " In the first form, the amount argument specifies the amount of the given commodity @@ -26,17 +26,17 @@ than that amount, the commodity will be unloaded. For example, .EX load food 3 -100 .s1 will cause ship 3 to load or unload food so that it has 100. -If it had 120 food, 20 would be unloaded. If it had 50 food, +If it had 120 food, 20 would be unloaded. If it had 50 food, 50 would be loaded. .s1 .SY "load plane " -In the second form, +In the second form, where you say \*Qplane\*U instead of say \*Qciv\*U planes are loaded onto ships. Multiple planes may be given. Some may not be loaded, if there is not enough room. .s1 .SY "load land " -In the third form, +In the third form, where you say \*Qland\*U instead of say \*Qciv\*U, a unit is loaded onto a ship. Multiple units may be given. Some may not be loaded, if there is not enough room. (Note that planes on @@ -52,14 +52,14 @@ each items that can be carried on each ship type. .s1 If you are loading things onto FRIENDLY ships, you need to type the numbers of the ships, fleets or realms -will not work. I.e. if you do "load f s 999", it'll load 999 food onto +will not work. I.e. if you do "load f s 999", it'll load 999 food onto all your ships in fleet s. If you do "load 1/2/3/4 999 f", it'll try to load food onto ships 1, 2, 3, and 4, regardless of whether they're yours or they belong to a friendly trading partner. .s1 If you load something onto a friendly nation's ship, it becomes his and he gets a telegram. If you load a unit, he gets any planes it -may be carrying. +may be carrying. .s1 If you unload a plane or unit in a friendly nation's harbor, it becomes his. If you unload a unit, he gets any planes it may be carrying. diff --git a/info/lost.t b/info/lost.t index c27d76efc..2e180ea55 100644 --- a/info/lost.t +++ b/info/lost.t @@ -18,7 +18,7 @@ command does not remove items from the database. That is where the timestamp functionality becomes important. .s1 While the lost command does not take any arguments, it does -take the standard syntax for selecting information. +take the standard syntax for selecting information. (see \*Qinfo Selector\*U). .s1 A typical usage might be: diff --git a/info/lrange.t b/info/lrange.t index a8c475a56..91dc17efe 100644 --- a/info/lrange.t +++ b/info/lrange.t @@ -2,7 +2,7 @@ .NA lrange "Edit the reaction range of a unit" .LV Expert .SY "lrange " -The \*Qlrange\*U command is used to limit the maximum reaction radius of +The \*Qlrange\*U command is used to limit the maximum reaction radius of land units. This can be useful in restricting the area which a unit will attempt to defend. (see info attack for details of the reaction process) .s1 diff --git a/info/lretreat.t b/info/lretreat.t index 2011c6eee..573e8cca2 100644 --- a/info/lretreat.t +++ b/info/lretreat.t @@ -3,7 +3,7 @@ .LV Expert .SY "retreat [ | ] [] []" .SY "lretreat [ | ] [] []" -The retreat command allows you to examine or modify the retreat +The retreat command allows you to examine or modify the retreat paths and conditions of your ships or units. The following description is for ships. Land units are exactly the same, except of course that some of the retreat conditions (being sonared, depth charged, etc) don't apply. @@ -44,12 +44,12 @@ shp# ship type x,y fl path as flt? flags .s1 .L Overview .s1 -A player may give retreat orders for a ship or a fleet. Retreat +A player may give retreat orders for a ship or a fleet. Retreat orders include a set of conditions that determine when the fleet/ship will retreat, and a path that the fleet/ship will follow. When a condition is met for a particular ship, the \*Qas flt?\*U field is checked. If it is Yes, then every ship in that fleet with fleet retreat orders retreats -along the specified path. If it is no, then the retreat orders apply to +along the specified path. If it is no, then the retreat orders apply to that ship only, and only that ship retreats. .s1 When a ship is added to a fleet, it is given the retreat orders of that diff --git a/info/map.t b/info/map.t index a37d85521..4076177dd 100644 --- a/info/map.t +++ b/info/map.t @@ -51,7 +51,7 @@ own it). If you use nmap, you can get a map that shows new sector designations instead of old sector designations of your own country. .s1 -If you use lmap, you can get a map around a land unit. +If you use lmap, you can get a map around a land unit. If you use pmap, you can get a map around a plane. If you use smap, you can get a map around a ship. If you use nmap, you can get a map around a nuke. diff --git a/info/mission.t b/info/mission.t index a1f48f3ce..23c8eb6c6 100644 --- a/info/mission.t +++ b/info/mission.t @@ -111,7 +111,7 @@ This would make the unit interdict anything passing within 5 sectors of This would make the unit interdict anything passing within 2 sectors of 4,0, provided it was also within 5 sectors (the unit's range) of 0,0. .s1 -The op-sector/op-range concept allows you to restrict a unit's area of +The op-sector/op-range concept allows you to restrict a unit's area of interest to a small, important area, or just let it shoot at anything within range. .s1 @@ -124,8 +124,8 @@ perform that mission if done by the player. A unit stays on its mission until you cancel it, OR the unit acts. Any type of action not a part of a mission is sufficient, so marching, navigating, transporting, flying, reconing, -bombing, mining, paratrooping, being attacked, being -paratrooped on, retreating, etc, will all cause a unit to lose its +bombing, mining, paratrooping, being attacked, being +paratrooped on, retreating, etc, will all cause a unit to lose its mission status, but the unit could bomb/shell/etc AS PART OF A MISSION, and still retain its mission status. Also, land units with a reserve @@ -167,7 +167,7 @@ have mobility left. .s1 Damage done is divided amongst all units/ships/commodities moving. For example, if 6 ships were moving, and the interdiction mission did 18 points of -damage, each ship would take 3. +damage, each ship would take 3. .s1 Note that only ships with sonar and ASW planes can interdict subs. Also, the units may or may not detect the subs, so it's kind of random. The sub also @@ -188,8 +188,8 @@ sector that the commodities were moving into. .s1 Note also that forts will fire at enemy ships coming within range. You don't have to set anything for this, it -happens automatically. (Forts firing at enemy ships naving happens before -ships/planes/units interdicting ships, so if the enemy is using an area a +happens automatically. (Forts firing at enemy ships naving happens before +ships/planes/units interdicting ships, so if the enemy is using an area a lot, a fort will hurt him without costing you mob from planes) .s1 SUPPORT MISSIONS (planes only) @@ -239,9 +239,9 @@ owned sectors, some sea, some allied sectors, and some enemy sectors, it would try to intercept over any of them. .s1 When a plane enters a sector, any planes with air defense missions that are -at war with the owner of the plane will fly there to fight it. +at war with the owner of the plane will fly there to fight it. The air defense planes -encounter normal interception along the way (but do \*QNOT\*U trigger +encounter normal interception along the way (but do \*QNOT\*U trigger more air defense missions, but \*QMAY\*U be intercepted normally). Once the air defense planes get to the sector, they fight the plane. Then, if the owner of the sector diff --git a/info/move.t b/info/move.t index c755ef3aa..344e9782b 100644 --- a/info/move.t +++ b/info/move.t @@ -106,7 +106,7 @@ some damage to the sector you were moving into. .s1 .L "Unhappy civilians" .s1 -Also, when moving unhappy civilians (work percentage less than 100%), +Also, when moving unhappy civilians (work percentage less than 100%), unhappiness is contagious. The work percentage of the destination sector is computed by averaging the incoming civ's happiness with the happiness of the civs already there. For example, say you move diff --git a/info/nbmap.t b/info/nbmap.t index 1f9b900e0..76ccdf1dd 100644 --- a/info/nbmap.t +++ b/info/nbmap.t @@ -10,7 +10,7 @@ A bmap gives you a graphic representation of all or part of your country. .s1 Bmap differs from map in that it reflects everything you've learned about the world. If, for example, you navigate near a sector and find -out that it is sea, it will show up on your bmap as sea, even if it +out that it is sea, it will show up on your bmap as sea, even if it doesn't show up on your map. .s1 Note that bmap shows the \*QLAST KNOWN INFORMATION\*U you have about @@ -65,7 +65,7 @@ and also put the bmap in the file called \*Qmapfil\*U. You can also give the number of a ship, and bmap will give you a small bmap centered on the location of that ship, provided you own it. .s1 -If you use lbmap, you can get a bmap around a land unit. +If you use lbmap, you can get a bmap around a land unit. If you use pbmap, you can get a bmap around a plane. If you use sbmap, you can get a bmap around a ship. If you use nbmap, you can get a bmap around a nuke. diff --git a/info/ndump.t b/info/ndump.t index 4368b0aab..794b02cae 100644 --- a/info/ndump.t +++ b/info/ndump.t @@ -3,7 +3,7 @@ .LV Expert .SY "ndump " The ndump command displays all information on -some or all of the sectors you occupy. +some or all of the sectors you occupy. Each nuke's information is printed on one very long line. Fields are separated by a single space. .s1 diff --git a/info/nmap.t b/info/nmap.t index a50f70dee..5a7c17211 100644 --- a/info/nmap.t +++ b/info/nmap.t @@ -51,7 +51,7 @@ own it). If you use nmap, you can get a map that shows new sector designations instead of old sector designations of your own country. .s1 -If you use lmap, you can get a map around a land unit. +If you use lmap, you can get a map around a land unit. If you use pmap, you can get a map around a plane. If you use smap, you can get a map around a ship. If you use nmap, you can get a map around a nuke. diff --git a/info/order.t b/info/order.t index be39bec5e..2da8f54a9 100644 --- a/info/order.t +++ b/info/order.t @@ -1,7 +1,7 @@ .TH Command ORDER .NA order "Order a ship to auto-navigate" .LV Expert -.SY "order [c|r|s|d|l] +.SY "order [c|r|s|d|l] You use the \*Qorder\*U command to give sailing orders to ships. At each update, ships sailing under orders \*Qautonavigate\*U toward a specific destination sector. Telegrams notify you of arrivals. @@ -9,7 +9,7 @@ specific destination sector. Telegrams notify you of arrivals. ONLY merchant ship may be given orders, but in order to move during the update a ship must have at least one crew (which may be civilian or military, but not an uncompensated worker). Merchant ships are those that -have 0 for their firing range and gun limit values. +have 0 for their firing range and gun limit values. .s1 Note that your ships sailing on orders will be interdicted just as if you were navigating them by hand. @@ -23,17 +23,17 @@ points and clear all the cargo levels for the ship. .EX order s Suspend Orders .s1 If you want to keep orders but don't want the ship -to move during the update use the suspend option. +to move during the update use the suspend option. A quick look at \*Qsorder\*U will display the eta time as suspended. As long as a ship is suspended it will be unable to move -during the update. +during the update. .s1 .EX order r Resume Orders Resume will allow ships that have a suspended order to move -again. +again. .s1 -.EX order d [dest2|scuttle|-] Declare Orders +.EX order d [dest2|scuttle|-] Declare Orders .s1 To declare an order you have 3 options. .NF @@ -79,7 +79,7 @@ scuttle themselves at sea. .s1 .EX order l .s1 -Set cargo Levels. +Set cargo Levels. .NF Example: Cargo ship #109 is at your harbor in sector 10,0. You have agreed to trade 200 lcm and 100 hcm to your friend and @@ -103,45 +103,45 @@ shp # type [Starting] (Ending) .FI .s1 AutoNav Features. -.s1 +.s1 Whenever a ship is autoloading cargo, it will always wait until it loads -to capacity. If a ship does not load fully it will not move!!! +to capacity. If a ship does not load fully it will not move!!! Remember 'ships need food!!' unless the NOFOOD option is enabled. Set one of your cargo holds to load food or your ship will starve at sea. When unloading cargo, the ship will unload all goods listed in the cargo holds ONLY! It will not unload any extra good -manually placed on the ship. +manually placed on the ship. .s1 If you are dealing with civilians 1 will be left in either the sector or the harbor depending if your loading or unloading. In either case when you arrive at the other harbor all but 1 civ will be dumped into the harbor. Be careful if you set civilians -as one of your cargo levels. -.s1 +as one of your cargo levels. +.s1 You can set any commodity in the game to be loaded on the ship. However if you tell a ship to load a commodity it can not hold it will be ignored. Example: If you tell a battleship to load -Lcm, and of course it does not have that capability, see 'show ship +Lcm, and of course it does not have that capability, see 'show ship capability' that level will be ignored at the update. -Planes and Units are not commodities so they can not be loaded this way. -.s1 +Planes and Units are not commodities so they can not be loaded this way. +.s1 At update time, the most direct path from the ship to destination is calculated. Each ship is then autonavigated along that path to the best of its mobility. The path is calculated from what the player knows of the world (what you can see using the \*Qbmap\*U command). Open sea, bridges, harbors, and unexplored regions of the world are considered to be navigable. Your friend's harbors and bridges -may be uses as long as the harbor >= 2% and the bridge >= 60%. +may be uses as long as the harbor >= 2% and the bridge >= 60%. Your ships will also try to avoid any mines you have declared on your bmap. 'x' or 'X' characters. Should your ship hit a mine the ship will stop moving and its orders suspended. You bmap will also be updated -with a 'x' marking the sector for you. -.s1 +with a 'x' marking the sector for you. +.s1 If a ship sails in range of enemy forts they will be fired upon. Setting your ship to autonavigate into an area with good fort cover could result in many ships getting sunk fast. -However you could put an invasion fleet off someone's coast in a hurry. -.s1 +However you could put an invasion fleet off someone's coast in a hurry. +.s1 If the ship has a 'sweep' flag ships will try and sweep any mines if any are present as they move. .s1 @@ -151,7 +151,7 @@ adding sector information to the known world map. The autonav code will try and use as much mobility as possible and this is all done before mobility is gained from the update. After an update has completed -your ship will have mobility so it can be moved by hand if needed. +your ship will have mobility so it can be moved by hand if needed. .s1 Ships with capability fish or oil can be setup to \*Qload\*U from the sea sector. diff --git a/info/paradrop.t b/info/paradrop.t index ba6e9dbfc..150eb79dd 100644 --- a/info/paradrop.t +++ b/info/paradrop.t @@ -23,7 +23,7 @@ The assembly point must be owned by you or an ally, or you or an ally must have a ship there. It must not be more than four sectors away from any of the planes selected for the mission. .s1 -Route is a normal empire path specification. You may also give a +Route is a normal empire path specification. You may also give a destination sector on the command line, or at any time while giving the route, and empire will use the best path from the current sector to the desired destination sector. diff --git a/info/pbmap.t b/info/pbmap.t index 0dad3bdc1..271cb33bd 100644 --- a/info/pbmap.t +++ b/info/pbmap.t @@ -10,7 +10,7 @@ A bmap gives you a graphic representation of all or part of your country. .s1 Bmap differs from map in that it reflects everything you've learned about the world. If, for example, you navigate near a sector and find -out that it is sea, it will show up on your bmap as sea, even if it +out that it is sea, it will show up on your bmap as sea, even if it doesn't show up on your map. .s1 Note that bmap shows the \*QLAST KNOWN INFORMATION\*U you have about @@ -65,7 +65,7 @@ and also put the bmap in the file called \*Qmapfil\*U. You can also give the number of a ship, and bmap will give you a small bmap centered on the location of that ship, provided you own it. .s1 -If you use lbmap, you can get a bmap around a land unit. +If you use lbmap, you can get a bmap around a land unit. If you use pbmap, you can get a bmap around a plane. If you use sbmap, you can get a bmap around a ship. If you use nbmap, you can get a bmap around a nuke. diff --git a/info/pdump.t b/info/pdump.t index 28c60b935..cb8aeccd3 100644 --- a/info/pdump.t +++ b/info/pdump.t @@ -3,7 +3,7 @@ .LV Expert .SY "pdump []" The pdump command displays all information on -some or all of your planes. +some or all of your planes. pdump is a combination of plane and pstat. Each plane's information is printed on one very long line. Fields are separated by a single space. diff --git a/info/pmap.t b/info/pmap.t index 78ea74ccd..958640d0a 100644 --- a/info/pmap.t +++ b/info/pmap.t @@ -51,7 +51,7 @@ own it). If you use nmap, you can get a map that shows new sector designations instead of old sector designations of your own country. .s1 -If you use lmap, you can get a map around a land unit. +If you use lmap, you can get a map around a land unit. If you use pmap, you can get a map around a plane. If you use smap, you can get a map around a ship. If you use nmap, you can get a map around a nuke. diff --git a/info/power.t b/info/power.t index 62bf10d61..9ec6dfadd 100644 --- a/info/power.t +++ b/info/power.t @@ -85,7 +85,7 @@ power factor = ((power factor) * (nation tech level / 500)) power factor = ((power factor) * (research factor)) .FI .s1 -The research factor is either 1, if RES_POP is not being used, or 1+(max +The research factor is either 1, if RES_POP is not being used, or 1+(max pop in a sector)/10000, if it is being used. .s1 .SA "census, nation, Communication, Nations, Diplomacy" diff --git a/info/qorder.t b/info/qorder.t index 43c1d22e9..9cad2125e 100644 --- a/info/qorder.t +++ b/info/qorder.t @@ -18,10 +18,10 @@ shp# ship type [Starting] , (Ending) 1003 destroyer 2 [1-s:40] , ( ) .FI This report reads. -Cargo Ship #6 will sail to its starting sector, displayed -in the sorder, and load cargo hold 1 with 50 shells and cargo hold 2 with 500 +Cargo Ship #6 will sail to its starting sector, displayed +in the sorder, and load cargo hold 1 with 50 shells and cargo hold 2 with 500 light construction materials. Then sail to the ending sector, again -displayed in the sorder command, unload the cargo and load cargo hold +displayed in the sorder command, unload the cargo and load cargo hold 1 with 50 guns. -.s1 +.s1 .SA "order, sorder, bmap, navigate, ship, Ships, Autonav, Autofish" diff --git a/info/read.t b/info/read.t index 643fad980..5f1721764 100644 --- a/info/read.t +++ b/info/read.t @@ -6,7 +6,7 @@ The read command is used to read the telegrams sent you by other countries and by the game, (e.g. when you make a sale or are attacked). .sp -After reading all your telegrams you may delete them by +After reading all your telegrams you may delete them by specifying \*Qyes\*U or not by specifying \*Qno\*U as an argument. If an argument is not supplied then you will be prompted to either answer \*Qyes\*U or \*Qno\*U to delete the telegrams. diff --git a/info/recon.t b/info/recon.t index 2164ad39f..f6f8f6774 100644 --- a/info/recon.t +++ b/info/recon.t @@ -22,7 +22,7 @@ The assembly point must be owned by you or an ally, or you or an ally must have a ship there. It must not be more than four sectors away from any of the planes selected for the mission. .s1 -Route is a normal empire path specification. You may also give a +Route is a normal empire path specification. You may also give a destination sector on the command line, or at any time while giving the route, and empire will use the best path from the current sector to the desired destination sector. @@ -44,7 +44,7 @@ of the sub, from the sector in which it is first detected (which may not be the sector the sub is in, as plane sonar has a range dependent on acc, and a chance of finding a sub of ((100-acc)-(4-sub visib)*10))+((100-effic)/5) percent. -The sub being sonared may detect the sonar ping. +The sub being sonared may detect the sonar ping. .s1 Note that a plane must be at least 40% efficient before it can leave the ground. diff --git a/info/retreat.t b/info/retreat.t index 8c511938f..46030a408 100644 --- a/info/retreat.t +++ b/info/retreat.t @@ -3,7 +3,7 @@ .LV Expert .SY "retreat [ | ] [] []" .SY "lretreat [ | ] [] []" -The retreat command allows you to examine or modify the retreat +The retreat command allows you to examine or modify the retreat paths and conditions of your ships or units. The following description is for ships. Land units are exactly the same, except of course that some of the retreat conditions (being sonared, depth charged, etc) don't apply. @@ -44,12 +44,12 @@ shp# ship type x,y fl path as flt? flags .s1 .L Overview .s1 -A player may give retreat orders for a ship or a fleet. Retreat +A player may give retreat orders for a ship or a fleet. Retreat orders include a set of conditions that determine when the fleet/ship will retreat, and a path that the fleet/ship will follow. When a condition is met for a particular ship, the \*Qas flt?\*U field is checked. If it is Yes, then every ship in that fleet with fleet retreat orders retreats -along the specified path. If it is no, then the retreat orders apply to +along the specified path. If it is no, then the retreat orders apply to that ship only, and only that ship retreats. .s1 When a ship is added to a fleet, it is given the retreat orders of the diff --git a/info/sail.t b/info/sail.t index 34a08b282..4a511180c 100644 --- a/info/sail.t +++ b/info/sail.t @@ -44,7 +44,7 @@ shp# ship type x,y mobil mobquota follows path \*Qsail\*U, with the \*Q-\*U parameter, causes the sailing path for the ships specified to be removed. .s1 -The PATH is a normal empire path specification. You may *not* give a +The PATH is a normal empire path specification. You may *not* give a destination sector on the command line, or at any time while giving the route. Use the \*Qorder\*U command if you wish this functionality. .s1 diff --git a/info/sbmap.t b/info/sbmap.t index 56f4919c7..16e113bf7 100644 --- a/info/sbmap.t +++ b/info/sbmap.t @@ -10,7 +10,7 @@ A bmap gives you a graphic representation of all or part of your country. .s1 Bmap differs from map in that it reflects everything you've learned about the world. If, for example, you navigate near a sector and find -out that it is sea, it will show up on your bmap as sea, even if it +out that it is sea, it will show up on your bmap as sea, even if it doesn't show up on your map. .s1 Note that bmap shows the \*QLAST KNOWN INFORMATION\*U you have about @@ -67,7 +67,7 @@ and also put the bmap in the file called \*Qmapfil\*U. You can also give the number of a ship, and bmap will give you a small bmap centered on the location of that ship, provided you own it. .s1 -If you use lbmap, you can get a bmap around a land unit. +If you use lbmap, you can get a bmap around a land unit. If you use pbmap, you can get a bmap around a plane. If you use sbmap, you can get a bmap around a ship. If you use nbmap, you can get a bmap around a nuke. diff --git a/info/sdump.t b/info/sdump.t index bcd942f86..ea2deaf25 100644 --- a/info/sdump.t +++ b/info/sdump.t @@ -3,7 +3,7 @@ .LV Expert .SY "sdump []" The sdump command displays all information on -some or all of your ships. +some or all of your ships. sdump is a combination of ship, cargo, and sstat. Each ship's information is printed on one very long line. Fields are separated by a single space. diff --git a/info/shark.t b/info/shark.t index 662e390fa..aee8d2169 100644 --- a/info/shark.t +++ b/info/shark.t @@ -7,7 +7,7 @@ owner. The is the number of the loan you wish to buy. .s1 The loan must be in arrears. The holder of the note will recieve the value of the loan plus one periods worth of interest from your -treasury. The player who owes the money on the loan will be notified +treasury. The player who owes the money on the loan will be notified of the switch. After the loan is transfered you may collect on it as normal. .sp diff --git a/info/sinfrastructure.t b/info/sinfrastructure.t index 32afb64f1..abff6289f 100644 --- a/info/sinfrastructure.t +++ b/info/sinfrastructure.t @@ -39,7 +39,7 @@ the rail efficiency of the sector the mcost used to determine the mobility cost of moving trains through the sector. If the rail eff is 0, trains cannot move through this sector. .L "defense eff" -the defense efficiency of the sector. +the defense efficiency of the sector. .L "defense fact" the defense factor of the sector. This is how well the sector defends. All sectors start at 1, and improve (see "improve") from there to the maximum diff --git a/info/smap.t b/info/smap.t index 568d131cf..fdbf7a22c 100644 --- a/info/smap.t +++ b/info/smap.t @@ -53,7 +53,7 @@ own it). If you use nmap, you can get a map that shows new sector designations instead of old sector designations of your own country. .s1 -If you use lmap, you can get a map around a land unit. +If you use lmap, you can get a map around a land unit. If you use pmap, you can get a map around a plane. If you use smap, you can get a map around a ship. If you use nmap, you can get a map around a nuke. diff --git a/info/sonar.t b/info/sonar.t index c3a351191..0e1d8b81b 100644 --- a/info/sonar.t +++ b/info/sonar.t @@ -14,7 +14,7 @@ Only ships at sea may use sonar and sonar only detects ships which are at sea. Furthermore, there must be a straight line of water between the detector and the detected (sonar doesn't work around corners). .s1 -In the current implementation, sonar works similar to +In the current implementation, sonar works similar to lookout. The major difference is that a submarines cannot use lookout to sight ships. Likewise, submarines cannot be sighted by ships via lookout. @@ -90,7 +90,7 @@ If detection is above 7, then you will be told the ship type, and if it is above 9, you will also be told the owner of the sub. Note that type and owner will always be shown for Friendly subs. .s1 -Planes with the ASW ability can use +Planes with the ASW ability can use sonar while on recon missions. See info recon for more details. .s1 .SA "coastwatch, Ship-types, Sector-types, radar, recon, Ships, Detection" diff --git a/info/sorder.t b/info/sorder.t index e5f9b0c02..e3abf9dc3 100644 --- a/info/sorder.t +++ b/info/sorder.t @@ -31,5 +31,5 @@ Destroyer 1 is at sector -10,0 and only has orders to sail to sector 20,2. It needs to move 17 sectors and will arrive at 20,2 in 2 updates. When it arrives order will be cleared since only one destination order was given to it. -.s1 +.s1 .SA "order, qorder, bmap, navigate, ship, Ships, Autonav, Autofish" diff --git a/info/spy.t b/info/spy.t index b4833f9e7..f9294bc18 100644 --- a/info/spy.t +++ b/info/spy.t @@ -12,7 +12,7 @@ efficiency in neighboring sectors. .s1 The sectors denoted by are those from which you are spying, -(see \*Qinfo syntax\*U for format). +(see \*Qinfo syntax\*U for format). Note: you can only spy from sectors that have military or land units in them. .s1 Note that the number of BTU's consumed @@ -49,7 +49,7 @@ the sector you are spying from, such as allied land units that have been marched there, allied planes that have been landed there, spy units that have marched there and non-allied units that have been trapped there. .s1 -Note that spy units are not always seen. There is a 10-100% chance of a spy +Note that spy units are not always seen. There is a 10-100% chance of a spy unit being seen by the spy command. See "info Spies" for more information. .s1 .L NOTE diff --git a/info/supply.t b/info/supply.t index fd184724c..455139df8 100644 --- a/info/supply.t +++ b/info/supply.t @@ -45,7 +45,7 @@ unit must be within supply range of the source. Supply range is: 10 * ((tech+50)/(tech+200) sectors. .s1 In addition there must be a valid supply path to the source. A supply path -is a path of sectors owned by the owner of the unit that leads to the +is a path of sectors owned by the owner of the unit that leads to the supply source. (Note that the path may be of any length.. only the supply source itself must be within supply range.. this is to make the coding simpler, and may change in the future) The best path (in terms of mobility diff --git a/info/sweep.t b/info/sweep.t index 486f72c68..7d21e955c 100644 --- a/info/sweep.t +++ b/info/sweep.t @@ -21,7 +21,7 @@ The assembly point must be owned by you or an ally, or you or an ally must have a ship there. It must not be more than four sectors away from any of the planes selected for the mission. .s1 -Route is a normal empire path specification. You may also give a +Route is a normal empire path specification. You may also give a destination sector on the command line, or at any time while giving the route, and empire will use the best path from the current sector to the desired destination sector. @@ -43,7 +43,7 @@ of the sub, from the sector in which it is first detected (which may not be the sector the sub is in, as plane sonar has a range dependent on acc, and a chance of finding a sub of ((100-acc)-(4-sub visib)*10))+((100-effic)/5) percent. -The sub being sonared may detect the sonar ping. +The sub being sonared may detect the sonar ping. .s1 Planes with the sweep ability will automatically attempt to sweep mines in sea or harbor sectors they overfly. diff --git a/info/territory.t b/info/territory.t index c1762db91..d8241e5ed 100644 --- a/info/territory.t +++ b/info/territory.t @@ -9,7 +9,7 @@ The program will then give you a census report for all the sectors that have been assigned the territory number \*Q27\*U. .s1 In this sense it is essentially an extended \*Qrealm\*U. -However, you are not limited to rectangular regions and you have +However, you are not limited to rectangular regions and you have 99 values to choose from. .s1 There are four independent territory fields terr, terr1, terr2, terr3 diff --git a/info/wire.t b/info/wire.t index 7768f1fac..ebd687ab7 100644 --- a/info/wire.t +++ b/info/wire.t @@ -5,7 +5,7 @@ The wire command is used to read the announcements sent you by other countries. .sp After reading all your announcements you may mark them -as being read by +as being read by specifying \*Qyes\*U or not by specifying \*Qno\*U as an argument. If an argument is not supplied then you will be prompted to either answer \*Qyes\*U or \*Qno\*U to marking announcements diff --git a/scripts/xdump.pl b/scripts/xdump.pl index 90cf798ad..1a6dbfce7 100644 --- a/scripts/xdump.pl +++ b/scripts/xdump.pl @@ -164,7 +164,7 @@ sub parse_xdump { my $n = 0; while ($data !~ /^\//) { ($_, $data) = split(/\n/, $data, 2); - my @fld = split(/ /); + my @fld = split(/ /); &$store_record($tuid, $meta, $name, $n, \@fld, $timestamp); $n++; } diff --git a/src/client/Makefile.in b/src/client/Makefile.in index bff295c7e..4b0d7f6d9 100644 --- a/src/client/Makefile.in +++ b/src/client/Makefile.in @@ -1,36 +1,36 @@ -# +# # Empire - A multi-player, client/server Internet based war game. # Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak, # Ken Stevens, Steve McClure -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# +# # --- -# +# # See files README, COPYING and CREDITS in the root of the source # tree for related information and legal notices. It is expected # that future projects/authors will amend these files as needed. -# +# # --- -# +# # @configure_input@ # Makefile.in: Makefile template for configure -# +# # Known contributors to this file: # Markus Armbruster, 2005-2006 -# +# CC = @CC@ CFLAGS = @CFLAGS@ @CPPFLAGS@ @DEFS@ -I. diff --git a/src/client/configure.ac b/src/client/configure.ac index 7a8936d1c..54e00a292 100644 --- a/src/client/configure.ac +++ b/src/client/configure.ac @@ -1,35 +1,35 @@ -# +# # Empire - A multi-player, client/server Internet based war game. # Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak, # Ken Stevens, Steve McClure -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# +# # --- -# +# # See files README, COPYING and CREDITS in the root of the source # tree for related information and legal notices. It is expected # that future projects/authors will amend these files as needed. -# +# # --- -# +# # configure.ac: Autoconf input file -# +# # Known contributors to this file: # Markus Armbruster, 2005 -# +# # Process this file with autoconf to produce a configure script. # Autoconf makes checking for and programming around assorted ancient diff --git a/src/client/expect.c b/src/client/expect.c index 338452939..9f66e130b 100644 --- a/src/client/expect.c +++ b/src/client/expect.c @@ -26,7 +26,7 @@ * --- * * expect.c: Read from the socket, expecting to see a particular code. - * + * * Known contributors to this file: * Steve McClure, 1998 * Markus Armbruster, 2007 diff --git a/src/client/host.c b/src/client/host.c index 3c79ba2f2..d5c3640ff 100644 --- a/src/client/host.c +++ b/src/client/host.c @@ -26,7 +26,7 @@ * --- * * host.c: make stream connection to empire - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 1998 diff --git a/src/client/ipglob.c.in b/src/client/ipglob.c.in index f010976f0..f927ea61a 100644 --- a/src/client/ipglob.c.in +++ b/src/client/ipglob.c.in @@ -27,7 +27,7 @@ * * @configure_input@ * ipglob.c.in: IP globals. - * + * * Known contributors to this file: * Markus Armbruster, 2005 */ diff --git a/src/client/linebuf.c b/src/client/linebuf.c index 200be3f3c..5025fc533 100644 --- a/src/client/linebuf.c +++ b/src/client/linebuf.c @@ -26,7 +26,7 @@ * --- * * linebuf.c: Simple line buffer - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/client/linebuf.h b/src/client/linebuf.h index 6115a7b4b..7c7d590a2 100644 --- a/src/client/linebuf.h +++ b/src/client/linebuf.h @@ -26,7 +26,7 @@ * --- * * linebuf.h: Simple line buffer - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/client/login.c b/src/client/login.c index 9c111a46b..64cb49529 100644 --- a/src/client/login.c +++ b/src/client/login.c @@ -26,7 +26,7 @@ * --- * * login.c: Log into an empire server - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 1998 diff --git a/src/client/main.c b/src/client/main.c index 2bce73431..fc8fccb4b 100644 --- a/src/client/main.c +++ b/src/client/main.c @@ -26,7 +26,7 @@ * --- * * main.c: client main function - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1998 diff --git a/src/client/misc.h b/src/client/misc.h index 8bb4716cd..ea61f653f 100644 --- a/src/client/misc.h +++ b/src/client/misc.h @@ -26,7 +26,7 @@ * --- * * misc.h: Misc client definitions - * + * * Known contributors to this file: * Steve McClure, 1998 */ diff --git a/src/client/play.c b/src/client/play.c index 68a2f9ede..0649c3404 100644 --- a/src/client/play.c +++ b/src/client/play.c @@ -26,7 +26,7 @@ * --- * * play.c: Playing the game - * + * * Known contributors to this file: * Markus Armbruster, 2007 * Ron Koenderink, 2007 @@ -104,7 +104,7 @@ sigaction(int signal, struct sigaction *action, struct sigaction *oaction) { assert(!oaction); assert(action); - + if (signal == SIGPIPE) assert(action->sa_handler == SIG_IGN); else { @@ -218,7 +218,7 @@ w32_select(int nfds, fd_set *rdfd, fd_set *wrfd, fd_set *errfd, struct timeval* return -1; } WSACloseEvent(handles[num_handles - 1]); - + if (num_handles == 3 && result == WAIT_OBJECT_0) { errno = EINTR; return -1; diff --git a/src/client/ringbuf.c b/src/client/ringbuf.c index 699c683ab..6fa387fb4 100644 --- a/src/client/ringbuf.c +++ b/src/client/ringbuf.c @@ -26,7 +26,7 @@ * --- * * ringbuf.c: Simple ring buffer - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/client/ringbuf.h b/src/client/ringbuf.h index a40a4bb91..1e8bcc42f 100644 --- a/src/client/ringbuf.h +++ b/src/client/ringbuf.h @@ -26,7 +26,7 @@ * --- * * ringbuf.h: Simple ring buffer - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/client/secure.c b/src/client/secure.c index 624cbeb96..b69174356 100644 --- a/src/client/secure.c +++ b/src/client/secure.c @@ -26,7 +26,7 @@ * --- * * secure.c: Check redir etc. to protect against tampering deity - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/client/secure.h b/src/client/secure.h index 7aeaa001b..7c3406d5f 100644 --- a/src/client/secure.h +++ b/src/client/secure.h @@ -26,7 +26,7 @@ * --- * * secure.h: Check redir etc. to protect against tampering deity - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/client/servcmd.c b/src/client/servcmd.c index 7e637e1dc..4bd97408a 100644 --- a/src/client/servcmd.c +++ b/src/client/servcmd.c @@ -26,7 +26,7 @@ * --- * * servercmd.c: Change the state depending on the command from the server. - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 1998 diff --git a/src/client/sysdep_w32.c b/src/client/sysdep_w32.c index 8260fa458..54cc78e94 100644 --- a/src/client/sysdep_w32.c +++ b/src/client/sysdep_w32.c @@ -26,7 +26,7 @@ * --- * * sysdep_w32.c: system dependent functions for WIN32 environments - * + * * Known contributors to this file: * Ron Koenderink, 2007 */ @@ -95,7 +95,7 @@ int w32_socket(int family, int sock_type, int protocol) { SOCKET result; - + result = socket(family, sock_type, protocol); if (result == INVALID_SOCKET) { errno = WSAGetLastError(); @@ -112,7 +112,7 @@ int w32_connect(int sock, struct sockaddr *addr, int addrlen) { int result; - + result = connect(sock, addr, addrlen); if (result == SOCKET_ERROR) { errno = WSAGetLastError(); @@ -197,7 +197,7 @@ int w32_close_socket(int fd) { int result; - + result = closesocket(fd); if (result == SOCKET_ERROR) errno = WSAGetLastError(); diff --git a/src/client/sysdep_w32.h b/src/client/sysdep_w32.h index c16648041..dfa92f42e 100644 --- a/src/client/sysdep_w32.h +++ b/src/client/sysdep_w32.h @@ -26,7 +26,7 @@ * --- * * sysdep_w32.h: system dependent support for WIN32 environments - * + * * Known contributors to this file: * Ron Koenderink, 2007 */ @@ -84,7 +84,7 @@ extern void sysdep_init(void); w32_socket((family), (sock_type), (protocol)) #define connect(sock, addr, addrlen) \ w32_connect((sock), (addr), (addrlen)) - + #define pclose _pclose #define popen _popen #define snprintf _snprintf diff --git a/src/client/termlib.c b/src/client/termlib.c index 823c1dcbc..97c3dced8 100644 --- a/src/client/termlib.c +++ b/src/client/termlib.c @@ -26,7 +26,7 @@ * --- * * termlib.c: Various termlib stuff - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1998 diff --git a/src/lib/as/README b/src/lib/as/README index 00069f4bd..99b807612 100644 --- a/src/lib/as/README +++ b/src/lib/as/README @@ -162,7 +162,7 @@ arbitrary cost function we get off of a map. E.g., 0 1 2 3 0 0 0 0 0 - 1 0 0 0 0 + 1 0 0 0 0 Y 2 0 0 2 0 3 0 0 0 0 @@ -238,7 +238,7 @@ to move on. The secondary sort function is then used to break the tie -- it says, "Take the one that moves you closer to the destination". Fourth, all of the information we need about a sector (its mobility -cost, who owns it, etc.) is stored in the sector file on disk. This +cost, who owns it, etc.) is stored in the sector file on disk. This means that the getsect() function to get it off disk will do a read(), which is VERY expensive. Because of the weak lower bound, A* ends up checking lots of sectors, including sectors that it's seen before. diff --git a/src/lib/as/as.h b/src/lib/as/as.h index 1399106cc..d084e575c 100644 --- a/src/lib/as/as.h +++ b/src/lib/as/as.h @@ -114,7 +114,7 @@ struct as_data { struct as_node **neighbor_nodes; }; -/* +/* * Added these for caching of paths as we stumble across them */ diff --git a/src/lib/commands/acce.c b/src/lib/commands/acce.c index 1a0fdbf8a..72096f320 100644 --- a/src/lib/commands/acce.c +++ b/src/lib/commands/acce.c @@ -26,9 +26,9 @@ * --- * * acce.c: Report rejection status of telegrams/treaties/annos/loans - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/add.c b/src/lib/commands/add.c index eba4d33e2..1ecd94e20 100644 --- a/src/lib/commands/add.c +++ b/src/lib/commands/add.c @@ -26,7 +26,7 @@ * --- * * add.c: Add a new country to the game - * + * * Known contributors to this file: * Steve McClure, 2000 */ diff --git a/src/lib/commands/anti.c b/src/lib/commands/anti.c index bdced5718..0022c92e6 100644 --- a/src/lib/commands/anti.c +++ b/src/lib/commands/anti.c @@ -26,7 +26,7 @@ * --- * * anti.c: Take action against che - * + * * Known contributors to this file: * Pat Loney, 1992 * Steve McClure, 1997 diff --git a/src/lib/commands/arm.c b/src/lib/commands/arm.c index bb4a6a086..abe770b97 100644 --- a/src/lib/commands/arm.c +++ b/src/lib/commands/arm.c @@ -26,7 +26,7 @@ * --- * * arm.c: Arm planes (missiles) with nuclear devices - * + * * Known contributors to this file: * Dave Pare, 1986 * Ken Stevens, 1995 diff --git a/src/lib/commands/army.c b/src/lib/commands/army.c index c30376068..19c528c97 100644 --- a/src/lib/commands/army.c +++ b/src/lib/commands/army.c @@ -26,9 +26,9 @@ * --- * * army.c: Add units to an army - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/assa.c b/src/lib/commands/assa.c index d1f64aa89..fa0260cd5 100644 --- a/src/lib/commands/assa.c +++ b/src/lib/commands/assa.c @@ -26,7 +26,7 @@ * --- * * assa.c: Hit the beaches! - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1997 diff --git a/src/lib/commands/atta.c b/src/lib/commands/atta.c index 6c2b7e653..25a531a90 100644 --- a/src/lib/commands/atta.c +++ b/src/lib/commands/atta.c @@ -26,7 +26,7 @@ * --- * * atta.c: Attack another sector - * + * * Known contributors to this file: * Dave Pare * Ken Stevens, 1995 diff --git a/src/lib/commands/bdes.c b/src/lib/commands/bdes.c index 8e20b62d7..967461dfc 100644 --- a/src/lib/commands/bdes.c +++ b/src/lib/commands/bdes.c @@ -26,9 +26,9 @@ * --- * * bdes.c: Change bmap designations - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/best.c b/src/lib/commands/best.c index 34be9053f..39333c82d 100644 --- a/src/lib/commands/best.c +++ b/src/lib/commands/best.c @@ -26,9 +26,9 @@ * --- * * best.c: Show the best path between two sectors - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/boar.c b/src/lib/commands/boar.c index 5d2d78be1..f2cfdb8b9 100644 --- a/src/lib/commands/boar.c +++ b/src/lib/commands/boar.c @@ -26,7 +26,7 @@ * --- * * boar.c: Board an enemy ship - * + * * Known contributors to this file: * Ken Stevens, 1995 */ diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c index 583079f3e..59b193737 100644 --- a/src/lib/commands/bomb.c +++ b/src/lib/commands/bomb.c @@ -26,7 +26,7 @@ * --- * * bomb.c: Fly bombing missions - * + * * Known contributors to this file: * Dave Pare, 1986 * Ken Stevens, 1995 diff --git a/src/lib/commands/brea.c b/src/lib/commands/brea.c index 94671c117..28a4e56bc 100644 --- a/src/lib/commands/brea.c +++ b/src/lib/commands/brea.c @@ -26,7 +26,7 @@ * --- * * brea.c: Break out of sanctuary - * + * * Known contributors to this file: * Jeff Wallace, 1989 */ diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c index 3c8f36df4..a8d12f3d0 100644 --- a/src/lib/commands/budg.c +++ b/src/lib/commands/budg.c @@ -26,7 +26,7 @@ * --- * * budg.c: Calculate production levels, prioritize - * + * * Known contributors to this file: * Thomas Ruschak, 1992 * Ville Virrankoski, 1995 @@ -195,7 +195,7 @@ calc_all(long p_sect[][2], *ships = *sbuild = *nsbuild = *smaint = 0; *units = *lbuild = *nlbuild = *lmaint = 0; *planes = *pbuild = *npbuild = *pmaint = 0; - + np = getnatp(player->cnum); bp = bp_alloc(); for (n = 0; NULL != (sp = getsectid(n)); n++) { diff --git a/src/lib/commands/buil.c b/src/lib/commands/buil.c index 142c21c52..e962bde7b 100644 --- a/src/lib/commands/buil.c +++ b/src/lib/commands/buil.c @@ -26,7 +26,7 @@ * --- * * buil.c: Build ships, nukes, bridges, planes, land units, bridge towers - * + * * Known contributors to this file: * Steve McClure, 1998-2000 * Markus Armbruster, 2004-2008 diff --git a/src/lib/commands/buy.c b/src/lib/commands/buy.c index 31f68d58a..7e4daf049 100644 --- a/src/lib/commands/buy.c +++ b/src/lib/commands/buy.c @@ -26,7 +26,7 @@ * --- * * buy.c: Buy commodities from other nations - * + * * Known contributors to this file: * Dave Pare, 1986 * Pat Loney, 1992 diff --git a/src/lib/commands/capi.c b/src/lib/commands/capi.c index 248199f3e..98fa95801 100644 --- a/src/lib/commands/capi.c +++ b/src/lib/commands/capi.c @@ -26,7 +26,7 @@ * --- * * capi.c: Move your capital - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 2000 diff --git a/src/lib/commands/carg.c b/src/lib/commands/carg.c index 28869b13e..21d14584c 100644 --- a/src/lib/commands/carg.c +++ b/src/lib/commands/carg.c @@ -26,9 +26,9 @@ * --- * * carg.c: List cargo contents of a ship - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/cede.c b/src/lib/commands/cede.c index b1981475b..e2663253a 100644 --- a/src/lib/commands/cede.c +++ b/src/lib/commands/cede.c @@ -26,7 +26,7 @@ * --- * * cede.c: Give a sector to a neighbor - * + * * Known contributors to this file: * Dave Pare * Thomas Ruschak diff --git a/src/lib/commands/cens.c b/src/lib/commands/cens.c index 9cc90b3bc..04b099b26 100644 --- a/src/lib/commands/cens.c +++ b/src/lib/commands/cens.c @@ -26,7 +26,7 @@ * --- * * cens.c: Do a census report - * + * * Known contributors to this file: * Steve McClure, 2000 */ diff --git a/src/lib/commands/chan.c b/src/lib/commands/chan.c index 2dbe393cb..03da08d01 100644 --- a/src/lib/commands/chan.c +++ b/src/lib/commands/chan.c @@ -26,7 +26,7 @@ * --- * * chan.c: Change country/representative name - * + * * Known contributors to this file: * Steve McClure, 2000 */ diff --git a/src/lib/commands/coas.c b/src/lib/commands/coas.c index e11974986..3d4cf8f9d 100644 --- a/src/lib/commands/coas.c +++ b/src/lib/commands/coas.c @@ -26,7 +26,7 @@ * --- * * coas.c: Look at all the ships in the world - * + * * Known contributors to this file: * Keith Muller, 1983 * Dave Pare, 1986 (rewrite) diff --git a/src/lib/commands/coll.c b/src/lib/commands/coll.c index 94a78afd2..3fcb48f07 100644 --- a/src/lib/commands/coll.c +++ b/src/lib/commands/coll.c @@ -26,7 +26,7 @@ * --- * * coll.c: Collet on a loan - * + * * Known contributors to this file: * Pat Loney, 1992 * Steve McClure, 1996-2000 diff --git a/src/lib/commands/comm.c b/src/lib/commands/comm.c index 55014a0f6..5024e1091 100644 --- a/src/lib/commands/comm.c +++ b/src/lib/commands/comm.c @@ -26,9 +26,9 @@ * --- * * comm.c: Do a commodity report - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/cons.c b/src/lib/commands/cons.c index 00cdb1f0c..d67e64e99 100644 --- a/src/lib/commands/cons.c +++ b/src/lib/commands/cons.c @@ -26,9 +26,9 @@ * --- * * cons.c: Consider a loan or treaty - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/conv.c b/src/lib/commands/conv.c index de3928e4f..2b8c1cfb2 100644 --- a/src/lib/commands/conv.c +++ b/src/lib/commands/conv.c @@ -26,7 +26,7 @@ * --- * * conv.c: Convert conquered populace into uw's - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/commands/coun.c b/src/lib/commands/coun.c index 7b56cbc50..4f0509dfb 100644 --- a/src/lib/commands/coun.c +++ b/src/lib/commands/coun.c @@ -26,9 +26,9 @@ * --- * * coun.c: Do a country roster - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/cuto.c b/src/lib/commands/cuto.c index fd5da7394..46846e33f 100644 --- a/src/lib/commands/cuto.c +++ b/src/lib/commands/cuto.c @@ -26,7 +26,7 @@ * --- * * cuto.c: Do a delivery cutoff level report - * + * * Known contributors to this file: * David Muir Sharnoff, 1987 */ diff --git a/src/lib/commands/decl.c b/src/lib/commands/decl.c index b7ed5ebc0..44d7894d6 100644 --- a/src/lib/commands/decl.c +++ b/src/lib/commands/decl.c @@ -26,9 +26,9 @@ * --- * * decl.c: Declare war, neutrality, alliance, hostile or friendly - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/deli.c b/src/lib/commands/deli.c index 4d894636d..d04264202 100644 --- a/src/lib/commands/deli.c +++ b/src/lib/commands/deli.c @@ -26,9 +26,9 @@ * --- * * deli.c: Set deliveries from a sector - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/demo.c b/src/lib/commands/demo.c index 39c1b7ad1..4d6f45fd3 100644 --- a/src/lib/commands/demo.c +++ b/src/lib/commands/demo.c @@ -26,7 +26,7 @@ * --- * * demo.c: De-mobilize "n" military in a given sector - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/commands/desi.c b/src/lib/commands/desi.c index 917cfdf62..3d095469d 100644 --- a/src/lib/commands/desi.c +++ b/src/lib/commands/desi.c @@ -26,7 +26,7 @@ * --- * * desi.c: Redesignate sectors - * + * * Known contributors to this file: * Steve McClure, 1998-2000 * Markus Armbruster, 2004-2008 diff --git a/src/lib/commands/disa.c b/src/lib/commands/disa.c index 1c4d4b338..d92b746dd 100644 --- a/src/lib/commands/disa.c +++ b/src/lib/commands/disa.c @@ -26,7 +26,7 @@ * --- * * disa.c: Disable updates (deity) - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/lib/commands/dist.c b/src/lib/commands/dist.c index b4124b51d..8fdc93500 100644 --- a/src/lib/commands/dist.c +++ b/src/lib/commands/dist.c @@ -26,10 +26,10 @@ * --- * * dist.c: Name distribution sector for a given range of sectors - * + * * Known contributors to this file: * Dave Pare, 1986 - * Thomas Ruschak, 1993 (rewritten) + * Thomas Ruschak, 1993 (rewritten) * Steve McClure, 1998 */ diff --git a/src/lib/commands/drop.c b/src/lib/commands/drop.c index e33bb086f..7c8dcaf3b 100644 --- a/src/lib/commands/drop.c +++ b/src/lib/commands/drop.c @@ -26,7 +26,7 @@ * --- * * drop.c: Air-drop commodities - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/commands/dump.c b/src/lib/commands/dump.c index 3e1cf72f4..3ad1f21ff 100644 --- a/src/lib/commands/dump.c +++ b/src/lib/commands/dump.c @@ -26,7 +26,7 @@ * --- * * dump.c: Dump sector information - * + * * Known contributors to this file: * Jeff Wallace, 1989 * Steve McClure, 1997 (added timestamping) diff --git a/src/lib/commands/echo.c b/src/lib/commands/echo.c index ac5309c59..bd924b2ab 100644 --- a/src/lib/commands/echo.c +++ b/src/lib/commands/echo.c @@ -26,7 +26,7 @@ * --- * * echo.c: Just echo something - * + * * Known contributors to this file: * Ken Stevens, 1995 */ diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c index 7e4c8ecf0..b17712da4 100644 --- a/src/lib/commands/edit.c +++ b/src/lib/commands/edit.c @@ -26,7 +26,7 @@ * --- * * edit.c: Edit things (sectors, ships, planes, units, nukes, countries) - * + * * Known contributors to this file: * David Muir Sharnoff * Chad Zabel, 1994 diff --git a/src/lib/commands/enab.c b/src/lib/commands/enab.c index bd2309d2a..46c8b51d6 100644 --- a/src/lib/commands/enab.c +++ b/src/lib/commands/enab.c @@ -26,7 +26,7 @@ * --- * * enab.c: Enable the updates (deity) - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/lib/commands/enli.c b/src/lib/commands/enli.c index 4f669dcb5..8ed463179 100644 --- a/src/lib/commands/enli.c +++ b/src/lib/commands/enli.c @@ -26,9 +26,9 @@ * --- * * enli.c: Enlist some military - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/expl.c b/src/lib/commands/expl.c index f3ce7bbc0..0c363c51e 100644 --- a/src/lib/commands/expl.c +++ b/src/lib/commands/expl.c @@ -26,7 +26,7 @@ * --- * * expl.c: Take over unoccupied sectors - * + * * Known contributors to this file: * Jeff Wallace, 1989 */ diff --git a/src/lib/commands/fina.c b/src/lib/commands/fina.c index 680afaf10..a6add3133 100644 --- a/src/lib/commands/fina.c +++ b/src/lib/commands/fina.c @@ -26,7 +26,7 @@ * --- * * fina.c: Financial report on current status of loans to countries - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1996 diff --git a/src/lib/commands/flash.c b/src/lib/commands/flash.c index 9879bc2e0..787e4a4b0 100644 --- a/src/lib/commands/flash.c +++ b/src/lib/commands/flash.c @@ -26,7 +26,7 @@ * --- * * flash.c: Flash a message to another player - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1998 diff --git a/src/lib/commands/flee.c b/src/lib/commands/flee.c index 965f94775..d0c8a7116 100644 --- a/src/lib/commands/flee.c +++ b/src/lib/commands/flee.c @@ -26,9 +26,9 @@ * --- * * flee.c: Add ships to a fleet - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c index 2ca896335..e8713481a 100644 --- a/src/lib/commands/fly.c +++ b/src/lib/commands/fly.c @@ -26,7 +26,7 @@ * --- * * fly.c: fly a plane - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 2000 diff --git a/src/lib/commands/foll.c b/src/lib/commands/foll.c index c81694b02..14dd8b3c1 100644 --- a/src/lib/commands/foll.c +++ b/src/lib/commands/foll.c @@ -26,7 +26,7 @@ * --- * * foll.c: Set leader of a set of ships - * + * * Known contributors to this file: * Robert Forsman */ diff --git a/src/lib/commands/forc.c b/src/lib/commands/forc.c index d64e7ac04..deff25656 100644 --- a/src/lib/commands/forc.c +++ b/src/lib/commands/forc.c @@ -26,7 +26,7 @@ * --- * * force.c: Force an update to occur (deity) - * + * * Known contributors to this file: * Dave Pare, 1994 * Markus Armbruster, 2007 diff --git a/src/lib/commands/fort.c b/src/lib/commands/fort.c index 8630bed84..fe44c288c 100644 --- a/src/lib/commands/fort.c +++ b/src/lib/commands/fort.c @@ -26,7 +26,7 @@ * --- * * fort.c: Increase the fortification value of land units - * + * * Known contributors to this file: * Steve McClure, 1999 */ diff --git a/src/lib/commands/give.c b/src/lib/commands/give.c index e8ba83bf2..7389d0059 100644 --- a/src/lib/commands/give.c +++ b/src/lib/commands/give.c @@ -26,7 +26,7 @@ * --- * * give.c: give stuff to countries (deity) - * + * * Known contributors to this file: * David Muir Sharnoff * Steve McClure, 1997 diff --git a/src/lib/commands/grin.c b/src/lib/commands/grin.c index 336b4946d..ff085ecf5 100644 --- a/src/lib/commands/grin.c +++ b/src/lib/commands/grin.c @@ -26,7 +26,7 @@ * --- * * grin.c: Grind gold bars into dust - * + * * Known contributors to this file: * Markus Armbruster, 2004-2006 */ diff --git a/src/lib/commands/hard.c b/src/lib/commands/hard.c index 2f3bb167c..6b34c7b7d 100644 --- a/src/lib/commands/hard.c +++ b/src/lib/commands/hard.c @@ -26,7 +26,7 @@ * --- * * hard.c: Increases the silo protection of a given missile - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/commands/head.c b/src/lib/commands/head.c index ed506de68..2b1c14829 100644 --- a/src/lib/commands/head.c +++ b/src/lib/commands/head.c @@ -26,9 +26,9 @@ * --- * * head.c: Print headlines of the Empire News - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/improve.c b/src/lib/commands/improve.c index e8fba1b67..044827118 100644 --- a/src/lib/commands/improve.c +++ b/src/lib/commands/improve.c @@ -26,7 +26,7 @@ * --- * * improve.c: Improve the infrastructure of a sector - * + * * Known contributors to this file: * Steve McClure, 1996-2000 */ diff --git a/src/lib/commands/info.c b/src/lib/commands/info.c index 61a0b9bc1..d29bbc802 100644 --- a/src/lib/commands/info.c +++ b/src/lib/commands/info.c @@ -26,7 +26,7 @@ * --- * * info.c: display an info page - * + * * Known contributors to this file: * Dave Pare, 1986 * Mike Wise, 1997 - added apropos and case insensitivity @@ -79,7 +79,7 @@ info(void) int nmatch = 0; int width = 0; char sep; - + name = player->argp[1]; if (name) { /* @@ -90,7 +90,7 @@ info(void) } if (!name || !*name) name = "TOP"; - + snprintf(filename, sizeof(filename), "%s/%s", infodir, name); fp = fopen(filename, "r"); if (fp == NULL) { diff --git a/src/lib/commands/land.c b/src/lib/commands/land.c index f32f52a82..b2adc8b6c 100644 --- a/src/lib/commands/land.c +++ b/src/lib/commands/land.c @@ -26,7 +26,7 @@ * --- * * land.c: List land units - * + * * Known contributors to this file: * Steve McClure, 1998 */ diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c index 5c5db7203..7c565c300 100644 --- a/src/lib/commands/laun.c +++ b/src/lib/commands/laun.c @@ -26,7 +26,7 @@ * --- * * laun.c: Launch missiles from land or sea - * + * * Known contributors to this file: * Dave Pare, 1986 * Ken Stevens, 1995 @@ -93,7 +93,7 @@ laun(void) } } - if (plane.pln_effic < 40) { + if (plane.pln_effic < 40) { pr("%s is damaged (%d%%)\n", prplane(&plane), plane.pln_effic); continue; } diff --git a/src/lib/commands/lboard.c b/src/lib/commands/lboard.c index 7360d734a..9fd6b1e98 100644 --- a/src/lib/commands/lboard.c +++ b/src/lib/commands/lboard.c @@ -26,7 +26,7 @@ * --- * * lboard.c: Board an enemy land unit (heavily borrowing from boar.c) - * + * * Known contributors to this file: * Steve McClure, 1998 */ diff --git a/src/lib/commands/ldump.c b/src/lib/commands/ldump.c index 8d5473760..930810fc6 100644 --- a/src/lib/commands/ldump.c +++ b/src/lib/commands/ldump.c @@ -26,7 +26,7 @@ * --- * * ldump.c: Dump land unit information - * + * * Known contributors to this file: * John Yockey, 1997 * Steve McClure, 1998 diff --git a/src/lib/commands/ledg.c b/src/lib/commands/ledg.c index 6a6be7bf0..9e74ca8d2 100644 --- a/src/lib/commands/ledg.c +++ b/src/lib/commands/ledg.c @@ -26,7 +26,7 @@ * --- * * ledg.c: Get a report of the current ledger - * + * * Known contributors to this file: * Steve McClure, 1996 */ diff --git a/src/lib/commands/leve.c b/src/lib/commands/leve.c index 800ea8b45..cfdf8a6dc 100644 --- a/src/lib/commands/leve.c +++ b/src/lib/commands/leve.c @@ -26,7 +26,7 @@ * --- * * leve.c: Do a distribution threshold level report - * + * * Known contributors to this file: * David Muir Sharnoff, 1987 */ diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c index e3aedd690..cb35f1084 100644 --- a/src/lib/commands/load.c +++ b/src/lib/commands/load.c @@ -26,7 +26,7 @@ * --- * * load.c: load/unload goods from a sector onto a ship or land unit - * + * * Known contributors to this file: * David Sharnoff, 1987 * Ken Stevens, 1995 (rewritten) diff --git a/src/lib/commands/look.c b/src/lib/commands/look.c index 2ee22047a..45e316fc8 100644 --- a/src/lib/commands/look.c +++ b/src/lib/commands/look.c @@ -26,7 +26,7 @@ * --- * * look.c: Lookout from a ship or land unit - * + * * Known contributors to this file: * Ron Koenderink, 2006-2007 */ diff --git a/src/lib/commands/lost.c b/src/lib/commands/lost.c index 8e410e68a..ad76e5910 100644 --- a/src/lib/commands/lost.c +++ b/src/lib/commands/lost.c @@ -26,7 +26,7 @@ * --- * * lost.c: List lost items - * + * * Known contributors to this file: * Steve McClure, 1997 */ diff --git a/src/lib/commands/lstat.c b/src/lib/commands/lstat.c index 42b89914d..f640e6088 100644 --- a/src/lib/commands/lstat.c +++ b/src/lib/commands/lstat.c @@ -26,7 +26,7 @@ * --- * * lstat.c: Show the stats of your land units - * + * * Known contributors to this file: * Steve McClure, 1996 */ diff --git a/src/lib/commands/lten.c b/src/lib/commands/lten.c index 32fd31e3e..e917f99e5 100644 --- a/src/lib/commands/lten.c +++ b/src/lib/commands/lten.c @@ -27,7 +27,7 @@ * * lten.c: Transfer commodity from a ship to a land unit the ship is * carrying - * + * * Known contributors to this file: * Dave Pare, 1986 * Thomas Ruschak diff --git a/src/lib/commands/map.c b/src/lib/commands/map.c index dfe04c6a7..d4a0677df 100644 --- a/src/lib/commands/map.c +++ b/src/lib/commands/map.c @@ -26,7 +26,7 @@ * --- * * map.c: Display a map of sectors. - * + * * Known contributors to this file: * Dave Pare, 1986 * Ken Stevens, 1995 diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c index 0e97c29dc..a69dfd4b1 100644 --- a/src/lib/commands/marc.c +++ b/src/lib/commands/marc.c @@ -26,7 +26,7 @@ * --- * * marc.c: March units around - * + * * Known contributors to this file: * Thomas Ruschak * Ken Stevens, 1995 (rewrite) diff --git a/src/lib/commands/mark.c b/src/lib/commands/mark.c index ad8418718..f85744498 100644 --- a/src/lib/commands/mark.c +++ b/src/lib/commands/mark.c @@ -26,7 +26,7 @@ * --- * * mark.c: Display report for commodities - * + * * Known contributors to this file: * Dave Pare, 1986 * Pat Loney, 1992 diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c index db768ff3a..0df7e5e98 100644 --- a/src/lib/commands/mfir.c +++ b/src/lib/commands/mfir.c @@ -26,7 +26,7 @@ * --- * * multifire.c: Fire at other sectors/ships - * + * * Known contributors to this file: * Steve McClure, 2000 * Markus Armbruster, 2004-2008 diff --git a/src/lib/commands/mine.c b/src/lib/commands/mine.c index fd8e619eb..43410559a 100644 --- a/src/lib/commands/mine.c +++ b/src/lib/commands/mine.c @@ -26,9 +26,9 @@ * --- * * mine.c: Lay mines from ships or units - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c index 6e4f4fe06..13a8adf88 100644 --- a/src/lib/commands/miss.c +++ b/src/lib/commands/miss.c @@ -26,7 +26,7 @@ * --- * * miss.c: set missions for ships/planes/units - * + * * Known contributors to this file: * Thomas Ruschak, 1992 * Steve McClure, 2000 @@ -77,7 +77,7 @@ mission(void) buf)) == 0) return RET_SYN; -/* +/* * 'i' interdiction * 's' support * 'o' support attacks diff --git a/src/lib/commands/mobq.c b/src/lib/commands/mobq.c index 19dff8135..99acb05e8 100644 --- a/src/lib/commands/mobq.c +++ b/src/lib/commands/mobq.c @@ -26,7 +26,7 @@ * --- * * mobq.c: Set the sailing mobility quota for a ship - * + * * Known contributors to this file: * Robert Forsman */ diff --git a/src/lib/commands/mora.c b/src/lib/commands/mora.c index 23e2cd8e8..5c3921967 100644 --- a/src/lib/commands/mora.c +++ b/src/lib/commands/mora.c @@ -26,7 +26,7 @@ * --- * * mora.c: Edit morale of a land unit - * + * * Known contributors to this file: * Jeff Bailey */ diff --git a/src/lib/commands/move.c b/src/lib/commands/move.c index 706020821..0891ee867 100644 --- a/src/lib/commands/move.c +++ b/src/lib/commands/move.c @@ -26,9 +26,9 @@ * --- * * move.c: Move commodities around - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/name.c b/src/lib/commands/name.c index 9e5d2861f..6aab820b2 100644 --- a/src/lib/commands/name.c +++ b/src/lib/commands/name.c @@ -26,7 +26,7 @@ * --- * * name.c: Name a ship - * + * * Known contributors to this file: * Jeff Bailey */ diff --git a/src/lib/commands/nati.c b/src/lib/commands/nati.c index d27b31fc7..4fa1d6bc9 100644 --- a/src/lib/commands/nati.c +++ b/src/lib/commands/nati.c @@ -26,9 +26,9 @@ * --- * * nati.c: List nation information - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c index 6d19e36bf..ddab37486 100644 --- a/src/lib/commands/navi.c +++ b/src/lib/commands/navi.c @@ -26,7 +26,7 @@ * --- * * navi.c: Navigate ships and such - * + * * Known contributors to this file: * Ken Stevens, 1995 (rewritten) * Ron Koenderink, 2006-2007 @@ -130,7 +130,7 @@ do_unit_move(struct emp_qelem *ulist, int *together, else skip = 0; sprintf(prompt, "<%.1f:%.1f: %s> ", *maxmob, - *minmob, xyas(leader->x, leader->y, player->cnum)); + *minmob, xyas(leader->x, leader->y, player->cnum)); cp = getstring(prompt, buf); /* Just in case any of our units were shelled while we were * at the prompt, we call shp_nav() or lnd_mar() again. diff --git a/src/lib/commands/ndump.c b/src/lib/commands/ndump.c index c9f0098cf..927db4f82 100644 --- a/src/lib/commands/ndump.c +++ b/src/lib/commands/ndump.c @@ -26,7 +26,7 @@ * --- * * ndump.c: Dump nuke information - * + * * Known contributors to this file: * John Yockey, 1997 * Steve McClure, 1998 diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c index cbe88e9e2..556d1e2f8 100644 --- a/src/lib/commands/new.c +++ b/src/lib/commands/new.c @@ -26,7 +26,7 @@ * --- * * new.c: Create a new capital for a player - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/commands/newe.c b/src/lib/commands/newe.c index 5d7983304..9ccc2cb77 100644 --- a/src/lib/commands/newe.c +++ b/src/lib/commands/newe.c @@ -26,7 +26,7 @@ * --- * * newe.c: Show new sector efficiency (projected) - * + * * Known contributors to this file: * Thomas Ruschak, 1993 */ diff --git a/src/lib/commands/news.c b/src/lib/commands/news.c index 7490e38fe..0095170b5 100644 --- a/src/lib/commands/news.c +++ b/src/lib/commands/news.c @@ -26,9 +26,9 @@ * --- * * news.c: Show current Empire news - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/nuke.c b/src/lib/commands/nuke.c index 18705158b..3287d0dd8 100644 --- a/src/lib/commands/nuke.c +++ b/src/lib/commands/nuke.c @@ -26,7 +26,7 @@ * --- * * nuke.c: Display a listing of your nuclear arsenal - * + * * Known contributors to this file: * Dave Pare, 1986 * Markus Armbruster, 2006 diff --git a/src/lib/commands/offe.c b/src/lib/commands/offe.c index 685e7052b..01570b596 100644 --- a/src/lib/commands/offe.c +++ b/src/lib/commands/offe.c @@ -26,7 +26,7 @@ * --- * * offe.c: Offer a loan or treaty - * + * * Known contributors to this file: * Pat Loney, 1992 * Steve McClure, 1996 diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c index 5aebcf605..236dbe8c3 100644 --- a/src/lib/commands/orde.c +++ b/src/lib/commands/orde.c @@ -26,7 +26,7 @@ * --- * * orde.c: Turn on/off autonavigation - * + * * Known contributors to this file: * Chad Zabel, 1994 * Steve McClure, 2000 @@ -52,8 +52,8 @@ * ORDER l[evel] * * New syntax: - * qorder display cargo levels - * sorder display statistical info + * qorder display cargo levels + * sorder display statistical info */ int @@ -194,7 +194,7 @@ orde(void) break; } - /* to keep sub in range of our arrays + /* to keep sub in range of our arrays subtract 1 so the new range is 0-(TMAX-1) */ sub = sub - 1;; @@ -279,7 +279,7 @@ orde(void) ship.shp_autonav |= AN_LOADING; - /* swap variables, this keeps + /* swap variables, this keeps the load_it() procedure happy. CZ */ tcord = ship.shp_destx[0]; diff --git a/src/lib/commands/orig.c b/src/lib/commands/orig.c index 120bb823e..b956edd97 100644 --- a/src/lib/commands/orig.c +++ b/src/lib/commands/orig.c @@ -26,7 +26,7 @@ * --- * * orig.c: Move your origin - * + * * Known contributors to this file: * Shelley Louie, 1988 * Markus Armbruster, 2006 diff --git a/src/lib/commands/para.c b/src/lib/commands/para.c index 620fc4578..0918eee6e 100644 --- a/src/lib/commands/para.c +++ b/src/lib/commands/para.c @@ -26,7 +26,7 @@ * --- * * para.c: Drop paratroopers onto a sector - * + * * Known contributors to this file: * Dave Pare, 1986 * Ken Stevens, 1995 diff --git a/src/lib/commands/path.c b/src/lib/commands/path.c index fa9d6cbad..637e8c71a 100644 --- a/src/lib/commands/path.c +++ b/src/lib/commands/path.c @@ -26,7 +26,7 @@ * --- * * path.c: Show empire distribution paths - * + * * Known contributors to this file: * David Muir Sharnoff, 1986 * (unknown rewrite), 1989 diff --git a/src/lib/commands/payo.c b/src/lib/commands/payo.c index c7414863c..2a892671b 100644 --- a/src/lib/commands/payo.c +++ b/src/lib/commands/payo.c @@ -26,7 +26,7 @@ * --- * * payo.c: Calculate trade ship payoffs - * + * * Known contributors to this file: * Thomas Ruschak, 1992 */ diff --git a/src/lib/commands/pdump.c b/src/lib/commands/pdump.c index c97ea98b1..48f0f4d4d 100644 --- a/src/lib/commands/pdump.c +++ b/src/lib/commands/pdump.c @@ -26,7 +26,7 @@ * --- * * pdump.c: Dump plane information - * + * * Known contributors to this file: * John Yockey, 1997 * Steve McClure, 1998 diff --git a/src/lib/commands/peek.c b/src/lib/commands/peek.c index 43800c65f..68ae92155 100644 --- a/src/lib/commands/peek.c +++ b/src/lib/commands/peek.c @@ -26,7 +26,7 @@ * --- * * peek.c: Show hidden values report (deity) - * + * * Known contributors to this file: * Jeff Wallace, 1989 * Pat Loney, 1998 diff --git a/src/lib/commands/plan.c b/src/lib/commands/plan.c index fdc079006..b42c1b983 100644 --- a/src/lib/commands/plan.c +++ b/src/lib/commands/plan.c @@ -26,7 +26,7 @@ * --- * * plan.c: Do a plane report - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 2000 diff --git a/src/lib/commands/play.c b/src/lib/commands/play.c index 6aa397d03..8179ec58f 100644 --- a/src/lib/commands/play.c +++ b/src/lib/commands/play.c @@ -26,7 +26,7 @@ * --- * * play.c: Who is logged on? - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1998 diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c index 8bee8e4e6..23670021c 100644 --- a/src/lib/commands/powe.c +++ b/src/lib/commands/powe.c @@ -26,7 +26,7 @@ * --- * * powe.c: Do a power report - * + * * Known contributors to this file: * Dave Pare * Ken Stevens, 1995 diff --git a/src/lib/commands/prod.c b/src/lib/commands/prod.c index 18f892893..3dd58f66c 100644 --- a/src/lib/commands/prod.c +++ b/src/lib/commands/prod.c @@ -26,7 +26,7 @@ * --- * * prod.c: Calculate production levels - * + * * Known contributors to this file: * David Muir Sharnoff, 1987 * Steve McClure, 1997-2000 diff --git a/src/lib/commands/pstat.c b/src/lib/commands/pstat.c index 8d5c0d169..6bfe33511 100644 --- a/src/lib/commands/pstat.c +++ b/src/lib/commands/pstat.c @@ -26,7 +26,7 @@ * --- * * pstat.c: Show the stats of your planes - * + * * Known contributors to this file: * Steve McClure, 1996 */ diff --git a/src/lib/commands/rada.c b/src/lib/commands/rada.c index 3e488bee6..af91ceaa0 100644 --- a/src/lib/commands/rada.c +++ b/src/lib/commands/rada.c @@ -26,7 +26,7 @@ * --- * * rada.c: Do radar from a ship/unit/sector - * + * * Known contributors to this file: * Ron Koenderink, 2006 */ @@ -66,7 +66,7 @@ radar(short type) sprintf(prompt, "Radar from (%s # or sector(s)) : ", ef_nameof(type)); cp = getstarg(player->argp[1], prompt, buf); - + if (cp == 0) return RET_SYN; switch (sarg_type(cp)) { diff --git a/src/lib/commands/rang.c b/src/lib/commands/rang.c index 3e1d2c585..a62c0e4ff 100644 --- a/src/lib/commands/rang.c +++ b/src/lib/commands/rang.c @@ -26,7 +26,7 @@ * --- * * rang.c: Edit range of plane/land unit - * + * * Known contributors to this file: * Jeff Bailey */ diff --git a/src/lib/commands/rea.c b/src/lib/commands/rea.c index 934b0dfba..5de2bb2b9 100644 --- a/src/lib/commands/rea.c +++ b/src/lib/commands/rea.c @@ -26,7 +26,7 @@ * --- * * rea.c: Read telegrams - * + * * Known contributors to this file: * Dave Pare * Doug Hay, 1998 diff --git a/src/lib/commands/real.c b/src/lib/commands/real.c index b1f21b351..98e88cb9c 100644 --- a/src/lib/commands/real.c +++ b/src/lib/commands/real.c @@ -26,9 +26,9 @@ * --- * * real.c: Show or set a realm - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/reco.c b/src/lib/commands/reco.c index a28387fb7..ebc9e06e0 100644 --- a/src/lib/commands/reco.c +++ b/src/lib/commands/reco.c @@ -26,7 +26,7 @@ * --- * * reco.c: Fly a recon mission - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/commands/reje.c b/src/lib/commands/reje.c index 6bc0af58b..8da60a57d 100644 --- a/src/lib/commands/reje.c +++ b/src/lib/commands/reje.c @@ -26,9 +26,9 @@ * --- * * reje.c: Refuse telegrams/annos/treaties/loans from countries - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/rela.c b/src/lib/commands/rela.c index 988ebf819..cb25e5800 100644 --- a/src/lib/commands/rela.c +++ b/src/lib/commands/rela.c @@ -26,9 +26,9 @@ * --- * * rela.c: Show relations with other countries - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/relo.c b/src/lib/commands/relo.c index 6fc32038d..6a3f463ff 100644 --- a/src/lib/commands/relo.c +++ b/src/lib/commands/relo.c @@ -26,7 +26,7 @@ * --- * * relo.c: Re-read (some) configuration files - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/lib/commands/repa.c b/src/lib/commands/repa.c index c1b4b077a..77a473467 100644 --- a/src/lib/commands/repa.c +++ b/src/lib/commands/repa.c @@ -26,9 +26,9 @@ * --- * * repa.c: repay loan from a country - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/repo.c b/src/lib/commands/repo.c index 2401928bc..645f77bba 100644 --- a/src/lib/commands/repo.c +++ b/src/lib/commands/repo.c @@ -26,7 +26,7 @@ * --- * * repo.c: Report on various levels (tech, research) of other nations - * + * * Known contributors to this file: * Keith Muller, 1983 * Dave Pare, 1986 (rewrite) diff --git a/src/lib/commands/rese.c b/src/lib/commands/rese.c index 83cede05c..bfb64d29c 100644 --- a/src/lib/commands/rese.c +++ b/src/lib/commands/rese.c @@ -26,7 +26,7 @@ * --- * * rese.c: Reset (lower) commodity prices - * + * * Known contributors to this file: * Jeff Bailey * Pat Loney, 1992 diff --git a/src/lib/commands/reso.c b/src/lib/commands/reso.c index 70caee4de..0e65c28f4 100644 --- a/src/lib/commands/reso.c +++ b/src/lib/commands/reso.c @@ -26,7 +26,7 @@ * --- * * reso.c: Display natural resources - * + * * Known contributors to this file: * Dave Pare, 1989 */ diff --git a/src/lib/commands/retr.c b/src/lib/commands/retr.c index c116a886f..4aed39140 100644 --- a/src/lib/commands/retr.c +++ b/src/lib/commands/retr.c @@ -26,7 +26,7 @@ * --- * * retr.c: Set retreat conditionals for ships and land units - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 2000 diff --git a/src/lib/commands/rout.c b/src/lib/commands/rout.c index a4eab2059..7c346d41f 100644 --- a/src/lib/commands/rout.c +++ b/src/lib/commands/rout.c @@ -26,9 +26,9 @@ * --- * * rout.c: Show empire deliver routes - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/sabo.c b/src/lib/commands/sabo.c index 45445e48c..31f52a0b6 100644 --- a/src/lib/commands/sabo.c +++ b/src/lib/commands/sabo.c @@ -26,7 +26,7 @@ * --- * * sabo.c: Spy terrorist bombing - * + * * Known contributors to this file: * John Yockey, 2001 */ diff --git a/src/lib/commands/sail.c b/src/lib/commands/sail.c index 230e06e81..27a47e14a 100644 --- a/src/lib/commands/sail.c +++ b/src/lib/commands/sail.c @@ -26,7 +26,7 @@ * --- * * sail.c: Set sail path for leaders - * + * * Known contributors to this file: * Robert Forsman */ diff --git a/src/lib/commands/sate.c b/src/lib/commands/sate.c index 8c574e5dc..6a7d5c59f 100644 --- a/src/lib/commands/sate.c +++ b/src/lib/commands/sate.c @@ -26,7 +26,7 @@ * --- * * sate.c: Do satellite maps/reports. - * + * * Known contributors to this file: * Edward M. Rynes Esq, 1988 * Ken Stevens, 1995 diff --git a/src/lib/commands/scra.c b/src/lib/commands/scra.c index 51187b229..aba67d1a8 100644 --- a/src/lib/commands/scra.c +++ b/src/lib/commands/scra.c @@ -26,7 +26,7 @@ * --- * * scra.c: Scrap ships, planes or land units - * + * * Known contributors to this file: * Steve McClure, 2000 * Markus Armbruster, 2004-2008 diff --git a/src/lib/commands/scut.c b/src/lib/commands/scut.c index 731e2e699..aa7f3246b 100644 --- a/src/lib/commands/scut.c +++ b/src/lib/commands/scut.c @@ -26,7 +26,7 @@ * --- * * scut.c: Scuttle ships, planes or land units - * + * * Known contributors to this file: * Markus Armbruster, 2004-2008 */ diff --git a/src/lib/commands/sdump.c b/src/lib/commands/sdump.c index 31915f686..95899e51b 100644 --- a/src/lib/commands/sdump.c +++ b/src/lib/commands/sdump.c @@ -26,7 +26,7 @@ * --- * * sdump.c: Dump ship information - * + * * Known contributors to this file: * John Yockey, 1997 * Steve McClure, 1998 diff --git a/src/lib/commands/sect.c b/src/lib/commands/sect.c index 2e38a6fdf..0d7f2b8b7 100644 --- a/src/lib/commands/sect.c +++ b/src/lib/commands/sect.c @@ -26,7 +26,7 @@ * --- * * sect.c: Show sectors in map-like format with conditionals. - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/commands/sell.c b/src/lib/commands/sell.c index 0a9c6ae56..e6ad4ea7b 100644 --- a/src/lib/commands/sell.c +++ b/src/lib/commands/sell.c @@ -26,7 +26,7 @@ * --- * * sell.c: Sell commodities to other nations. - * + * * Known contributors to this file: * Dave Pare, 1986 * Jeff Bailey diff --git a/src/lib/commands/set.c b/src/lib/commands/set.c index 567e47c2f..dcda30306 100644 --- a/src/lib/commands/set.c +++ b/src/lib/commands/set.c @@ -26,7 +26,7 @@ * --- * * set.c: Place units/ships/planes/nukes up for sale. - * + * * Known contributors to this file: * Dave Pare, 1986 * Pat Loney, 1992 diff --git a/src/lib/commands/setres.c b/src/lib/commands/setres.c index 6106a0aef..b62d97abe 100644 --- a/src/lib/commands/setres.c +++ b/src/lib/commands/setres.c @@ -26,7 +26,7 @@ * --- * * setres.c: Set resources of a sector - * + * * Known contributors to this file: * David Muir Sharnoff * Karl Hagen diff --git a/src/lib/commands/setsect.c b/src/lib/commands/setsect.c index 9c608e297..838e10d1b 100644 --- a/src/lib/commands/setsect.c +++ b/src/lib/commands/setsect.c @@ -26,7 +26,7 @@ * --- * * setsect.c: Give resources to a country - * + * * Known contributors to this file: * David Muir Sharnoff * Steve McClure, 1998 diff --git a/src/lib/commands/shar.c b/src/lib/commands/shar.c index 748bc98b4..b3909f139 100644 --- a/src/lib/commands/shar.c +++ b/src/lib/commands/shar.c @@ -26,7 +26,7 @@ * --- * * shar.c: share a bmap with a friend - * + * * Known contributors to this file: * Ken Stevens, 1995 */ diff --git a/src/lib/commands/shark.c b/src/lib/commands/shark.c index c52532bdf..ec38b3c45 100644 --- a/src/lib/commands/shark.c +++ b/src/lib/commands/shark.c @@ -26,7 +26,7 @@ * --- * * shark.c: Transfer a loan by buying it out - * + * * Known contributors to this file: * Pat Loney, 1992 * Steve McClure, 1996-2000 diff --git a/src/lib/commands/shi.c b/src/lib/commands/shi.c index 2d33cec97..d15aa334d 100644 --- a/src/lib/commands/shi.c +++ b/src/lib/commands/shi.c @@ -26,7 +26,7 @@ * --- * * shi.c: Show a list of your ships - * + * * Known contributors to this file: * Steve McClure, 2000 */ diff --git a/src/lib/commands/shoo.c b/src/lib/commands/shoo.c index 8ecac739d..a6cd8ae0d 100644 --- a/src/lib/commands/shoo.c +++ b/src/lib/commands/shoo.c @@ -26,7 +26,7 @@ * --- * * shoo.c: Shoot some conquered populace or pigeons. - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/commands/show.c b/src/lib/commands/show.c index 081133da4..c4b0e4683 100644 --- a/src/lib/commands/show.c +++ b/src/lib/commands/show.c @@ -26,7 +26,7 @@ * --- * * show.c: Give info on empire objects, planes, boats, nukes, etc. - * + * * Known contributors to this file: * Julian Onions, 1988 * Steve McClure, 1997 diff --git a/src/lib/commands/shut.c b/src/lib/commands/shut.c index 9d09e702b..6e0fba8ba 100644 --- a/src/lib/commands/shut.c +++ b/src/lib/commands/shut.c @@ -26,7 +26,7 @@ * --- * * shut.c: Shut down the server with a warning. - * + * * Known contributors to this file: * Ken Stevens, 1995 * Markus Armbruster, 2007-2008 diff --git a/src/lib/commands/sinf.c b/src/lib/commands/sinf.c index e17cf3f7c..5d01ecd50 100644 --- a/src/lib/commands/sinf.c +++ b/src/lib/commands/sinf.c @@ -26,7 +26,7 @@ * --- * * sinf.c: Do an infrastructure report - * + * * Known contributors to this file: * Steve McClure, 1996 */ diff --git a/src/lib/commands/skyw.c b/src/lib/commands/skyw.c index 62f231201..c8a88a9e5 100644 --- a/src/lib/commands/skyw.c +++ b/src/lib/commands/skyw.c @@ -26,7 +26,7 @@ * --- * * skyw.c: Look at satellites in the sky. - * + * * Known contributors to this file: * Ken Stevens, 1995 */ diff --git a/src/lib/commands/sona.c b/src/lib/commands/sona.c index f2639b05f..7ee9ec942 100644 --- a/src/lib/commands/sona.c +++ b/src/lib/commands/sona.c @@ -26,7 +26,7 @@ * --- * * sona.c: Sonar from a sub (or other sonar-equipped ship) - * + * * Known contributors to this file: * Jim Griffith, 1989 * Ken Stevens, 1995 @@ -295,7 +295,7 @@ plane_sona(struct emp_qelem *plane_list, int x, int y, } } -/* +/* * line_of_sight() - is there a "straight" all water path from (x,y) to (tx,ty) * Ken & Irina Stevens, 1995 */ diff --git a/src/lib/commands/spy.c b/src/lib/commands/spy.c index 4cd61b009..5c31d2433 100644 --- a/src/lib/commands/spy.c +++ b/src/lib/commands/spy.c @@ -26,7 +26,7 @@ * --- * * spy.c: Spy on your neighbors - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1998-2000 diff --git a/src/lib/commands/sstat.c b/src/lib/commands/sstat.c index 520b5fd1e..ef40f8d3a 100644 --- a/src/lib/commands/sstat.c +++ b/src/lib/commands/sstat.c @@ -26,7 +26,7 @@ * --- * * sstat.c: Show the stats of your ships - * + * * Known contributors to this file: * Steve McClure, 1996 */ diff --git a/src/lib/commands/stop.c b/src/lib/commands/stop.c index 414d48400..eab8866cd 100644 --- a/src/lib/commands/stop.c +++ b/src/lib/commands/stop.c @@ -26,9 +26,9 @@ * --- * * stop.c: Stop a sector or unit from producing - * + * * Known contributors to this file: - * Thomas Ruschak, 1992 + * Thomas Ruschak, 1992 * Steve McClure, 1998 * Markus Armbruster, 2006-2008 */ diff --git a/src/lib/commands/stre.c b/src/lib/commands/stre.c index 4489627ca..03693ae3e 100644 --- a/src/lib/commands/stre.c +++ b/src/lib/commands/stre.c @@ -26,7 +26,7 @@ * --- * * stre.c: Calculate military strengths of sectors - * + * * Known contributors to this file: * Ken Stevens, 1995 */ diff --git a/src/lib/commands/strv.c b/src/lib/commands/strv.c index 61f41f384..7102b106a 100644 --- a/src/lib/commands/strv.c +++ b/src/lib/commands/strv.c @@ -26,9 +26,9 @@ * --- * * star.c: Do a starvation report - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/supp.c b/src/lib/commands/supp.c index 8c1a3e6a4..12e67d9ff 100644 --- a/src/lib/commands/supp.c +++ b/src/lib/commands/supp.c @@ -26,7 +26,7 @@ * --- * * supp.c: supply land units - * + * * Known contributors to this file: * Ken Stevens, 1995 */ diff --git a/src/lib/commands/surv.c b/src/lib/commands/surv.c index 92117a7d8..8a5da0385 100644 --- a/src/lib/commands/surv.c +++ b/src/lib/commands/surv.c @@ -26,7 +26,7 @@ * --- * * surv.c: Show sector survey - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/commands/swap.c b/src/lib/commands/swap.c index 309977c5e..6be3da4f1 100644 --- a/src/lib/commands/swap.c +++ b/src/lib/commands/swap.c @@ -26,7 +26,7 @@ * --- * * swap.c: Swap two sectors on the map - * + * * Known contributors to this file: * Ken Stevens, 1995 */ diff --git a/src/lib/commands/tele.c b/src/lib/commands/tele.c index 522097eb7..5667f85e6 100644 --- a/src/lib/commands/tele.c +++ b/src/lib/commands/tele.c @@ -26,7 +26,7 @@ * --- * * tele.c: Send a telegram - * + * * Known contributors to this file: * Steve McClure, 2000 */ diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c index 8f597a3de..5be3a1fac 100644 --- a/src/lib/commands/tend.c +++ b/src/lib/commands/tend.c @@ -26,7 +26,7 @@ * --- * * tend.c: Transfer goodies from one ship to another. - * + * * Known contributors to this file: * Dave Pare, 1986 * Thomas Ruschak, 1992 diff --git a/src/lib/commands/terr.c b/src/lib/commands/terr.c index e48e4d03c..be73fd49e 100644 --- a/src/lib/commands/terr.c +++ b/src/lib/commands/terr.c @@ -26,7 +26,7 @@ * --- * * terr.c: Designate territory of sectors - * + * * Known contributors to this file: * Edward M. Rynes Esq. */ diff --git a/src/lib/commands/thre.c b/src/lib/commands/thre.c index 03aed85a6..8e6337315 100644 --- a/src/lib/commands/thre.c +++ b/src/lib/commands/thre.c @@ -26,7 +26,7 @@ * --- * * thre.c: Describe/set threshold for given commodity - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1998 diff --git a/src/lib/commands/togg.c b/src/lib/commands/togg.c index befcc1d51..43f584547 100644 --- a/src/lib/commands/togg.c +++ b/src/lib/commands/togg.c @@ -26,7 +26,7 @@ * --- * * togg.c: Set player flags - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1996 diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c index b0ce4befe..7910f3513 100644 --- a/src/lib/commands/torp.c +++ b/src/lib/commands/torp.c @@ -26,7 +26,7 @@ * --- * * torp.c: Fire torpedoes at enemy ships - * + * * Known contributors to this file: * Dave Pare * Thomas Ruschak, 1992 diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c index c61c9c3a1..5b0af5890 100644 --- a/src/lib/commands/trad.c +++ b/src/lib/commands/trad.c @@ -26,7 +26,7 @@ * --- * * trad.c: Buy units/ships/planes/nukes from other nations. - * + * * Known contributors to this file: * Dave Pare, 1986 * Pat Loney, 1992 diff --git a/src/lib/commands/tran.c b/src/lib/commands/tran.c index 259e64ebb..223f1a7c5 100644 --- a/src/lib/commands/tran.c +++ b/src/lib/commands/tran.c @@ -26,7 +26,7 @@ * --- * * tran.c: Transport nuclear devices and planes - * + * * Known contributors to this file: * Steve McClure, 2000 * Markus Armbruster, 2006 diff --git a/src/lib/commands/trea.c b/src/lib/commands/trea.c index ac1c2da45..e601edcd9 100644 --- a/src/lib/commands/trea.c +++ b/src/lib/commands/trea.c @@ -26,9 +26,9 @@ * --- * * trea.c: Look at current treaties. - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/turn.c b/src/lib/commands/turn.c index c35703c17..640cef891 100644 --- a/src/lib/commands/turn.c +++ b/src/lib/commands/turn.c @@ -26,7 +26,7 @@ * --- * * turn.c: Turn the game on, off, or set the login message. - * + * * Known contributors to this file: * Marc Olzheim, 2004 */ diff --git a/src/lib/commands/upda.c b/src/lib/commands/upda.c index 49154036f..3ba68a1f7 100644 --- a/src/lib/commands/upda.c +++ b/src/lib/commands/upda.c @@ -26,7 +26,7 @@ * --- * * upda.c: Give the time of the next update - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/lib/commands/upgr.c b/src/lib/commands/upgr.c index 510f08f7d..08c9b1a20 100644 --- a/src/lib/commands/upgr.c +++ b/src/lib/commands/upgr.c @@ -26,7 +26,7 @@ * --- * * upgr.c: Upgrade tech of ships/planes/units - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1996-2000 diff --git a/src/lib/commands/vers.c b/src/lib/commands/vers.c index 8726471d7..6e618c020 100644 --- a/src/lib/commands/vers.c +++ b/src/lib/commands/vers.c @@ -26,7 +26,7 @@ * --- * * vers.c: Print out the Empire version - * + * * Known contributors to this file: * Dave Pare * Jeff Bailey diff --git a/src/lib/commands/wing.c b/src/lib/commands/wing.c index 51226f059..5b0172319 100644 --- a/src/lib/commands/wing.c +++ b/src/lib/commands/wing.c @@ -26,9 +26,9 @@ * --- * * wing.c: Add planes to a wing - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/commands/wipe.c b/src/lib/commands/wipe.c index cee5c1a4e..bd14be3cf 100644 --- a/src/lib/commands/wipe.c +++ b/src/lib/commands/wipe.c @@ -26,7 +26,7 @@ * --- * * wipe.c: Clear all existing distribution thresholds - * + * * Known contributors to this file: * Jim Griffith, 1989 */ diff --git a/src/lib/commands/work.c b/src/lib/commands/work.c index c68a1da94..874f4b5e9 100644 --- a/src/lib/commands/work.c +++ b/src/lib/commands/work.c @@ -26,7 +26,7 @@ * --- * * work.c: Implementation of the work command - * + * * Known contributors to this file: * Markus Armbruster, 2008 */ diff --git a/src/lib/commands/xdump.c b/src/lib/commands/xdump.c index d4713ba9c..f7b9b7e05 100644 --- a/src/lib/commands/xdump.c +++ b/src/lib/commands/xdump.c @@ -26,7 +26,7 @@ * --- * * xdump.c: Extended dump - * + * * Known contributors to this file: * Markus Armbruster, 2004-2008 */ diff --git a/src/lib/commands/zdon.c b/src/lib/commands/zdon.c index 27154415e..90ad50b9c 100644 --- a/src/lib/commands/zdon.c +++ b/src/lib/commands/zdon.c @@ -26,7 +26,7 @@ * --- * * zdon.c: Update right now - * + * * Known contributors to this file: * Doug Hay, 1990 * Markus Armbruster, 2007-2008 diff --git a/src/lib/common/bestpath.c b/src/lib/common/bestpath.c index 41b0e8308..9f7d33a96 100644 --- a/src/lib/common/bestpath.c +++ b/src/lib/common/bestpath.c @@ -26,17 +26,17 @@ * --- * * bestpath.c: Find the best path between sectors - * + * * Known contributors to this file: * Steve McClure, 1998-2000 * Markus Armbruster, 2006 */ -/* +/* * IMPORTANT: These routines are very selectively used in the server. * * "bestownedpath" is only used to determine paths for ships and planes. - * + * * Callers should not be calling these directly anymore. They should use * the "BestShipPath", "BestAirPath", "BestLandPath" and "BestDistPath" * functions. Note that those last two use the A* algorithms to find diff --git a/src/lib/common/btu.c b/src/lib/common/btu.c index 8edef74f5..92bb90069 100644 --- a/src/lib/common/btu.c +++ b/src/lib/common/btu.c @@ -26,7 +26,7 @@ * --- * * btu.c: Dealing with BTUs - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/lib/common/cargo.c b/src/lib/common/cargo.c index 5449d47b5..519c29f50 100644 --- a/src/lib/common/cargo.c +++ b/src/lib/common/cargo.c @@ -26,7 +26,7 @@ * --- * * cargo.c: Cargo lists - * + * * Known contributors to this file: * Markus Armbruster, 2008 */ diff --git a/src/lib/common/cnumb.c b/src/lib/common/cnumb.c index 26a48b112..7ed0c0151 100644 --- a/src/lib/common/cnumb.c +++ b/src/lib/common/cnumb.c @@ -26,9 +26,9 @@ * --- * * cnumb.c: Return country number give country name - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/common/conftab.c b/src/lib/common/conftab.c index 2a4abef1d..47586c0fb 100644 --- a/src/lib/common/conftab.c +++ b/src/lib/common/conftab.c @@ -26,7 +26,7 @@ * --- * * conftab.c: Load game configuration files - * + * * Known contributors to this file: * Markus Armbruster, 2006-2008 */ diff --git a/src/lib/common/ef_verify.c b/src/lib/common/ef_verify.c index ad96ee62a..f6bd6e23e 100644 --- a/src/lib/common/ef_verify.c +++ b/src/lib/common/ef_verify.c @@ -26,7 +26,7 @@ * --- * * ef_verify.c: Verify game configuration - * + * * Known contributors to this file: * Ron Koenderink, 2005 * Markus Armbruster, 2006-2008 @@ -99,11 +99,11 @@ verify_row(int type, int row) struct valstr val; int ret_val = 0; int flags = ef_flags(type); - + if (flags & EFF_MEM) - row_ref = ef_ptr(type, row); + row_ref = ef_ptr(type, row); else { - row_ref = malloc(empfile[type].size); + row_ref = malloc(empfile[type].size); ef_read(type, row, row_ref); } @@ -177,7 +177,7 @@ verify_row(int type, int row) } } } while (++j < n); - } + } if (!(flags & EFF_MEM)) free(row_ref); return ret_val; diff --git a/src/lib/common/emp_config.c b/src/lib/common/emp_config.c index df9e3c2c7..2111c9c42 100644 --- a/src/lib/common/emp_config.c +++ b/src/lib/common/emp_config.c @@ -26,7 +26,7 @@ * --- * * emp_config.c: Allows config file to control server config. from a file - * + * * Known contributors to this file: * Julian Onions, 1995 * Steve McClure, 1998-2000 diff --git a/src/lib/common/file.c b/src/lib/common/file.c index 4c63be718..8b0962f5e 100644 --- a/src/lib/common/file.c +++ b/src/lib/common/file.c @@ -26,7 +26,7 @@ * --- * * file.c: Operations on Empire tables (`files' for historical reasons) - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 2000 diff --git a/src/lib/common/filetable.c b/src/lib/common/filetable.c index 2b92ab5c3..12d4dcff9 100644 --- a/src/lib/common/filetable.c +++ b/src/lib/common/filetable.c @@ -26,7 +26,7 @@ * --- * * filetable.c: Empire game data file descriptions. - * + * * Known contributors to this file: * Markus Armbruster, 2005-2008 */ diff --git a/src/lib/common/game.c b/src/lib/common/game.c index 36dd3b315..0800d626e 100644 --- a/src/lib/common/game.c +++ b/src/lib/common/game.c @@ -26,7 +26,7 @@ * --- * * game.c: Game file access - * + * * Known contributors to this file: * Markus Armbruster, 2007-2008 */ @@ -51,7 +51,7 @@ #include "server.h" /* - * Disable updates + * Disable updates */ void game_ctrl_update(int enable) diff --git a/src/lib/common/hap_fact.c b/src/lib/common/hap_fact.c index 24f8e9ec0..e10e1768a 100644 --- a/src/lib/common/hap_fact.c +++ b/src/lib/common/hap_fact.c @@ -26,7 +26,7 @@ * --- * * hap_fact.c: Happiness effect on che - * + * * Known contributors to this file: * Steve McClure, 1996 */ diff --git a/src/lib/common/hours.c b/src/lib/common/hours.c index 6fa1cc4e9..bd12a7add 100644 --- a/src/lib/common/hours.c +++ b/src/lib/common/hours.c @@ -26,7 +26,7 @@ * --- * * hours.c: Game hours determination; is it legal to play now? - * + * * Known contributors to this file: * Dave Pare, 1989 * Doug Hay, 1998 diff --git a/src/lib/common/mailbox.c b/src/lib/common/mailbox.c index 516956013..a418705cf 100644 --- a/src/lib/common/mailbox.c +++ b/src/lib/common/mailbox.c @@ -26,9 +26,9 @@ * --- * * mailbox.c: Return string containing telegram file - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/common/mapdist.c b/src/lib/common/mapdist.c index 098789be4..323c9e386 100644 --- a/src/lib/common/mapdist.c +++ b/src/lib/common/mapdist.c @@ -26,9 +26,9 @@ * --- * * mapdist.c: Return the distance between two sectors - * + * * Known contributors to this file: - * + * */ /* diff --git a/src/lib/common/move.c b/src/lib/common/move.c index 18d748feb..3257acb97 100644 --- a/src/lib/common/move.c +++ b/src/lib/common/move.c @@ -26,7 +26,7 @@ * --- * * move.c: Misc. move routines - * + * * Known contributors to this file: * Markus Armbruster, 2006 */ diff --git a/src/lib/common/nat.c b/src/lib/common/nat.c index 1296a4fb9..c3d92db3e 100644 --- a/src/lib/common/nat.c +++ b/src/lib/common/nat.c @@ -26,7 +26,7 @@ * --- * * nat.c: Misc. accesses on the nation file - * + * * Known contributors to this file: * Dave Pare, 1989 */ diff --git a/src/lib/common/nsc.c b/src/lib/common/nsc.c index 6219c6d1a..774f85434 100644 --- a/src/lib/common/nsc.c +++ b/src/lib/common/nsc.c @@ -26,7 +26,7 @@ * --- * * nsc.c: Empire selection global structures - * + * * Known contributors to this file: * Markus Armbruster, 2004-2008 */ diff --git a/src/lib/common/nstreval.c b/src/lib/common/nstreval.c index 10a44110f..770df45fd 100644 --- a/src/lib/common/nstreval.c +++ b/src/lib/common/nstreval.c @@ -26,7 +26,7 @@ * --- * * nstreval.c: evaluate compiled values - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 1997 diff --git a/src/lib/common/path.c b/src/lib/common/path.c index 61bf4e7b0..103d3b0ae 100644 --- a/src/lib/common/path.c +++ b/src/lib/common/path.c @@ -27,7 +27,7 @@ * * path.c: Empire/A* Interface code. * Define AS_STATS for A* statistics. - * + * * Known contributors to this file: * Phil Lapsley, 1991 * Dave Pare, 1991 diff --git a/src/lib/common/rdsched.c b/src/lib/common/rdsched.c index 050549ad2..072084120 100644 --- a/src/lib/common/rdsched.c +++ b/src/lib/common/rdsched.c @@ -26,7 +26,7 @@ * --- * * rdsched.c: Read update schedule - * + * * Known contributors to this file: * Markus Armbruster, 2007-2008 */ @@ -57,7 +57,7 @@ static int delete_update(time_t, time_t[], int); * Read update schedule from file FNAME. * Put the first N-1 updates after T0 into SCHED[] in ascending order, * terminated with a zero. - * Use ANCHOR as initial anchor for anchor-relative times. + * Use ANCHOR as initial anchor for anchor-relative times. * Return 0 on success, -1 on failure. */ int diff --git a/src/lib/common/res_pop.c b/src/lib/common/res_pop.c index 5e03c2d2b..bf2d065df 100644 --- a/src/lib/common/res_pop.c +++ b/src/lib/common/res_pop.c @@ -26,7 +26,7 @@ * --- * * res_pop.c: Get maximum pop of a sector - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1998 diff --git a/src/lib/common/stmtch.c b/src/lib/common/stmtch.c index 7041e3df5..ddc63c7bd 100644 --- a/src/lib/common/stmtch.c +++ b/src/lib/common/stmtch.c @@ -26,7 +26,7 @@ * --- * * stmtch.c: Matching operations on structures and commands - * + * * Known contributors to this file: * Markus Armbruster, 2004-2008 */ diff --git a/src/lib/common/tfact.c b/src/lib/common/tfact.c index 8c0925814..3223e30bd 100644 --- a/src/lib/common/tfact.c +++ b/src/lib/common/tfact.c @@ -26,7 +26,7 @@ * --- * * tfact.c: return tech fact given multiplier - * + * * Known contributors to this file: * Yannick Trembley */ diff --git a/src/lib/common/type.c b/src/lib/common/type.c index 457f14f24..2f5a32bea 100644 --- a/src/lib/common/type.c +++ b/src/lib/common/type.c @@ -26,7 +26,7 @@ * --- * * type.c: typename to array offset translation - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 2000 diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c index b1561843e..07c3db0af 100644 --- a/src/lib/common/wantupd.c +++ b/src/lib/common/wantupd.c @@ -26,7 +26,7 @@ * --- * * wantupd.c: Check to se if an update is wanted and/or allowed. - * + * * Known contributors to this file: * Doug Hay, 1990 */ diff --git a/src/lib/common/xdump.c b/src/lib/common/xdump.c index f51c620b7..5d131c933 100644 --- a/src/lib/common/xdump.c +++ b/src/lib/common/xdump.c @@ -26,7 +26,7 @@ * --- * * xdump.c: Extended dumps - * + * * Known contributors to this file: * Markus Armbruster, 2004-2008 */ diff --git a/src/lib/common/xundump.c b/src/lib/common/xundump.c index 9b389260c..16056c25c 100644 --- a/src/lib/common/xundump.c +++ b/src/lib/common/xundump.c @@ -26,7 +26,7 @@ * --- * * xundump.c: Load back xdump output - * + * * Known contributors to this file: * Ron Koenderink, 2005 * Markus Armbruster, 2005-2008 diff --git a/src/lib/common/xy.c b/src/lib/common/xy.c index 87f3f4adc..0a8a9f89f 100644 --- a/src/lib/common/xy.c +++ b/src/lib/common/xy.c @@ -26,7 +26,7 @@ * --- * * xy.c: x-y related conversion routines - * + * * Known contributors to this file: * Dave Pare, 1989 * Markus Armbruster, 2004-2008 diff --git a/src/lib/empthread/io.c b/src/lib/empthread/io.c index 4c42a55ef..9b629e244 100644 --- a/src/lib/empthread/io.c +++ b/src/lib/empthread/io.c @@ -26,7 +26,7 @@ * --- * * io.c: Arrange for input and output on a file descriptor to be queued. - * + * * Known contributors to this file: * Doug Hay, 1998 * Steve McClure, 1998 diff --git a/src/lib/empthread/lwp.c b/src/lib/empthread/lwp.c index 838bb6b9f..190cc11cc 100644 --- a/src/lib/empthread/lwp.c +++ b/src/lib/empthread/lwp.c @@ -26,7 +26,7 @@ * --- * * lwp.c: Interface from Empire threads to LWP threads - * + * * Known contributors to this file: * Sasha Mikheev * Markus Armbruster, 2006-2007 diff --git a/src/lib/empthread/ntthread.c b/src/lib/empthread/ntthread.c index 8a4abbd23..68bd3ffb1 100644 --- a/src/lib/empthread/ntthread.c +++ b/src/lib/empthread/ntthread.c @@ -26,7 +26,7 @@ * --- * * ntthread.c: Interface from Empire threads to Windows NT threads - * + * * Known contributors to this file: * Doug Hay, 1998 * Steve McClure, 1998 @@ -304,12 +304,12 @@ loc_BlockThisThread(void) static BOOL WINAPI loc_Exit_Handler(DWORD fdwCtrlType) { - switch (fdwCtrlType) { + switch (fdwCtrlType) { case CTRL_C_EVENT: case CTRL_CLOSE_EVENT: - case CTRL_BREAK_EVENT: - case CTRL_LOGOFF_EVENT: - case CTRL_SHUTDOWN_EVENT: + case CTRL_BREAK_EVENT: + case CTRL_LOGOFF_EVENT: + case CTRL_SHUTDOWN_EVENT: empth_request_shutdown(); return TRUE; default: diff --git a/src/lib/empthread/posix.c b/src/lib/empthread/posix.c index 64fa13a80..4e62d568d 100644 --- a/src/lib/empthread/posix.c +++ b/src/lib/empthread/posix.c @@ -26,7 +26,7 @@ * --- * * posix.c: Thread-related code common to POSIX systems - * + * * Known contributors to this file: * Markus Armbruster, 2006 */ diff --git a/src/lib/empthread/pthread.c b/src/lib/empthread/pthread.c index 854e03264..aa8b56949 100644 --- a/src/lib/empthread/pthread.c +++ b/src/lib/empthread/pthread.c @@ -26,7 +26,7 @@ * --- * * pthread.c: Interface from Empire threads to POSIX threads - * + * * Known contributors to this file: * Sasha Mikheev * Steve McClure, 1998 diff --git a/src/lib/gen/chance.c b/src/lib/gen/chance.c index fc9ab3edb..1892e2e20 100644 --- a/src/lib/gen/chance.c +++ b/src/lib/gen/chance.c @@ -26,9 +26,9 @@ * --- * * chance.c: return 1 if "roll" is under the chance. - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/gen/disassoc.c b/src/lib/gen/disassoc.c index 1034aeecb..e80fdd896 100644 --- a/src/lib/gen/disassoc.c +++ b/src/lib/gen/disassoc.c @@ -26,7 +26,7 @@ * --- * * disassoc.c: Boilerplate daemonization code - * + * * Known contributors to this file: * Doug Hay, 1998 * Markus Armbruster, 2005 diff --git a/src/lib/gen/fnameat.c b/src/lib/gen/fnameat.c index 995320c36..8ddebcf4e 100644 --- a/src/lib/gen/fnameat.c +++ b/src/lib/gen/fnameat.c @@ -26,7 +26,7 @@ * --- * * fnameat.c: Interpret file names relative to a directory - * + * * Known contributors to this file: * Markus Armbruster, 2008 */ diff --git a/src/lib/gen/fsize.c b/src/lib/gen/fsize.c index 36af6d263..95078cfb4 100644 --- a/src/lib/gen/fsize.c +++ b/src/lib/gen/fsize.c @@ -26,7 +26,7 @@ * --- * * fsize.c: BSD dependant file and block sizing routines - * + * * Known contributors to this file: * Dave Pare, 1986 * Doug Hay, 1998 diff --git a/src/lib/gen/ioqueue.c b/src/lib/gen/ioqueue.c index 420e9c137..efa3904da 100644 --- a/src/lib/gen/ioqueue.c +++ b/src/lib/gen/ioqueue.c @@ -26,9 +26,9 @@ * --- * * ioqueue.c: Read and write i/o queues - * + * * Known contributors to this file: - * + * */ /* diff --git a/src/lib/gen/log.c b/src/lib/gen/log.c index 1c78f2efd..7f57182dc 100644 --- a/src/lib/gen/log.c +++ b/src/lib/gen/log.c @@ -26,7 +26,7 @@ * --- * * log.c: Log an Empire error to a file - * + * * Known contributors to this file: * Dave Pare, 1989 * Markus Armbruster, 2003-2008 diff --git a/src/lib/gen/numstr.c b/src/lib/gen/numstr.c index bc7b2fa6c..524ef4621 100644 --- a/src/lib/gen/numstr.c +++ b/src/lib/gen/numstr.c @@ -26,7 +26,7 @@ * --- * * numstr.c: Turn a number into a word - * + * * Known contributors to this file: * Steve McClure, 2000 */ diff --git a/src/lib/gen/parse.c b/src/lib/gen/parse.c index c9b8b7002..9481d16bb 100644 --- a/src/lib/gen/parse.c +++ b/src/lib/gen/parse.c @@ -26,9 +26,9 @@ * --- * * parse.c: Parse an Empire command line - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/gen/plur.c b/src/lib/gen/plur.c index 8bea201c3..d7b9cdaa8 100644 --- a/src/lib/gen/plur.c +++ b/src/lib/gen/plur.c @@ -26,9 +26,9 @@ * --- * * plur.c: Pluralize (is that a word?) something - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/gen/queue.c b/src/lib/gen/queue.c index 342072761..3295c8781 100644 --- a/src/lib/gen/queue.c +++ b/src/lib/gen/queue.c @@ -26,9 +26,9 @@ * --- * * queue.c: Various queue routines (for lists) - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/gen/round.c b/src/lib/gen/round.c index bb6de73c8..40f386561 100644 --- a/src/lib/gen/round.c +++ b/src/lib/gen/round.c @@ -26,9 +26,9 @@ * --- * * round.c: Round off functions - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/gen/scthash.c b/src/lib/gen/scthash.c index 1c0c28b4f..f13246b24 100644 --- a/src/lib/gen/scthash.c +++ b/src/lib/gen/scthash.c @@ -26,7 +26,7 @@ * --- * * scthash.c: Create a hash function based on the sector x-y mod table size - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/gen/tcp_listen.c b/src/lib/gen/tcp_listen.c index 10566a957..9b90ada58 100644 --- a/src/lib/gen/tcp_listen.c +++ b/src/lib/gen/tcp_listen.c @@ -26,7 +26,7 @@ * --- * * tcp_listen.c: Create a socket and listen on it - * + * * Known contributors to this file: * Markus Armbruster, 2005 */ diff --git a/src/lib/global/constants.c b/src/lib/global/constants.c index db8c6103e..2611679f5 100644 --- a/src/lib/global/constants.c +++ b/src/lib/global/constants.c @@ -26,7 +26,7 @@ * --- * * constants.c: Global constants - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1996 @@ -129,7 +129,7 @@ double decay_per_etu = 0.006; /* This gives a half life of ? etus, you can not get a precise number without intensive simulation (more than 3 digits). */ -double fallout_spread = 0.005; /* fraction of fallout that leaks into +double fallout_spread = 0.005; /* fraction of fallout that leaks into each surrounding sector */ /* end opt_FALLOUT */ diff --git a/src/lib/global/dir.c b/src/lib/global/dir.c index c08958c81..7b8b5f17b 100644 --- a/src/lib/global/dir.c +++ b/src/lib/global/dir.c @@ -27,7 +27,7 @@ * * dir.c: Directional orientation descriptions. Must agree with defines * in path.h - * + * * Known contributors to this file: */ diff --git a/src/lib/global/init.c b/src/lib/global/init.c index dc344e009..0207fbda0 100644 --- a/src/lib/global/init.c +++ b/src/lib/global/init.c @@ -26,7 +26,7 @@ * --- * * init.c: Initialize global unit arrays - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1997 diff --git a/src/lib/global/item.c b/src/lib/global/item.c index 6d7153126..3d52834c5 100644 --- a/src/lib/global/item.c +++ b/src/lib/global/item.c @@ -26,9 +26,9 @@ * --- * * item.c: Item characteristics - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/global/land.c b/src/lib/global/land.c index 5fd5dfe69..a96ff3d2f 100644 --- a/src/lib/global/land.c +++ b/src/lib/global/land.c @@ -26,7 +26,7 @@ * --- * * land.c: Land unit characteristics - * + * * Known contributors to this file: * Thomas Ruschak, 1992 * Ken Stevens, 1995 diff --git a/src/lib/global/news.c b/src/lib/global/news.c index 670ffdb6e..6827eb594 100644 --- a/src/lib/global/news.c +++ b/src/lib/global/news.c @@ -26,9 +26,9 @@ * --- * * news.c: News item characteristics - * + * * Known contributors to this file: - * + * */ /* diff --git a/src/lib/global/nuke.c b/src/lib/global/nuke.c index bcd21af05..9a814a0aa 100644 --- a/src/lib/global/nuke.c +++ b/src/lib/global/nuke.c @@ -26,9 +26,9 @@ * --- * * nuke.c: Nuke characteristics - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/global/options.c b/src/lib/global/options.c index 561bd1417..3cab294c2 100644 --- a/src/lib/global/options.c +++ b/src/lib/global/options.c @@ -26,7 +26,7 @@ * --- * * options.c: Options definitions - * + * * Known contributors to this file: * Steve McClure, 1998 * Markus Armbruster, 2005-2006 diff --git a/src/lib/global/path.c.in b/src/lib/global/path.c.in index 569d01a19..f34836d23 100644 --- a/src/lib/global/path.c.in +++ b/src/lib/global/path.c.in @@ -28,7 +28,7 @@ * @configure_input@ * path.c.in: Path initializations needed outside of the file * initialization tables - * + * * Known contributors to this file: * Markus Armbruster, 2005-2008 */ diff --git a/src/lib/global/plane.c b/src/lib/global/plane.c index d2be188f0..a9b769fd5 100644 --- a/src/lib/global/plane.c +++ b/src/lib/global/plane.c @@ -26,7 +26,7 @@ * --- * * plane.c: Plane characteristics - * + * * Known contributors to this file: * Dave Pare, 1986 * Jeff Bailey diff --git a/src/lib/global/product.c b/src/lib/global/product.c index f4b90fa49..46a9ffbe3 100644 --- a/src/lib/global/product.c +++ b/src/lib/global/product.c @@ -26,9 +26,9 @@ * --- * * product.c: Product information - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/global/sect.c b/src/lib/global/sect.c index 8f96d4368..b9d7b956d 100644 --- a/src/lib/global/sect.c +++ b/src/lib/global/sect.c @@ -26,7 +26,7 @@ * --- * * sect.c: Sector designation characteristics - * + * * Known contributors to this file: * Dave Pare, 1986 * Jeff Bailey diff --git a/src/lib/global/ship.c b/src/lib/global/ship.c index 6c5734873..f14124b3d 100644 --- a/src/lib/global/ship.c +++ b/src/lib/global/ship.c @@ -26,7 +26,7 @@ * --- * * ship.c: Ship characteristics - * + * * Known contributors to this file: * Dave Pare, 1986 * Jeff Bailey diff --git a/src/lib/global/symbol.c b/src/lib/global/symbol.c index 682ee5e47..924d375cc 100644 --- a/src/lib/global/symbol.c +++ b/src/lib/global/symbol.c @@ -26,7 +26,7 @@ * --- * * symbol.c: Empire symbol tables - * + * * Known contributors to this file: * Markus Armbruster, 2006-2008 */ diff --git a/src/lib/global/updtime.c b/src/lib/global/updtime.c index 524572d67..912251edb 100644 --- a/src/lib/global/updtime.c +++ b/src/lib/global/updtime.c @@ -26,7 +26,7 @@ * --- * * updtime.c: Scheduled update times - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/lib/global/version.c b/src/lib/global/version.c index 9e89bc591..00e2ce44d 100644 --- a/src/lib/global/version.c +++ b/src/lib/global/version.c @@ -25,8 +25,8 @@ * * --- * - * version.c: - * + * version.c: + * * Known contributors to this file: * Markus Armbruster, 2006 */ diff --git a/src/lib/lwp/arch.c b/src/lib/lwp/arch.c index d43dd8810..2cf1e23fe 100644 --- a/src/lib/lwp/arch.c +++ b/src/lib/lwp/arch.c @@ -27,7 +27,7 @@ * --- * * arch.c: architecture-dependant process context code - * + * * Known contributors to this file: * Dave Pare, 1994 * Steve McClure, 1994-2000 diff --git a/src/lib/lwp/lwp.c b/src/lib/lwp/lwp.c index 41b8a966f..c3ec7a4db 100644 --- a/src/lib/lwp/lwp.c +++ b/src/lib/lwp/lwp.c @@ -27,7 +27,7 @@ * --- * * lwp.c: lightweight process creation, destruction and manipulation - * + * * Known contributors to this file: * Markus Armbruster, 2004-2008 */ diff --git a/src/lib/lwp/lwpint.h b/src/lib/lwp/lwpint.h index 99a792f66..5b36077e5 100644 --- a/src/lib/lwp/lwpint.h +++ b/src/lib/lwp/lwpint.h @@ -27,7 +27,7 @@ * --- * * lwpint.h: lwp internal structures - * + * * Known contributors to this file: * Markus Armbruster, 2004-2008 */ diff --git a/src/lib/lwp/queue.c b/src/lib/lwp/queue.c index b1a9842cc..5bad087d1 100644 --- a/src/lib/lwp/queue.c +++ b/src/lib/lwp/queue.c @@ -27,7 +27,7 @@ * --- * * queue.c: queue manipulation routines - * + * * Known contributors to this file: * */ diff --git a/src/lib/lwp/rwlock.c b/src/lib/lwp/rwlock.c index 3ec746e28..217056438 100644 --- a/src/lib/lwp/rwlock.c +++ b/src/lib/lwp/rwlock.c @@ -27,7 +27,7 @@ * --- * * rwlock.c: Read-write locks - * + * * Known contributors to this file: * Ron Koenderink, 2007 * Markus Armbruster, 2007 diff --git a/src/lib/lwp/sel.c b/src/lib/lwp/sel.c index 3786c7eb1..d6ec8403e 100644 --- a/src/lib/lwp/sel.c +++ b/src/lib/lwp/sel.c @@ -27,7 +27,7 @@ * --- * * sel.c: arrange to block on read/write file descriptors using lwp - * + * * Known contributors to this file: * Dave Pare, 1994 * Markus Armbruster, 2007 @@ -59,7 +59,7 @@ static struct lwpProc **LwpFdwait; static struct lwpQueue LwpDelayq; /* The thread executing lwpSelect() */ -static struct lwpProc *LwpSelProc; +static struct lwpProc *LwpSelProc; void lwpInitSelect(struct lwpProc *proc) diff --git a/src/lib/lwp/sig.c b/src/lib/lwp/sig.c index 788f53f07..e844a2c59 100644 --- a/src/lib/lwp/sig.c +++ b/src/lib/lwp/sig.c @@ -26,7 +26,7 @@ * --- * * sig.c: Wait for signals - * + * * Known contributors to this file: * Markus Armbruster, 2006-2007 */ @@ -46,7 +46,7 @@ static sigset_t LwpSigCatched; /* - * LwpSigCatched changed since last + * LwpSigCatched changed since last */ static sig_atomic_t LwpSigCheck; diff --git a/src/lib/lwp/status.c b/src/lib/lwp/status.c index 85492f371..84005148a 100644 --- a/src/lib/lwp/status.c +++ b/src/lib/lwp/status.c @@ -27,7 +27,7 @@ * --- * * status.c: Process and perhaps display status messages - * + * * Known contributors to this file: * Dave Pare, 1994 */ diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c index 116e69b92..160ca6480 100644 --- a/src/lib/player/accept.c +++ b/src/lib/player/accept.c @@ -26,7 +26,7 @@ * --- * * accept.c: Keep track of people logged in - * + * * Known contributors to this file: * Dave Pare, 1994 * Markus Armbruster, 2005-2008 diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c index e91a50200..35182dded 100644 --- a/src/lib/player/dispatch.c +++ b/src/lib/player/dispatch.c @@ -26,7 +26,7 @@ * --- * * dispatch.c: Actually execute the command given - * + * * Known contributors to this file: * Dave Pare, 1994 * Steve McClure, 1998 diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c index 166836ac5..fc915a6c0 100644 --- a/src/lib/player/empdis.c +++ b/src/lib/player/empdis.c @@ -26,7 +26,7 @@ * --- * * empdis.c: Empire dispatcher stuff - * + * * Known contributors to this file: * Dave Pare, 1994 * Steve McClure, 2000 diff --git a/src/lib/player/empmod.c b/src/lib/player/empmod.c index 2a2a2913f..283d44c3f 100644 --- a/src/lib/player/empmod.c +++ b/src/lib/player/empmod.c @@ -26,7 +26,7 @@ * --- * * empmod.c: List all commands for Empire - * + * * Known contributors to this file: * Dave Pare, 1986 * Jeff Bailey diff --git a/src/lib/player/init_nats.c b/src/lib/player/init_nats.c index 280ca8abf..f1bfd2425 100644 --- a/src/lib/player/init_nats.c +++ b/src/lib/player/init_nats.c @@ -26,7 +26,7 @@ * --- * * init_nats.c: Initialize country and nation file stuff - * + * * Known contributors to this file: * Dave Pare, 1994 * Steve McClure, 2000 diff --git a/src/lib/player/login.c b/src/lib/player/login.c index 2fe444223..63d3c3f17 100644 --- a/src/lib/player/login.c +++ b/src/lib/player/login.c @@ -26,7 +26,7 @@ * --- * * login.c: Allow the player to login - * + * * Known contributors to this file: * Dave Pare, 1994 * Steve McClure, 2000 diff --git a/src/lib/player/nat.c b/src/lib/player/nat.c index 590d9782a..b31a28e06 100644 --- a/src/lib/player/nat.c +++ b/src/lib/player/nat.c @@ -26,7 +26,7 @@ * --- * * nat.c: Get nation stuff - * + * * Known contributors to this file: * Dave Pare, 1994 */ diff --git a/src/lib/player/player.c b/src/lib/player/player.c index 16664abcc..14a7aadda 100644 --- a/src/lib/player/player.c +++ b/src/lib/player/player.c @@ -26,7 +26,7 @@ * --- * * player.c: Main command loop for a player - * + * * Known contributors to this file: * Steve McClure, 2000 * Markus Armbruster, 2004-2008 diff --git a/src/lib/player/recvclient.c b/src/lib/player/recvclient.c index f94845ff5..467deedf0 100644 --- a/src/lib/player/recvclient.c +++ b/src/lib/player/recvclient.c @@ -26,7 +26,7 @@ * --- * * recvclient.c: Receive input from the client - * + * * Known contributors to this file: * Dave Pare, 1986 * Markus Armbruster, 2006-2008 diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c index 3e396c966..bcac43959 100644 --- a/src/lib/subs/aircombat.c +++ b/src/lib/subs/aircombat.c @@ -26,7 +26,7 @@ * --- * * aircombat.c: Deal with air to air combat - * + * * Known contributors to this file: * Dave Pare, 1986 * Thomas Ruschak, 1992 diff --git a/src/lib/subs/askyn.c b/src/lib/subs/askyn.c index 004384508..65e0f21cc 100644 --- a/src/lib/subs/askyn.c +++ b/src/lib/subs/askyn.c @@ -26,7 +26,7 @@ * --- * * askyn.c: The oldest routines in the book... ask questions of the user - * + * * Known contributors to this file: * Thomas Ruschak, 1993 * Doug Hay, 1998 diff --git a/src/lib/subs/aswplnsubs.c b/src/lib/subs/aswplnsubs.c index 79663b284..f6ab1f13a 100644 --- a/src/lib/subs/aswplnsubs.c +++ b/src/lib/subs/aswplnsubs.c @@ -26,7 +26,7 @@ * --- * * aswplnsubs.c: Various subroutines used for ASW planes - * + * * Known contributors to this file: * Ron Koenderink, 2004 */ @@ -71,7 +71,7 @@ add_shiplist(short uid, struct shiplist **head) } s = malloc(sizeof(struct shiplist)); - if (s2 != NULL) + if (s2 != NULL) s2->next = s; else *head = s; diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c index b541283e1..ef160d4ff 100644 --- a/src/lib/subs/attsub.c +++ b/src/lib/subs/attsub.c @@ -26,7 +26,7 @@ * --- * * attsub.c: Attack subroutines - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1996-2000 @@ -155,7 +155,7 @@ prcom(int inon, struct combat *com) /* * This is the combat object "type" based integrity check. It basically - * splits along three divisions: ship/sector, attacker/defender, + * splits along three divisions: ship/sector, attacker/defender, * first time/not first time. */ @@ -1845,7 +1845,7 @@ att_fight(int combat_mode, struct combat *off, struct emp_qelem *olist, att_infect_units(dlist, def->plague); /* - * Fighting is slightly random. There is always that last little + * Fighting is slightly random. There is always that last little * effort you see people put in. Or the stray bullet that takes out * an officer and the rest go into chaos. Things like that. * Thus, we have added a very slight random factor that will sometimes @@ -2586,7 +2586,7 @@ att_free_lists(struct emp_qelem *olist, struct emp_qelem *dlist) /* * sector_strength - Everyone starts at 1. You can get up to a max * of d_dstr, depending on how much you build up the - * defenses of the sector. + * defenses of the sector. */ double diff --git a/src/lib/subs/bigmap.c b/src/lib/subs/bigmap.c index 5f056ddd1..3f21514e9 100644 --- a/src/lib/subs/bigmap.c +++ b/src/lib/subs/bigmap.c @@ -27,9 +27,9 @@ * * bigmap.c: Updates a player's sector map using sector offsets and * simple overwrite rules. - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/subs/border.c b/src/lib/subs/border.c index a3157faab..26221a957 100644 --- a/src/lib/subs/border.c +++ b/src/lib/subs/border.c @@ -26,9 +26,9 @@ * --- * * border.c: Create a border around a map - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/subs/bridgefall.c b/src/lib/subs/bridgefall.c index 70fa4875c..c9e30af4f 100644 --- a/src/lib/subs/bridgefall.c +++ b/src/lib/subs/bridgefall.c @@ -26,7 +26,7 @@ * --- * * bridgefall.c: Knock a bridge down - * + * * Known contributors to this file: * Steve McClure, 1998 * Markus Armbruster, 2004-2008 diff --git a/src/lib/subs/bsanct.c b/src/lib/subs/bsanct.c index a6bbf33e5..11b89efad 100644 --- a/src/lib/subs/bsanct.c +++ b/src/lib/subs/bsanct.c @@ -26,9 +26,9 @@ * --- * * bsanct.c: Break Sanctuary subroutines - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/subs/caploss.c b/src/lib/subs/caploss.c index cb3c5942f..e8ecfcc2d 100644 --- a/src/lib/subs/caploss.c +++ b/src/lib/subs/caploss.c @@ -26,7 +26,7 @@ * --- * * caploss.c: Lose your capital (kiss of death) - * + * * Known contributors to this file: * Steve McClure, 2000 * Markus Armbruster, 2007-2008 diff --git a/src/lib/subs/check.c b/src/lib/subs/check.c index d8b315076..6e50ebce6 100644 --- a/src/lib/subs/check.c +++ b/src/lib/subs/check.c @@ -26,7 +26,7 @@ * --- * * check.c: Check a sector, plane, land unit, ship or nuke - * + * * Known contributors to this file: * Steve McClure, 1998 */ diff --git a/src/lib/subs/coastal.c b/src/lib/subs/coastal.c index 56c8567f2..ecc402ea6 100644 --- a/src/lib/subs/coastal.c +++ b/src/lib/subs/coastal.c @@ -26,7 +26,7 @@ * --- * * coastal.c: Routines to calculate the coastal flag - * + * * Known contributors to this file: * Ron Koenderink, 2005 */ diff --git a/src/lib/subs/control.c b/src/lib/subs/control.c index 0ce143d36..748a28264 100644 --- a/src/lib/subs/control.c +++ b/src/lib/subs/control.c @@ -26,7 +26,7 @@ * --- * * control.c: Military control functions - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/subs/damage.c b/src/lib/subs/damage.c index b0b763d29..95d763fb3 100644 --- a/src/lib/subs/damage.c +++ b/src/lib/subs/damage.c @@ -26,7 +26,7 @@ * --- * * damage.c: Damage stuff. - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 1997 diff --git a/src/lib/subs/detonate.c b/src/lib/subs/detonate.c index beca372a9..5bbd5fcd7 100644 --- a/src/lib/subs/detonate.c +++ b/src/lib/subs/detonate.c @@ -26,7 +26,7 @@ * --- * * detonate.c: Detonate a nuclear device in a sector. - * + * * Known contributors to this file: * Steve McClure, 1998-2000 */ diff --git a/src/lib/subs/disloan.c b/src/lib/subs/disloan.c index 0ef35431b..9a6c67072 100644 --- a/src/lib/subs/disloan.c +++ b/src/lib/subs/disloan.c @@ -26,7 +26,7 @@ * --- * * disloan.c: Display a loan - * + * * Known contributors to this file: * Pat Loney, 1992 * Steve McClure, 1996 diff --git a/src/lib/subs/distrea.c b/src/lib/subs/distrea.c index 8f6454b2a..bfb182c63 100644 --- a/src/lib/subs/distrea.c +++ b/src/lib/subs/distrea.c @@ -26,9 +26,9 @@ * --- * * distrea.c: Display treaty information - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/subs/empobj.c b/src/lib/subs/empobj.c index bd1e0560b..5e27bb8ed 100644 --- a/src/lib/subs/empobj.c +++ b/src/lib/subs/empobj.c @@ -27,7 +27,7 @@ * * empobj.c: Common functions on struct empobj and * union empobj_storage - * + * * Known contributors to this file: * Ron Koenderink, 2006 * Markus Armbruster, 2006-2008 diff --git a/src/lib/subs/fileinit.c b/src/lib/subs/fileinit.c index 1a63a1dd0..4b1619c64 100644 --- a/src/lib/subs/fileinit.c +++ b/src/lib/subs/fileinit.c @@ -26,7 +26,7 @@ * --- * * fileinit.c: Initialize Empire tables for full server operations. - * + * * Known contributors to this file: * Ron Koenderink, 2005 * Markus Armbruster, 2005-2008 diff --git a/src/lib/subs/fortdef.c b/src/lib/subs/fortdef.c index 5e931c779..7c8b4e46e 100644 --- a/src/lib/subs/fortdef.c +++ b/src/lib/subs/fortdef.c @@ -26,9 +26,9 @@ * --- * * fortdef.c: Fort defends an area. - * + * * Known contributors to this file: - * + * */ /* diff --git a/src/lib/subs/getbit.c b/src/lib/subs/getbit.c index 8379ffcda..94195a07d 100644 --- a/src/lib/subs/getbit.c +++ b/src/lib/subs/getbit.c @@ -26,7 +26,7 @@ * --- * * getbit.c: Replaces old bitmap code - * + * * Known contributors to this file: * Dave Pare, 1989 */ diff --git a/src/lib/subs/getele.c b/src/lib/subs/getele.c index 5fa442bce..9b46fa717 100644 --- a/src/lib/subs/getele.c +++ b/src/lib/subs/getele.c @@ -26,9 +26,9 @@ * --- * * getele.c: Read a telegram from a file or stdin and send it to a country - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/subs/getstarg.c b/src/lib/subs/getstarg.c index 62605d706..1f46e1386 100644 --- a/src/lib/subs/getstarg.c +++ b/src/lib/subs/getstarg.c @@ -26,9 +26,9 @@ * --- * * getstarg.c: Get a string argument (ask if not there) - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/subs/getstring.c b/src/lib/subs/getstring.c index 8f07230bf..229d112cb 100644 --- a/src/lib/subs/getstring.c +++ b/src/lib/subs/getstring.c @@ -26,9 +26,9 @@ * --- * * getstring.c: get string, printing a prompt if there is one - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/subs/journal.c b/src/lib/subs/journal.c index 9313135ab..4f553c51e 100644 --- a/src/lib/subs/journal.c +++ b/src/lib/subs/journal.c @@ -26,7 +26,7 @@ * --- * * journal.c: Log a journal of events to a file - * + * * Known contributors to this file: * Markus Armbruster, 2004-2008 * Ron Koenderink, 2008 @@ -86,7 +86,7 @@ journal_entry(char *fmt, ...) time(&now); fprintf(journal, "%.24s %10.10s ", ctime(&now), empth_name(empth_self())); - + va_start(ap, fmt); vsnprintf(buf, sizeof(buf) - 1, fmt, ap); va_end(ap); diff --git a/src/lib/subs/land.c b/src/lib/subs/land.c index de39de697..7c743ab04 100644 --- a/src/lib/subs/land.c +++ b/src/lib/subs/land.c @@ -26,7 +26,7 @@ * --- * * land.c: Land unit post-read and pre-write - * + * * Known contributors to this file: * Steve McClure, 1996 * Markus Armbruster, 2004-2008 diff --git a/src/lib/subs/landgun.c b/src/lib/subs/landgun.c index 151679a41..d011f9bad 100644 --- a/src/lib/subs/landgun.c +++ b/src/lib/subs/landgun.c @@ -26,7 +26,7 @@ * --- * * landgun.c: Fire weapons - * + * * Known contributors to this file: * Markus Armbruster, 2006-2008 */ diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c index 13a35f5c6..e91dc2796 100644 --- a/src/lib/subs/list.c +++ b/src/lib/subs/list.c @@ -26,7 +26,7 @@ * --- * * list.c: List ships, planes, units at a given x,y - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c index 8cbe13049..548877efc 100644 --- a/src/lib/subs/lndsub.c +++ b/src/lib/subs/lndsub.c @@ -26,7 +26,7 @@ * --- * * lndsub.c: Land unit subroutines - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1998-2000 @@ -214,7 +214,7 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas) else if (combat_mode == A_DEFEND) { /* * defending unit.. find a place to send it - * strategy: look for the most-populated + * strategy: look for the most-populated * adjacent sector that is owned by the unit * owner. Charge mob.. */ diff --git a/src/lib/subs/lostsub.c b/src/lib/subs/lostsub.c index 427ec5a56..2d0d04676 100644 --- a/src/lib/subs/lostsub.c +++ b/src/lib/subs/lostsub.c @@ -26,7 +26,7 @@ * --- * * lostsub.c: Subroutines for lost items - * + * * Known contributors to this file: * Steve McClure, 1997 * Markus Armbruster, 2008 diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c index 7144e1c83..08537dcab 100644 --- a/src/lib/subs/maps.c +++ b/src/lib/subs/maps.c @@ -26,7 +26,7 @@ * --- * * maps.c: Map routines - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1998 diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c index 9a252ad31..197c4bcd8 100644 --- a/src/lib/subs/mission.c +++ b/src/lib/subs/mission.c @@ -26,7 +26,7 @@ * --- * * mission.c: Mission subroutines for planes/ships/units - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1996-2000 @@ -902,7 +902,7 @@ mission_pln_sel(struct emp_qelem *list, int wantflags, int nowantflags, free(qp); continue; } - + if (pcp->pl_flags & P_A) { if (roll(100) > pln_identchance(pp, hardtarget, EF_SHIP)) { emp_remque(qp); diff --git a/src/lib/subs/move.c b/src/lib/subs/move.c index 6e2570e55..556599a2d 100644 --- a/src/lib/subs/move.c +++ b/src/lib/subs/move.c @@ -26,9 +26,9 @@ * --- * * move.c: Move something somewhere. - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c index 89dbc22e7..3652d9766 100644 --- a/src/lib/subs/mslsub.c +++ b/src/lib/subs/mslsub.c @@ -26,7 +26,7 @@ * --- * * mslsub.c: Missile subroutine stuff - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1996-2000 diff --git a/src/lib/subs/mtch.c b/src/lib/subs/mtch.c index f7c910b9b..92d6677e6 100644 --- a/src/lib/subs/mtch.c +++ b/src/lib/subs/mtch.c @@ -26,7 +26,7 @@ * --- * * mtch.c: Matching operations on structures and commands. - * + * * Known contributors to this file: * Markus Armbruster, 2004 */ diff --git a/src/lib/subs/natarg.c b/src/lib/subs/natarg.c index 6ee5e6466..53ccb62df 100644 --- a/src/lib/subs/natarg.c +++ b/src/lib/subs/natarg.c @@ -26,7 +26,7 @@ * --- * * natarg.c: Return countr # given country name or country # - * + * * Known contributors to this file: * Markus Armbruster, 2006 */ diff --git a/src/lib/subs/natsub.c b/src/lib/subs/natsub.c index a844bb36d..bc6b727f6 100644 --- a/src/lib/subs/natsub.c +++ b/src/lib/subs/natsub.c @@ -26,7 +26,7 @@ * --- * * nat.c: Nation subroutines - * + * * Known contributors to this file: * Markus Armbruster, 2008 */ diff --git a/src/lib/subs/neigh.c b/src/lib/subs/neigh.c index 890a49f2a..2fac0d026 100644 --- a/src/lib/subs/neigh.c +++ b/src/lib/subs/neigh.c @@ -26,9 +26,9 @@ * --- * * neigh.c: Return true if a neighbor - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/subs/nreport.c b/src/lib/subs/nreport.c index 2dffb2681..2e8332649 100644 --- a/src/lib/subs/nreport.c +++ b/src/lib/subs/nreport.c @@ -26,7 +26,7 @@ * --- * * nreport.c: File a news report. Downgrade relations if things get hostile. - * + * * Known contributors to this file: * Dave Pare, 1994 * Steve McClure, 1997 diff --git a/src/lib/subs/nstr.c b/src/lib/subs/nstr.c index dde96a0ea..ec625c6fd 100644 --- a/src/lib/subs/nstr.c +++ b/src/lib/subs/nstr.c @@ -26,7 +26,7 @@ * --- * * nstr.c: compile and execute the item selections on sectors - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 1997 diff --git a/src/lib/subs/nuke.c b/src/lib/subs/nuke.c index 6924cf053..1b8e71cc5 100644 --- a/src/lib/subs/nuke.c +++ b/src/lib/subs/nuke.c @@ -26,7 +26,7 @@ * --- * * nuke.c: Nuke post-read and pre-write data massage - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 1996 diff --git a/src/lib/subs/nxtitem.c b/src/lib/subs/nxtitem.c index 51bc027c5..cfcf77760 100644 --- a/src/lib/subs/nxtitem.c +++ b/src/lib/subs/nxtitem.c @@ -26,7 +26,7 @@ * --- * * nxtitem.c: Get the next item from a list - * + * * Known contributors to this file: * Dave Pare, 1989 */ diff --git a/src/lib/subs/nxtsct.c b/src/lib/subs/nxtsct.c index 9a97d7eb7..287a7f995 100644 --- a/src/lib/subs/nxtsct.c +++ b/src/lib/subs/nxtsct.c @@ -26,7 +26,7 @@ * --- * * nxtsct.c: Select/get the next sector from a range of sectors - * + * * Known contributors to this file: * Dave Pare, 1989 */ diff --git a/src/lib/subs/onearg.c b/src/lib/subs/onearg.c index 79c8e46eb..57b406f71 100644 --- a/src/lib/subs/onearg.c +++ b/src/lib/subs/onearg.c @@ -26,9 +26,9 @@ * --- * * onearg.c: Get one argument, or ask if not there - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/subs/paths.c b/src/lib/subs/paths.c index 9d98058d8..3b1aeba25 100644 --- a/src/lib/subs/paths.c +++ b/src/lib/subs/paths.c @@ -26,7 +26,7 @@ * --- * * path.c: Routines associated with paths, directions, etc. - * + * * Known contributors to this file: * Markus Armbruster, 2005-2008 */ diff --git a/src/lib/subs/plane.c b/src/lib/subs/plane.c index c49d9e53d..e6695237c 100644 --- a/src/lib/subs/plane.c +++ b/src/lib/subs/plane.c @@ -26,7 +26,7 @@ * --- * * plane.c: Plane post-read and pre-write data massage - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 1996 diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c index e0aaa1e64..b66947309 100644 --- a/src/lib/subs/plnsub.c +++ b/src/lib/subs/plnsub.c @@ -26,7 +26,7 @@ * --- * * plnsub.c: Plane subroutine stuff - * + * * Known contributors to this file: * Dave Pare, 1986 * Ken Stevens, 1995 @@ -805,7 +805,7 @@ pln_put1(struct plist *plp) * planes. */ int -could_be_on_ship(struct plnstr *pp, struct shpstr *sp, +could_be_on_ship(struct plnstr *pp, struct shpstr *sp, int n, int nch, int nxl, int nmsl) { struct plchrstr *pcp = &plchr[pp->pln_type]; diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c index cbec5212e..628d8310b 100644 --- a/src/lib/subs/pr.c +++ b/src/lib/subs/pr.c @@ -26,9 +26,9 @@ * --- * * pr.c: Output to players - * + * * Known contributors to this file: - * Dave Pare, 1986, 1989 + * Dave Pare, 1986, 1989 * Steve McClure, 1998-2000 * Ron Koenderink, 2005 * Markus Armbruster, 2005-2008 diff --git a/src/lib/subs/radmap.c b/src/lib/subs/radmap.c index 4f1226971..5461e582a 100644 --- a/src/lib/subs/radmap.c +++ b/src/lib/subs/radmap.c @@ -26,7 +26,7 @@ * --- * * radmap.c: Do a radar map given an x,y location, effic, and other - * + * * Known contributors to this file: * Dave Pare, 1989 */ @@ -171,7 +171,7 @@ radmap2(int owner, rad[y][x] = (*mchr[(int)ship.shp_type].m_name) & ~0x20; } } - /* + /* * make the center of the display 0 * so ve et al can find it. */ diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c index 31a481e43..df99de46a 100644 --- a/src/lib/subs/rej.c +++ b/src/lib/subs/rej.c @@ -26,7 +26,7 @@ * --- * * rej.c: Various relations setting routines - * + * * Known contributors to this file: * Dave Pare, 1994 */ diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c index 57eceeae7..59bf4ac78 100644 --- a/src/lib/subs/retreat.c +++ b/src/lib/subs/retreat.c @@ -26,7 +26,7 @@ * --- * * retreat.c: Retreat subroutines - * + * * Known contributors to this file: * Steve McClure, 2000 */ diff --git a/src/lib/subs/sarg.c b/src/lib/subs/sarg.c index f23903d08..f8839a8a5 100644 --- a/src/lib/subs/sarg.c +++ b/src/lib/subs/sarg.c @@ -26,7 +26,7 @@ * --- * * sarg.c: Parse selection arguments - * + * * Known contributors to this file: * Dave Pare, 1989 * Markus Armbruster, 2004-2008 @@ -116,7 +116,7 @@ sarg_area(char *str, struct range *rp) if (end == str || (*end != 0 && !isspace(*end)) || rlm < 0 || MAXNOR <= rlm) return 0; - } else + } else rlm = 0; getrealm(rlm, player->cnum, &realm); rp->lx = realm.r_xl; diff --git a/src/lib/subs/satmap.c b/src/lib/subs/satmap.c index cf69c5f0c..fd29c8eb5 100644 --- a/src/lib/subs/satmap.c +++ b/src/lib/subs/satmap.c @@ -26,7 +26,7 @@ * --- * * satmap.c: Do a satellite map given an x,y location, effic and other - * + * * Known contributors to this file: * Steve McClure, 2000 */ diff --git a/src/lib/subs/sect.c b/src/lib/subs/sect.c index 5edb0f399..cae10971f 100644 --- a/src/lib/subs/sect.c +++ b/src/lib/subs/sect.c @@ -26,7 +26,7 @@ * --- * * sect.c: Sector pre-write and post-read data massage - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 1996 diff --git a/src/lib/subs/sectdamage.c b/src/lib/subs/sectdamage.c index 920f45aa2..5086462e1 100644 --- a/src/lib/subs/sectdamage.c +++ b/src/lib/subs/sectdamage.c @@ -26,7 +26,7 @@ * --- * * sectdamage.c: Damage a sector - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 1996 diff --git a/src/lib/subs/ship.c b/src/lib/subs/ship.c index 3811374ea..725c535fe 100644 --- a/src/lib/subs/ship.c +++ b/src/lib/subs/ship.c @@ -26,7 +26,7 @@ * --- * * ship.c: Ship pre-write data massage - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 1996 diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c index 6c13c6eee..ac3125b8e 100644 --- a/src/lib/subs/show.c +++ b/src/lib/subs/show.c @@ -26,7 +26,7 @@ * --- * * show.c: General show routines - * + * * Known contributors to this file: * Julian Onions, 1988 * Jeff Bailey, 1990 @@ -592,7 +592,7 @@ void show_news(int tlev) { int i, j; - + pr("id category good will\n"); pr(" messsages\n"); @@ -668,7 +668,7 @@ fmttime2822(time_t t) TIME_ZONE_INFORMATION tzi; long time_offset; struct tm *time; - + time = localtime(&t); n = strftime(buf, sizeof(buf), "%a, %d %b %Y %H:%M:%S", time); diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c index 4bb1064f0..56abb29ab 100644 --- a/src/lib/subs/shpsub.c +++ b/src/lib/subs/shpsub.c @@ -26,7 +26,7 @@ * --- * * shpsub.c: Ship subroutine stuff - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1996-2000 @@ -810,11 +810,11 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor, } /* - * shp_miss_defence - * Check for incoming missiles with a P_MAR flag. + * shp_miss_defence + * Check for incoming missiles with a P_MAR flag. * Return True=1 if the missile was shotdown. * Or False=0 - * + * * Chad Zabel, July 95 */ diff --git a/src/lib/subs/snxtitem.c b/src/lib/subs/snxtitem.c index 2b795d2a3..2c7534d47 100644 --- a/src/lib/subs/snxtitem.c +++ b/src/lib/subs/snxtitem.c @@ -26,7 +26,7 @@ * --- * * snxtitem.c: Arrange item selection using one of many criteria. - * + * * Known contributors to this file: * Dave Pare, 1989 * Markus Armbruster, 2008 diff --git a/src/lib/subs/snxtsct.c b/src/lib/subs/snxtsct.c index c492ef702..7f2248b11 100644 --- a/src/lib/subs/snxtsct.c +++ b/src/lib/subs/snxtsct.c @@ -26,7 +26,7 @@ * --- * * snxtsct.c: Arrange sector selection using either distance or area - * + * * Known contributors to this file: * Dave Pare, 1989 * Markus Armbruster, 2006-2008 diff --git a/src/lib/subs/supply.c b/src/lib/subs/supply.c index a32b379d7..792495b98 100644 --- a/src/lib/subs/supply.c +++ b/src/lib/subs/supply.c @@ -26,9 +26,9 @@ * --- * * supply.c: Supply subroutines - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c index 4fd01c6fd..4491c6c10 100644 --- a/src/lib/subs/takeover.c +++ b/src/lib/subs/takeover.c @@ -26,7 +26,7 @@ * --- * * takeover.c: Take over from another country - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1996-2000 diff --git a/src/lib/subs/trdsub.c b/src/lib/subs/trdsub.c index 8195642bd..a3c535eb6 100644 --- a/src/lib/subs/trdsub.c +++ b/src/lib/subs/trdsub.c @@ -26,7 +26,7 @@ * --- * * trdsub.c: Trade helper functions - * + * * Known contributors to this file: * St Phil, 1989 * Pat Loney, 1992 diff --git a/src/lib/subs/trechk.c b/src/lib/subs/trechk.c index 9f488a3bd..e77e2b0ee 100644 --- a/src/lib/subs/trechk.c +++ b/src/lib/subs/trechk.c @@ -26,8 +26,8 @@ * --- * * trechk.c: Check to see if an actor has violated a treaty. - * - * Known contributors to this file: + * + * Known contributors to this file: * Steve McClure, 1998-1999 */ diff --git a/src/lib/subs/unitsub.c b/src/lib/subs/unitsub.c index a5a3655d6..1d6da175d 100644 --- a/src/lib/subs/unitsub.c +++ b/src/lib/subs/unitsub.c @@ -26,7 +26,7 @@ * --- * * unitsub.c: Common subroutines for multiple type of units - * + * * Known contributors to this file: * Ron Koenderink, 2007 * Markus Armbruster, 2008 diff --git a/src/lib/subs/whatitem.c b/src/lib/subs/whatitem.c index 2010f4876..d2eaae3c5 100644 --- a/src/lib/subs/whatitem.c +++ b/src/lib/subs/whatitem.c @@ -26,9 +26,9 @@ * --- * * whatitem.c: Return pointer to item chr struct given an item name - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/subs/wu.c b/src/lib/subs/wu.c index 6b43bf30e..5bcce21f3 100644 --- a/src/lib/subs/wu.c +++ b/src/lib/subs/wu.c @@ -26,7 +26,7 @@ * --- * * wu.c: Write a telegram to a user from another - * + * * Known contributors to this file: * Steve McClure, 2000 */ @@ -57,7 +57,7 @@ clear_telegram_is_new(natid to) } /* - * telegram_is_new counts new telegrams the same as read_telegrams in + * telegram_is_new counts new telegrams the same as read_telegrams in * lib/commands/mail.c and lib/commands/rea.c */ diff --git a/src/lib/update/age.c b/src/lib/update/age.c index 29dca549f..7f34f1537 100644 --- a/src/lib/update/age.c +++ b/src/lib/update/age.c @@ -26,7 +26,7 @@ * --- * * age.c: Age people - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/update/anno.c b/src/lib/update/anno.c index af4d4f107..f07d4419e 100644 --- a/src/lib/update/anno.c +++ b/src/lib/update/anno.c @@ -26,7 +26,7 @@ * --- * * anno.c: Delete announcements older than ANNO_KEEP_DAYS - * + * * Known contributors to this file: * Ken Stevens, 1995 * Doug Hay, 1998 diff --git a/src/lib/update/bp.c b/src/lib/update/bp.c index 3dd7b0d5e..cad281da3 100644 --- a/src/lib/update/bp.c +++ b/src/lib/update/bp.c @@ -26,7 +26,7 @@ * --- * * bp.c: The `build pointer' (bp) map - * + * * Known contributors to this file: * Ville Virrankoski, 1996 * Markus Armbruster, 2007 diff --git a/src/lib/update/deliver.c b/src/lib/update/deliver.c index 8ee140ec3..8f154c0ae 100644 --- a/src/lib/update/deliver.c +++ b/src/lib/update/deliver.c @@ -26,9 +26,9 @@ * --- * * deliver.c: Deliver commodities to neighboring sector - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/update/distribute.c b/src/lib/update/distribute.c index 462346d7e..685ab1fef 100644 --- a/src/lib/update/distribute.c +++ b/src/lib/update/distribute.c @@ -26,7 +26,7 @@ * --- * * distribute.c: Do distribution to sectors - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1998 diff --git a/src/lib/update/finish.c b/src/lib/update/finish.c index da03cee16..b8c8342c1 100644 --- a/src/lib/update/finish.c +++ b/src/lib/update/finish.c @@ -26,7 +26,7 @@ * --- * * finish.c: Finish the update - * + * * Known contributors to this file: * Dave Pare, 1986 * Thomas Ruschak, 1993 diff --git a/src/lib/update/human.c b/src/lib/update/human.c index fea35adef..8b8a23cf8 100644 --- a/src/lib/update/human.c +++ b/src/lib/update/human.c @@ -26,7 +26,7 @@ * --- * * human.c: Food related functions - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1996 diff --git a/src/lib/update/land.c b/src/lib/update/land.c index ee1c170fe..5c0fb5cf0 100644 --- a/src/lib/update/land.c +++ b/src/lib/update/land.c @@ -26,7 +26,7 @@ * --- * * land.c: Do production for land units - * + * * Known contributors to this file: * Dave Pare, 1986 * Thomas Ruschak, 1992 diff --git a/src/lib/update/main.c b/src/lib/update/main.c index 3a6663b78..32fa05956 100644 --- a/src/lib/update/main.c +++ b/src/lib/update/main.c @@ -26,7 +26,7 @@ * --- * * main.c: World update main function - * + * * Known contributors to this file: * Dave Pare, 1994 * Steve McClure, 1996 diff --git a/src/lib/update/material.c b/src/lib/update/material.c index dd1841c46..6aef082fe 100644 --- a/src/lib/update/material.c +++ b/src/lib/update/material.c @@ -26,7 +26,7 @@ * --- * * material.c: Tries to find materials for production - * + * * Known contributors to this file: * Ville Virrankoski, 1996 * Markus Armbruster, 2007 diff --git a/src/lib/update/mobility.c b/src/lib/update/mobility.c index c37f5dd40..95a81aa57 100644 --- a/src/lib/update/mobility.c +++ b/src/lib/update/mobility.c @@ -26,7 +26,7 @@ * --- * * mobility.c: Add mobility to each of the items which accumulate mobility. - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1998-1999 diff --git a/src/lib/update/move_sat.c b/src/lib/update/move_sat.c index 82728037a..1d94f5452 100644 --- a/src/lib/update/move_sat.c +++ b/src/lib/update/move_sat.c @@ -26,9 +26,9 @@ * --- * * move_sat.c: Move a satellite to the next point in it's orbit. - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c index e7d50b0ee..eba1ee283 100644 --- a/src/lib/update/nat.c +++ b/src/lib/update/nat.c @@ -26,7 +26,7 @@ * --- * * nat.c: Accumulate tech, edu, research and happiness. - * + * * Known contributors to this file: * Dave Pare, 1989 * Steve McClure, 1997 diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c index f34b56709..9670f1382 100644 --- a/src/lib/update/nav_ship.c +++ b/src/lib/update/nav_ship.c @@ -26,7 +26,7 @@ * --- * * nav_ship.c: Navigate ships and such - * + * * Known contributors to this file: * Chad Zabel, 1994 * Ken Stevens, 1995 @@ -228,7 +228,7 @@ nav_load_ship_at_sea(struct shpstr *sp) } /* new autonav code. - * + * * 1. Try and move to the next sector/harbor given by the player. * 2. Once we reach a harbor try and load all cargo holds for that ship. * 3. If the ship reaches its max levels set by the player try to use @@ -237,8 +237,8 @@ nav_load_ship_at_sea(struct shpstr *sp) * the ship gets sunk (forts,ect..), the ship hits a mine. * * Questions, bugs (fixes) , or new ideas should be directed at - * Chad Zabel. - * 6-1-94 + * Chad Zabel. + * 6-1-94 * Modified to use shp_nav by Ken Stevens 1995 */ int diff --git a/src/lib/update/nav_util.c b/src/lib/update/nav_util.c index ab9706208..0fd03dc92 100644 --- a/src/lib/update/nav_util.c +++ b/src/lib/update/nav_util.c @@ -26,9 +26,9 @@ * --- * * nav_util.c: Utilities for autonav and sail - * + * * Known contributors to this file: - * + * */ #include @@ -42,10 +42,10 @@ #include "ship.h" #include "update.h" -/* load a specific ship given its +/* load a specific ship given its * location and what field to modify. * new autonav code - * Chad Zabel 6/1/94 + * Chad Zabel 6/1/94 */ int load_it(struct shpstr *sp, struct sctstr *psect, int i) @@ -115,13 +115,13 @@ load_it(struct shpstr *sp, struct sctstr *psect, int i) } -/* unload_it +/* unload_it * A guess alot of this looks like load_it but because of its location * in the autonav code I had to split the 2 procedures up. * unload_it dumps all the goods from the ship to the harbor. * ONLY goods in the trade fields will be unloaded. * new autonav code - * Chad Zabel 6/1/94 + * Chad Zabel 6/1/94 */ void unload_it(struct shpstr *sp) diff --git a/src/lib/update/nxtitemp.c b/src/lib/update/nxtitemp.c index 6d01e2ccb..83d9d5961 100644 --- a/src/lib/update/nxtitemp.c +++ b/src/lib/update/nxtitemp.c @@ -26,7 +26,7 @@ * --- * * nxtitemp.c: Get next item from list - * + * * Known contributors to this file: * Dave Pare, 1989 */ diff --git a/src/lib/update/plague.c b/src/lib/update/plague.c index f1188f73f..e13f98183 100644 --- a/src/lib/update/plague.c +++ b/src/lib/update/plague.c @@ -26,7 +26,7 @@ * --- * * plague.c: Plague related functions - * + * * Known contributors to this file: * Steve McClure, 1998-2000 */ diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c index ca4930196..c4a536984 100644 --- a/src/lib/update/plane.c +++ b/src/lib/update/plane.c @@ -26,7 +26,7 @@ * --- * * plane.c: Do production for planes - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1998 diff --git a/src/lib/update/populace.c b/src/lib/update/populace.c index d73cc4008..c6f48703f 100644 --- a/src/lib/update/populace.c +++ b/src/lib/update/populace.c @@ -26,7 +26,7 @@ * --- * * populace.c: Return workforce available - * + * * Known contributors to this file: * Dave Pare, 1986 */ diff --git a/src/lib/update/prepare.c b/src/lib/update/prepare.c index 13e44f263..3ee6f7c51 100644 --- a/src/lib/update/prepare.c +++ b/src/lib/update/prepare.c @@ -26,7 +26,7 @@ * --- * * prepare.c: Perform prelimiary updates of sectors - * + * * Known contributors to this file: * Dave Pare, 1986 * Thomas Ruschak, 1992 diff --git a/src/lib/update/produce.c b/src/lib/update/produce.c index 027006f83..4c4c8dcac 100644 --- a/src/lib/update/produce.c +++ b/src/lib/update/produce.c @@ -26,9 +26,9 @@ * --- * * produce.c: Produce goodies - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/update/removewants.c b/src/lib/update/removewants.c index 46cf4564c..f4283768b 100644 --- a/src/lib/update/removewants.c +++ b/src/lib/update/removewants.c @@ -26,9 +26,9 @@ * --- * * removewants.c: Remove the "I want an update" flag. - * + * * Known contributors to this file: - * + * */ #include diff --git a/src/lib/update/revolt.c b/src/lib/update/revolt.c index 65472588b..d6fe613da 100644 --- a/src/lib/update/revolt.c +++ b/src/lib/update/revolt.c @@ -26,7 +26,7 @@ * --- * * revolt.c: Have disloyal populace revolt! - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1997-2000 diff --git a/src/lib/update/sail.c b/src/lib/update/sail.c index 6c0b81c29..079614cc4 100644 --- a/src/lib/update/sail.c +++ b/src/lib/update/sail.c @@ -26,7 +26,7 @@ * --- * * sail.c: Sail ships during the update - * + * * Known contributors to this file: * Doug Hay * Robert Forsman diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c index f1450f393..c6ceb9f32 100644 --- a/src/lib/update/sect.c +++ b/src/lib/update/sect.c @@ -26,7 +26,7 @@ * --- * * sect.c: Do production for sectors - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1996 @@ -291,7 +291,7 @@ produce_sect(int natnum, int etu, struct bp *bp, long p_sect[][2]) } else vec = sp->sct_item; - /* If everybody is dead, the sector reverts to unowned. + /* If everybody is dead, the sector reverts to unowned. * This is also checked at the end of the production in * they all starved or were plagued off. */ diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c index e1e7e0710..7d9e50a69 100644 --- a/src/lib/update/ship.c +++ b/src/lib/update/ship.c @@ -26,7 +26,7 @@ * --- * * ship.c: Do production for ships - * + * * Known contributors to this file: * Dave Pare, 1986 * Steve McClure, 1996 diff --git a/src/lib/w32/arpa/inet.h b/src/lib/w32/arpa/inet.h index e07e20314..72ca0f1c9 100644 --- a/src/lib/w32/arpa/inet.h +++ b/src/lib/w32/arpa/inet.h @@ -26,7 +26,7 @@ * --- * * arpa/inet.h: POSIX networking for WIN32 - * + * * Known contributors to this file: * Ron Koenderink, 2007 */ diff --git a/src/lib/w32/netdb.h b/src/lib/w32/netdb.h index 57a36518c..3c3434247 100644 --- a/src/lib/w32/netdb.h +++ b/src/lib/w32/netdb.h @@ -26,7 +26,7 @@ * --- * * netdb.h: POSIX networking for WIN32 - * + * * Known contributors to this file: * Ron Koenderink, 2007 */ diff --git a/src/lib/w32/netinet/in.h b/src/lib/w32/netinet/in.h index 91fedbc65..9f0397c0c 100644 --- a/src/lib/w32/netinet/in.h +++ b/src/lib/w32/netinet/in.h @@ -26,7 +26,7 @@ * --- * * netinet/in.h: POSIX networking for WIN32 - * + * * Known contributors to this file: * Ron Koenderink, 2007 */ diff --git a/src/lib/w32/posixfile.c b/src/lib/w32/posixfile.c index 53fb4fa00..cf8b0a6f3 100644 --- a/src/lib/w32/posixfile.c +++ b/src/lib/w32/posixfile.c @@ -26,7 +26,7 @@ * --- * * posixfile.c: POSIX equivalents for file operations - * + * * Known contributors to this file: * Ron Koenderink, 2007 */ diff --git a/src/lib/w32/posixio.c b/src/lib/w32/posixio.c index b813ae0e0..42ab8cde2 100644 --- a/src/lib/w32/posixio.c +++ b/src/lib/w32/posixio.c @@ -26,7 +26,7 @@ * --- * * posixio.c: POSIX IO emulation layer for WIN32 - * + * * Known contributors to this file: * Ron Koenderink, 2007 * Markus Armbruster, 2007-2008 @@ -314,7 +314,7 @@ posix_socket(int domain, int type, int protocol) { SOCKET handle; int new_fd; - + if ((new_fd = get_fd()) < 0) return -1; @@ -669,7 +669,7 @@ fcntl(int fd, int cmd, ...) if (type == FDMAP_IO_SOCKET) { result = WSAIoctl(handle, FIONBIO, NULL, 0,&nonblocking, sizeof (nonblocking), &bytes_returned, NULL, NULL); - + if(result < 0) { errno = WSAGetLastError(); return -1; diff --git a/src/lib/w32/service.c b/src/lib/w32/service.c index 8cb654996..d0b6ae968 100644 --- a/src/lib/w32/service.c +++ b/src/lib/w32/service.c @@ -26,7 +26,7 @@ * --- * * service.c: Windows services support - * + * * Known contributors to this file: * Ron Koenderink, 2004 */ @@ -57,7 +57,7 @@ install_service(char *program_name, char *service_name, char *config_file) schSCManager = OpenSCManager(NULL,NULL,SC_MANAGER_ALL_ACCESS); if (schSCManager == NULL) { - fprintf(stderr, "install_service failed to open Service Control Manager\n"); + fprintf(stderr, "install_service failed to open Service Control Manager\n"); return EXIT_FAILURE; } @@ -74,7 +74,7 @@ install_service(char *program_name, char *service_name, char *config_file) NULL, /* database service dependency */ NULL, /* LocalSystem account */ NULL); /* no password */ - + if (schService == NULL) { fprintf(stderr, "install_service failed to create service %s\n", service_name); return EXIT_FAILURE; @@ -107,7 +107,7 @@ remove_service(char *service_name) schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (schSCManager == NULL) { - fprintf(stderr, "remove_service failed to open Service Control Manager\n"); + fprintf(stderr, "remove_service failed to open Service Control Manager\n"); return EXIT_FAILURE; } @@ -124,81 +124,81 @@ remove_service(char *service_name) } if (CloseServiceHandle(hService) == 0) { - fprintf(stderr, "remove_service failed to close service %s\n", service_name); + fprintf(stderr, "remove_service failed to close service %s\n", service_name); return EXIT_FAILURE; } else { - printf("Service %s removed.\n", service_name); + printf("Service %s removed.\n", service_name); return EXIT_SUCCESS; } } -static SERVICE_STATUS service_status; +static SERVICE_STATUS service_status; static SERVICE_STATUS_HANDLE service_status_handle; static void WINAPI -service_ctrl_handler(DWORD Opcode) -{ - switch(Opcode) { - case SERVICE_CONTROL_PAUSE: +service_ctrl_handler(DWORD Opcode) +{ + switch(Opcode) { + case SERVICE_CONTROL_PAUSE: service_status.dwCurrentState = SERVICE_PAUSED; logerror("Pausing the service not supported"); - break; - - case SERVICE_CONTROL_CONTINUE: + break; + + case SERVICE_CONTROL_CONTINUE: logerror("Continuing the service not supported"); - service_status.dwCurrentState = SERVICE_RUNNING; - break; - + service_status.dwCurrentState = SERVICE_RUNNING; + break; + case SERVICE_CONTROL_STOP: logerror("Service stopping"); empth_request_shutdown(); - return; - - case SERVICE_CONTROL_INTERROGATE: + return; + + case SERVICE_CONTROL_INTERROGATE: /* Fall through to send current status. */ - break; - - default: - logerror("Unrecognized opcode %ld in ServiceCtrlHandler", - Opcode); - } - + break; + + default: + logerror("Unrecognized opcode %ld in ServiceCtrlHandler", + Opcode); + } + /* Send current status. */ if (!SetServiceStatus (service_status_handle, &service_status)) - logerror("SetServiceStatus error %ld",GetLastError()); - return; -} + logerror("SetServiceStatus error %ld",GetLastError()); + return; +} void WINAPI service_main(DWORD argc, LPTSTR *argv) { int sig; - - service_status.dwServiceType = SERVICE_WIN32; - service_status.dwCurrentState = SERVICE_START_PENDING; - service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP; - service_status.dwWin32ExitCode = 0; - service_status.dwServiceSpecificExitCode = 0; - service_status.dwCheckPoint = 0; - service_status.dwWaitHint = 0; - + + service_status.dwServiceType = SERVICE_WIN32; + service_status.dwCurrentState = SERVICE_START_PENDING; + service_status.dwControlsAccepted = SERVICE_ACCEPT_STOP; + service_status.dwWin32ExitCode = 0; + service_status.dwServiceSpecificExitCode = 0; + service_status.dwCheckPoint = 0; + service_status.dwWaitHint = 0; + service_status_handle = RegisterServiceCtrlHandler( DEFAULT_SERVICE_NAME, service_ctrl_handler); - - if (service_status_handle == (SERVICE_STATUS_HANDLE)0) { + + if (service_status_handle == (SERVICE_STATUS_HANDLE)0) { logerror("RegisterServiceCtrlHandler failed %lu\n", GetLastError()); finish_server(); return; } - + start_server(0); - + /* Initialization complete - report running status. */ - service_status.dwCurrentState = SERVICE_RUNNING; - service_status.dwCheckPoint = 0; - service_status.dwWaitHint = 0; - - if (!SetServiceStatus (service_status_handle, &service_status)) { + service_status.dwCurrentState = SERVICE_RUNNING; + service_status.dwCheckPoint = 0; + service_status.dwWaitHint = 0; + + if (!SetServiceStatus (service_status_handle, &service_status)) { logerror("SetServiceStatus error %ld\n", GetLastError()); } @@ -214,12 +214,12 @@ void stop_service(void) { logerror("Service stopped"); - service_status.dwWin32ExitCode = 0; - service_status.dwCurrentState = SERVICE_STOPPED; - service_status.dwCheckPoint = 0; - service_status.dwWaitHint = 0; + service_status.dwWin32ExitCode = 0; + service_status.dwCurrentState = SERVICE_STOPPED; + service_status.dwCheckPoint = 0; + service_status.dwWaitHint = 0; - if (!SetServiceStatus (service_status_handle, &service_status)) + if (!SetServiceStatus (service_status_handle, &service_status)) logerror("Error while stopping service SetServiceStatus" - " error %ld", GetLastError()); + " error %ld", GetLastError()); } diff --git a/src/lib/w32/sys/socket.h b/src/lib/w32/sys/socket.h index bd152404a..655cfa5ef 100644 --- a/src/lib/w32/sys/socket.h +++ b/src/lib/w32/sys/socket.h @@ -26,7 +26,7 @@ * --- * * sys/socket.h: POSIX socket emulation for WIN32 - * + * * Known contributors to this file: * Ron Koenderink, 2007 */ diff --git a/src/lib/w32/sys/uio.h b/src/lib/w32/sys/uio.h index 253ab6813..c32bf63db 100644 --- a/src/lib/w32/sys/uio.h +++ b/src/lib/w32/sys/uio.h @@ -26,7 +26,7 @@ * --- * * sys/uio.h: POSIX emulation for WIN32 - * + * * Known contributors to this file: * Ron Koenderink, 2007 */ diff --git a/src/lib/w32/unistd.h b/src/lib/w32/unistd.h index 807be4a5f..8e9774aec 100644 --- a/src/lib/w32/unistd.h +++ b/src/lib/w32/unistd.h @@ -26,7 +26,7 @@ * --- * * unistd.h: POSIX emulation for WIN32 - * + * * Known contributors to this file: * Ron Koenderink, 2007 */ diff --git a/src/lib/w32/w32misc.h b/src/lib/w32/w32misc.h index 9918febdb..bd64f94b2 100644 --- a/src/lib/w32/w32misc.h +++ b/src/lib/w32/w32misc.h @@ -27,7 +27,7 @@ * * w32misc.h: POSIX emulation for WIN32 * Stuff that can not be put in the equivalent include files - * + * * Known contributors to this file: * Ron Koenderink, 2007 */ diff --git a/src/scripts/nightly/nightlybuild.sh b/src/scripts/nightly/nightlybuild.sh index 58607afed..8f4f2d65f 100755 --- a/src/scripts/nightly/nightlybuild.sh +++ b/src/scripts/nightly/nightlybuild.sh @@ -312,16 +312,16 @@ fi *) echo "Removing existing server.log and journal.log" - if [ -f "../var/empire/server.log" ] + if [ -f "../var/empire/server.log" ] then rm "../var/empire/server.log" fi - if [ -f "../var/empire/journal.log" ] + if [ -f "../var/empire/journal.log" ] then rm "../var/empire/journal.log" fi echo "Removing existing schedule" - if [ -f "../etc/empire/schedule" ] + if [ -f "../etc/empire/schedule" ] then >../etc/empire/schedule fi @@ -357,7 +357,7 @@ fi } echo "Done (newcap_script / empire)." echo "" - + echo "TODO: Replace this with a real test script." echo "Just do some rudimentary testing for now." echo "" @@ -549,7 +549,7 @@ EOF runfeed 8 << EOF cen * map # -read y +read y exp c 0,0 50 gyyygh des -7,-3 ) lost * @@ -590,7 +590,7 @@ EOF runfeed 8 << EOF cen * map # -read y +read y lost * EOF echo "Run an update" @@ -1033,10 +1033,10 @@ EOF echo "Done (kill)." cd "${BOXDIR}/${WORKDIR}/emp4/var/empire" || err "Could not cd to ${BOXDIR}/${WORKDIR}/emp4/var/empire" echo "-- Start Server Log --" - cat server.log + cat server.log echo "-- End of Server Log --" echo "-- Start Journal Log --" - cat journal.log + cat journal.log echo "-- End of Journal Log --" echo "Server stopped" ;; diff --git a/src/scripts/nightly/patches/All/common_file.c.patch b/src/scripts/nightly/patches/All/common_file.c.patch index c995fd345..02b5f3b4b 100644 --- a/src/scripts/nightly/patches/All/common_file.c.patch +++ b/src/scripts/nightly/patches/All/common_file.c.patch @@ -4,7 +4,7 @@ index ae851ae..872c363 100644 +++ b/src/lib/common/file.c @@ -384,7 +384,7 @@ do_write(struct empfile *ep, void *buf, int id, int count) return -1; - + if (ep->flags & EFF_TYPED) { - now = ep->flags & EFF_NOTIME ? (time_t)-1 : time(NULL); + now = ep->flags & EFF_NOTIME ? (time_t)-1 : (time_t)100; diff --git a/src/scripts/nightly/patches/All/lost.c.patch b/src/scripts/nightly/patches/All/lost.c.patch index ceb200642..cfbc58912 100644 --- a/src/scripts/nightly/patches/All/lost.c.patch +++ b/src/scripts/nightly/patches/All/lost.c.patch @@ -3,7 +3,7 @@ index 8e410e6..b29c0a2 100644 --- a/src/lib/commands/lost.c +++ b/src/lib/commands/lost.c @@ -51,7 +51,7 @@ lost(void) - + prdate(); nlost = 0; - time(&now); diff --git a/src/scripts/nightly/patches/All/pr.c.patch b/src/scripts/nightly/patches/All/pr.c.patch index 19f1e10d8..4a917443f 100644 --- a/src/scripts/nightly/patches/All/pr.c.patch +++ b/src/scripts/nightly/patches/All/pr.c.patch @@ -4,7 +4,7 @@ Index: empserver/src/lib/subs/pr.c @@ -68,6 +68,13 @@ static void upr_player(struct player *pl, int id, char *buf); static void outid(struct player *pl, int n); - + +/* Hack for nightlybuild */ +char * +ctime(const time_t *clock) @@ -22,5 +22,5 @@ Index: empserver/src/lib/subs/pr.c - pr_id(player, C_PROMPT, "%d %d\n", min, btu); + pr_id(player, C_PROMPT, "0 640\n"); /* Hack for nightlybuild */ } - + /* diff --git a/src/scripts/nightly/patches/All/pre_update.patch b/src/scripts/nightly/patches/All/pre_update.patch index f44ed6f3f..f96b9db0a 100644 --- a/src/scripts/nightly/patches/All/pre_update.patch +++ b/src/scripts/nightly/patches/All/pre_update.patch @@ -8,5 +8,5 @@ Index: empserver/src/lib/global/constants.c -char *pre_update_hook = ""; +char *pre_update_hook = "echo pre_update_hook executed here"; int max_idle = 15; /* session dies after max_idle minutes idle */ - + int sect_mob_max = 127; /* sector mobility limits */ diff --git a/src/server/idle.c b/src/server/idle.c index 5ca5c16d6..ba0f7672f 100644 --- a/src/server/idle.c +++ b/src/server/idle.c @@ -26,7 +26,7 @@ * --- * * idle.c: Stamps out idle players. Runs at low priority - * + * * Known contributors to this file: * Dave Pare, 1994 */ diff --git a/src/server/main.c b/src/server/main.c index e487759a0..2bcdd2d9b 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -26,7 +26,7 @@ * --- * * main.c: Empire Server main, startup and shutdown - * + * * Known contributors to this file: * Dave Pare, 1994 * Steve McClure, 1996, 1998 diff --git a/src/server/marketup.c b/src/server/marketup.c index a18ead21d..925c84427 100644 --- a/src/server/marketup.c +++ b/src/server/marketup.c @@ -26,7 +26,7 @@ * --- * * marketup.c: Market updater thread - * + * * Known contributors to this file: * Steve McClure, 1996 * Markus Armbruster, 2007 diff --git a/src/server/shutdown.c b/src/server/shutdown.c index 7c739de39..0bf329005 100644 --- a/src/server/shutdown.c +++ b/src/server/shutdown.c @@ -26,7 +26,7 @@ * --- * * shutdown.c: Shuts down server. Runs at low priority. - * + * * Known contributors to this file: * Ken Stevens, 1995 * Markus Armbruster, 2007-2008 diff --git a/src/server/update.c b/src/server/update.c index 5477c0d42..28cb0772e 100644 --- a/src/server/update.c +++ b/src/server/update.c @@ -26,7 +26,7 @@ * --- * * update.c: Update scheduler - * + * * Known contributors to this file: * Dave Pare, 1994 * Steve McClure, 1996 @@ -221,9 +221,9 @@ int run_hook(char *cmd, char *name) { int status; - + fflush(NULL); - + status = system(cmd); if (status == 0) ; /* successful exit */ diff --git a/src/util/empdump.c b/src/util/empdump.c index a486e3af4..caeb049f2 100644 --- a/src/util/empdump.c +++ b/src/util/empdump.c @@ -26,7 +26,7 @@ * --- * * empdump.c: Export/import Empire game state - * + * * Known contributors to this file: * Markus Armbruster, 2008 */ diff --git a/src/util/empsched.c b/src/util/empsched.c index 3b626f0d2..1ac1cdc1c 100644 --- a/src/util/empsched.c +++ b/src/util/empsched.c @@ -26,7 +26,7 @@ * --- * * empsched.c: Show the update schedule - * + * * Known contributors to this file: * Markus Armbruster, 2007 */ diff --git a/src/util/fairland.c b/src/util/fairland.c index 1069a3942..77a5a538a 100644 --- a/src/util/fairland.c +++ b/src/util/fairland.c @@ -26,7 +26,7 @@ * --- * * fairland.c: Create a nice, new world - * + * * Known contributors to this file: * Ken Stevens, 1995 * Steve McClure, 1998 diff --git a/src/util/files.c b/src/util/files.c index 43ae38781..b68fc06b3 100644 --- a/src/util/files.c +++ b/src/util/files.c @@ -26,7 +26,7 @@ * --- * * files.c: Create all the misc files - * + * * Known contributors to this file: * Thomas Ruschak * Ken Stevens, 1995 diff --git a/src/util/pconfig.c b/src/util/pconfig.c index e9942e2ad..b8ba33ea3 100644 --- a/src/util/pconfig.c +++ b/src/util/pconfig.c @@ -26,7 +26,7 @@ * --- * * pconfig.c: Print the empire configuration - * + * * Known contributors to this file: * Julian Onions */ -- 2.43.0