Sun May 24 20:39:43 2009 UTC ()
KNF: fix formatting of preprocessor directives
(dholland)
diff -r1.8 -r1.9 src/games/trek/capture.c
diff -r1.8 -r1.9 src/games/trek/events.c
diff -r1.8 -r1.9 src/games/trek/externs.c
diff -r1.8 -r1.9 src/games/trek/schedule.c
diff -r1.6 -r1.7 src/games/trek/damaged.c
diff -r1.6 -r1.7 src/games/trek/klmove.c
diff -r1.12 -r1.13 src/games/trek/dumpgame.c
diff -r1.12 -r1.13 src/games/trek/trek.h
diff -r1.14 -r1.15 src/games/trek/main.c
diff -r1.7 -r1.8 src/games/trek/move.c
diff -r1.7 -r1.8 src/games/trek/systemname.c
diff -r1.11 -r1.12 src/games/trek/phaser.c
--- src/games/trek/capture.c 2009/05/24 19:18:44 1.8
+++ src/games/trek/capture.c 2009/05/24 20:39:43 1.9
@@ -1,4 +1,4 @@
-/* $NetBSD: capture.c,v 1.8 2009/05/24 19:18:44 dholland Exp $ */
+/* $NetBSD: capture.c,v 1.9 2009/05/24 20:39:43 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)capture.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: capture.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: capture.c,v 1.9 2009/05/24 20:39:43 dholland Exp $");
#endif
#endif /* not lint */
@@ -92,10 +92,10 @@
x /= k->power * Etc.nkling;
x *= Param.srndrprob;
i = x;
-# ifdef xTRACE
+#ifdef xTRACE
if (Trace)
printf("Prob = %d (%.4f)\n", i, x);
-# endif
+#endif
if (i > ranf(100))
{
/* guess what, he surrendered!!! */
--- src/games/trek/events.c 2008/01/28 01:15:55 1.8
+++ src/games/trek/events.c 2009/05/24 20:39:43 1.9
@@ -1,4 +1,4 @@
-/* $NetBSD: events.c,v 1.8 2008/01/28 01:15:55 dholland Exp $ */
+/* $NetBSD: events.c,v 1.9 2009/05/24 20:39:43 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)events.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: events.c,v 1.8 2008/01/28 01:15:55 dholland Exp $");
+__RCSID("$NetBSD: events.c,v 1.9 2009/05/24 20:39:43 dholland Exp $");
#endif
#endif /* not lint */
@@ -125,11 +125,11 @@
/* check for out of time */
if (Now.time <= 0.0)
lose(L_NOTIME);
-# ifdef xTRACE
+#ifdef xTRACE
if (evnum >= 0 && Trace)
printf("xdate = %.2f, evcode %d params %d %d %d\n",
xdate, e->evcode, e->x, e->y, e->systemname);
-# endif
+#endif
/* if evnum < 0, no events occurred */
if (evnum < 0)
--- src/games/trek/externs.c 2003/08/07 09:37:51 1.8
+++ src/games/trek/externs.c 2009/05/24 20:39:43 1.9
@@ -1,4 +1,4 @@
-/* $NetBSD: externs.c,v 1.8 2003/08/07 09:37:51 agc Exp $ */
+/* $NetBSD: externs.c,v 1.9 2009/05/24 20:39:43 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,11 +34,11 @@
#if 0
static char sccsid[] = "@(#)externs.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: externs.c,v 1.8 2003/08/07 09:37:51 agc Exp $");
+__RCSID("$NetBSD: externs.c,v 1.9 2009/05/24 20:39:43 dholland Exp $");
#endif
#endif /* not lint */
-# include "trek.h"
+#include "trek.h"
/*
** global variable definitions
--- src/games/trek/schedule.c 2009/05/24 19:18:44 1.8
+++ src/games/trek/schedule.c 2009/05/24 20:39:43 1.9
@@ -1,4 +1,4 @@
-/* $NetBSD: schedule.c,v 1.8 2009/05/24 19:18:44 dholland Exp $ */
+/* $NetBSD: schedule.c,v 1.9 2009/05/24 20:39:43 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)schedule.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: schedule.c,v 1.8 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: schedule.c,v 1.9 2009/05/24 20:39:43 dholland Exp $");
#endif
#endif /* not lint */
@@ -68,11 +68,11 @@
if (e->evcode)
continue;
/* got a slot */
-# ifdef xTRACE
+#ifdef xTRACE
if (Trace)
printf("schedule: type %d @ %.2f slot %d parm %d %d %d\n",
type, date, i, x, y, z);
-# endif
+#endif
e->evcode = type;
e->date = date;
e->x = x;
@@ -102,11 +102,11 @@
date = Now.date + offset;
e->date = date;
-# ifdef xTRACE
+#ifdef xTRACE
if (Trace)
printf("reschedule: type %d parm %d %d %d @ %.2f\n",
e->evcode, e->x, e->y, e->systemname, date);
-# endif
+#endif
return;
}
@@ -124,11 +124,11 @@
e = e1;
-# ifdef xTRACE
+#ifdef xTRACE
if (Trace)
printf("unschedule: type %d @ %.2f parm %d %d %d\n",
e->evcode, e->date, e->x, e->y, e->systemname);
-# endif
+#endif
Now.eventptr[e->evcode & E_EVENT] = 0;
e->date = TOOLARGE;
e->evcode = 0;
--- src/games/trek/damaged.c 2009/05/24 19:18:44 1.6
+++ src/games/trek/damaged.c 2009/05/24 20:39:43 1.7
@@ -1,4 +1,4 @@
-/* $NetBSD: damaged.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
+/* $NetBSD: damaged.c,v 1.7 2009/05/24 20:39:43 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,11 +34,11 @@
#if 0
static char sccsid[] = "@(#)damaged.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: damaged.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: damaged.c,v 1.7 2009/05/24 20:39:43 dholland Exp $");
#endif
#endif /* not lint */
-# include "trek.h"
+#include "trek.h"
/* DAMAGED -- check for device damaged
**
--- src/games/trek/klmove.c 2009/05/24 19:18:44 1.6
+++ src/games/trek/klmove.c 2009/05/24 20:39:43 1.7
@@ -1,4 +1,4 @@
-/* $NetBSD: klmove.c,v 1.6 2009/05/24 19:18:44 dholland Exp $ */
+/* $NetBSD: klmove.c,v 1.7 2009/05/24 20:39:43 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)klmove.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: klmove.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: klmove.c,v 1.7 2009/05/24 20:39:43 dholland Exp $");
#endif
#endif /* not lint */
@@ -78,10 +78,10 @@
double bigger;
int i;
-# ifdef xTRACE
+#ifdef xTRACE
if (Trace)
printf("klmove: fl = %d, Etc.nkling = %d\n", fl, Etc.nkling);
-# endif
+#endif
for (n = 0; n < Etc.nkling; n++)
{
k = &Etc.klingon[n];
--- src/games/trek/dumpgame.c 2009/05/24 19:18:44 1.12
+++ src/games/trek/dumpgame.c 2009/05/24 20:39:43 1.13
@@ -1,4 +1,4 @@
-/* $NetBSD: dumpgame.c,v 1.12 2009/05/24 19:18:44 dholland Exp $ */
+/* $NetBSD: dumpgame.c,v 1.13 2009/05/24 20:39:43 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dumpgame.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: dumpgame.c,v 1.12 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: dumpgame.c,v 1.13 2009/05/24 20:39:43 dholland Exp $");
#endif
#endif /* not lint */
@@ -45,7 +45,7 @@
#include "trek.h"
/*** THIS CONSTANT MUST CHANGE AS THE DATA SPACES CHANGE ***/
-# define VERSION 2
+#define VERSION 2
struct dump
{
--- src/games/trek/trek.h 2009/03/31 18:48:16 1.12
+++ src/games/trek/trek.h 2009/05/24 20:39:43 1.13
@@ -1,4 +1,4 @@
-/* $NetBSD: trek.h,v 1.12 2009/03/31 18:48:16 christos Exp $ */
+/* $NetBSD: trek.h,v 1.13 2009/05/24 20:39:43 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -48,9 +48,9 @@
/********************* GALAXY **************************/
/* galactic parameters */
-# define NSECTS 10 /* dimensions of quadrant in sectors */
-# define NQUADS 8 /* dimension of galazy in quadrants */
-# define NINHAB 32 /* number of quadrants which are inhabited */
+#define NSECTS 10 /* dimensions of quadrant in sectors */
+#define NQUADS 8 /* dimension of galazy in quadrants */
+#define NINHAB 32 /* number of quadrants which are inhabited */
struct quad /* definition for each quadrant */
{
@@ -62,8 +62,8 @@
char qsystemname; /* starsystem name (see below) */
};
-# define Q_DISTRESSED 0200
-# define Q_SYSTEM 077
+#define Q_DISTRESSED 0200
+#define Q_SYSTEM 077
/* systemname conventions:
* 1 -> NINHAB index into Systemname table for live system.
@@ -86,14 +86,14 @@
extern struct quad Quad[NQUADS][NQUADS];
/* defines for sector map (below) */
-# define EMPTY '.'
-# define STAR '*'
-# define BASE '#'
-# define ENTERPRISE 'E'
-# define QUEENE 'Q'
-# define KLINGON 'K'
-# define INHABIT '@'
-# define HOLE ' '
+#define EMPTY '.'
+#define STAR '*'
+#define BASE '#'
+#define ENTERPRISE 'E'
+#define QUEENE 'Q'
+#define KLINGON 'K'
+#define INHABIT '@'
+#define HOLE ' '
/* current sector map */
extern char Sect[NSECTS][NSECTS];
@@ -102,23 +102,23 @@
/************************ DEVICES ******************************/
-# define NDEV 16 /* max number of devices */
+#define NDEV 16 /* max number of devices */
/* device tokens */
-# define WARP 0 /* warp engines */
-# define SRSCAN 1 /* short range scanners */
-# define LRSCAN 2 /* long range scanners */
-# define PHASER 3 /* phaser control */
-# define TORPED 4 /* photon torpedo control */
-# define IMPULSE 5 /* impulse engines */
-# define SHIELD 6 /* shield control */
-# define COMPUTER 7 /* on board computer */
-# define SSRADIO 8 /* subspace radio */
-# define LIFESUP 9 /* life support systems */
-# define SINS 10 /* Space Inertial Navigation System */
-# define CLOAK 11 /* cloaking device */
-# define XPORTER 12 /* transporter */
-# define SHUTTLE 13 /* shuttlecraft */
+#define WARP 0 /* warp engines */
+#define SRSCAN 1 /* short range scanners */
+#define LRSCAN 2 /* long range scanners */
+#define PHASER 3 /* phaser control */
+#define TORPED 4 /* photon torpedo control */
+#define IMPULSE 5 /* impulse engines */
+#define SHIELD 6 /* shield control */
+#define COMPUTER 7 /* on board computer */
+#define SSRADIO 8 /* subspace radio */
+#define LIFESUP 9 /* life support systems */
+#define SINS 10 /* Space Inertial Navigation System */
+#define CLOAK 11 /* cloaking device */
+#define XPORTER 12 /* transporter */
+#define SHUTTLE 13 /* shuttlecraft */
/* device names */
struct device
@@ -131,22 +131,22 @@
/*************************** EVENTS ****************************/
-# define NEVENTS 12 /* number of different event types */
+#define NEVENTS 12 /* number of different event types */
-# define E_LRTB 1 /* long range tractor beam */
-# define E_KATSB 2 /* Klingon attacks starbase */
-# define E_KDESB 3 /* Klingon destroys starbase */
-# define E_ISSUE 4 /* distress call is issued */
-# define E_ENSLV 5 /* Klingons enslave a quadrant */
-# define E_REPRO 6 /* a Klingon is reproduced */
-# define E_FIXDV 7 /* fix a device */
-# define E_ATTACK 8 /* Klingon attack during rest period */
-# define E_SNAP 9 /* take a snapshot for time warp */
-# define E_SNOVA 10 /* supernova occurs */
+#define E_LRTB 1 /* long range tractor beam */
+#define E_KATSB 2 /* Klingon attacks starbase */
+#define E_KDESB 3 /* Klingon destroys starbase */
+#define E_ISSUE 4 /* distress call is issued */
+#define E_ENSLV 5 /* Klingons enslave a quadrant */
+#define E_REPRO 6 /* a Klingon is reproduced */
+#define E_FIXDV 7 /* fix a device */
+#define E_ATTACK 8 /* Klingon attack during rest period */
+#define E_SNAP 9 /* take a snapshot for time warp */
+#define E_SNOVA 10 /* supernova occurs */
-# define E_GHOST 0100 /* ghost of a distress call if ssradio out */
-# define E_HIDDEN 0200 /* event that is unreportable because ssradio out */
-# define E_EVENT 077 /* mask to get event code */
+#define E_GHOST 0100 /* ghost of a distress call if ssradio out */
+#define E_HIDDEN 0200 /* event unreportable because ssradio out */
+#define E_EVENT 077 /* mask to get event code */
struct event
{
@@ -165,7 +165,7 @@
* 0 unallocated
*/
-# define MAXEVENTS 25 /* max number of concurrently pending events */
+#define MAXEVENTS 25 /* max number of concurrently pending events */
extern struct event Event[MAXEVENTS]; /* dynamic event list; one entry per pending event */
@@ -180,24 +180,24 @@
char srndreq; /* set if surrender has been requested */
};
-# define MAXKLQUAD 9 /* maximum klingons per quadrant */
+#define MAXKLQUAD 9 /* maximum klingons per quadrant */
/********************** MISCELLANEOUS ***************************/
/* condition codes */
-# define GREEN 0
-# define DOCKED 1
-# define YELLOW 2
-# define RED 3
+#define GREEN 0
+#define DOCKED 1
+#define YELLOW 2
+#define RED 3
/* starbase coordinates */
-# define MAXBASES 9 /* maximum number of starbases in galaxy */
+#define MAXBASES 9 /* maximum number of starbases in galaxy */
/* distress calls */
-# define MAXDISTR 5 /* maximum concurrent distress calls */
+#define MAXDISTR 5 /* maximum concurrent distress calls */
/* phaser banks */
-# define NBANKS 6 /* number of phaser banks */
+#define NBANKS 6 /* number of phaser banks */
struct xy
{
@@ -342,35 +342,35 @@
*/
/* Klingon move indicies */
-# define KM_OB 0 /* Old quadrant, Before attack */
-# define KM_OA 1 /* Old quadrant, After attack */
-# define KM_EB 2 /* Enter quadrant, Before attack */
-# define KM_EA 3 /* Enter quadrant, After attack */
-# define KM_LB 4 /* Leave quadrant, Before attack */
-# define KM_LA 5 /* Leave quadrant, After attack */
+#define KM_OB 0 /* Old quadrant, Before attack */
+#define KM_OA 1 /* Old quadrant, After attack */
+#define KM_EB 2 /* Enter quadrant, Before attack */
+#define KM_EA 3 /* Enter quadrant, After attack */
+#define KM_LB 4 /* Leave quadrant, Before attack */
+#define KM_LA 5 /* Leave quadrant, After attack */
/* you lose codes */
-# define L_NOTIME 1 /* ran out of time */
-# define L_NOENGY 2 /* ran out of energy */
-# define L_DSTRYD 3 /* destroyed by a Klingon */
-# define L_NEGENB 4 /* ran into the negative energy barrier */
-# define L_SUICID 5 /* destroyed in a nova */
-# define L_SNOVA 6 /* destroyed in a supernova */
-# define L_NOLIFE 7 /* life support died (so did you) */
-# define L_NOHELP 8 /* you could not be rematerialized */
-# define L_TOOFAST 9 /* pretty stupid going at warp 10 */
-# define L_STAR 10 /* ran into a star */
-# define L_DSTRCT 11 /* self destructed */
-# define L_CAPTURED 12 /* captured by Klingons */
-# define L_NOCREW 13 /* you ran out of crew */
+#define L_NOTIME 1 /* ran out of time */
+#define L_NOENGY 2 /* ran out of energy */
+#define L_DSTRYD 3 /* destroyed by a Klingon */
+#define L_NEGENB 4 /* ran into the negative energy barrier */
+#define L_SUICID 5 /* destroyed in a nova */
+#define L_SNOVA 6 /* destroyed in a supernova */
+#define L_NOLIFE 7 /* life support died (so did you) */
+#define L_NOHELP 8 /* you could not be rematerialized */
+#define L_TOOFAST 9 /* pretty stupid going at warp 10 */
+#define L_STAR 10 /* ran into a star */
+#define L_DSTRCT 11 /* self destructed */
+#define L_CAPTURED 12 /* captured by Klingons */
+#define L_NOCREW 13 /* you ran out of crew */
/****************** COMPILE OPTIONS ***********************/
/* Trace info */
-# define xTRACE 1
+#define xTRACE 1
extern int Trace;
-# define TOOLARGE (DBL_MAX / 2) /* < DOUBLE_MAX for everyone */
+#define TOOLARGE (DBL_MAX / 2) /* < DOUBLE_MAX for everyone */
/* abandon.c */
void abandon(int);
--- src/games/trek/main.c 2009/05/24 19:18:44 1.14
+++ src/games/trek/main.c 2009/05/24 20:39:43 1.15
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.14 2009/05/24 19:18:44 dholland Exp $ */
+/* $NetBSD: main.c,v 1.15 2009/05/24 20:39:43 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: main.c,v 1.14 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: main.c,v 1.15 2009/05/24 20:39:43 dholland Exp $");
#endif
#endif /* not lint */
@@ -54,7 +54,7 @@
#include "trek.h"
#include "getpar.h"
-# define PRIO 00 /* default priority */
+#define PRIO 00 /* default priority */
uid_t Mother = 51 + (51 << 8);
@@ -204,13 +204,13 @@
Etc.fast = 0;
break;
-# ifdef xTRACE
+#ifdef xTRACE
case 't': /* trace */
if (getuid() != Mother)
goto badflag;
Trace++;
break;
-# endif
+#endif
case 'p': /* set priority */
if (getuid() != Mother)
--- src/games/trek/move.c 2009/05/24 19:18:44 1.7
+++ src/games/trek/move.c 2009/05/24 20:39:43 1.8
@@ -1,4 +1,4 @@
-/* $NetBSD: move.c,v 1.7 2009/05/24 19:18:44 dholland Exp $ */
+/* $NetBSD: move.c,v 1.8 2009/05/24 20:39:43 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: move.c,v 1.7 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: move.c,v 1.8 2009/05/24 20:39:43 dholland Exp $");
#endif
#endif /* not lint */
@@ -91,11 +91,11 @@
double xn;
double evtime;
-# ifdef xTRACE
+#ifdef xTRACE
if (Trace)
printf("move: ramflag %d course %d time %.2f speed %.2f\n",
ramflag, course, time, speed);
-# endif
+#endif
sectsize = NSECTS;
/* initialize delta factors for move */
angle = course * 0.0174532925;
@@ -116,12 +116,12 @@
/* check for long range tractor beams */
/**** TEMPORARY CODE == DEBUGGING ****/
evtime = Now.eventptr[E_LRTB]->date - Now.date;
-# ifdef xTRACE
+#ifdef xTRACE
if (Trace)
printf("E.ep = %p, ->evcode = %d, ->date = %.2f, evtime = %.2f\n",
Now.eventptr[E_LRTB], Now.eventptr[E_LRTB]->evcode,
Now.eventptr[E_LRTB]->date, evtime);
-# endif
+#endif
if (time > evtime && Etc.nkling < 3)
{
/* then we got a LRTB */
@@ -138,20 +138,20 @@
y = Ship.secty + 0.5;
xn = NSECTS * dist * bigger;
n = xn + 0.5;
-# ifdef xTRACE
+#ifdef xTRACE
if (Trace)
printf("dx = %.2f, dy = %.2f, xn = %.2f, n = %d\n", dx, dy, xn, n);
-# endif
+#endif
Move.free = 0;
for (i = 0; i < n; i++)
{
ix = (x += dx);
iy = (y += dy);
-# ifdef xTRACE
+#ifdef xTRACE
if (Trace)
printf("ix = %d, x = %.2f, iy = %d, y = %.2f\n", ix, x, iy, y);
-# endif
+#endif
if (x < 0.0 || y < 0.0 || x >= sectsize || y >= sectsize)
{
/* enter new quadrant */
@@ -165,10 +165,10 @@
iy = -1;
else
iy = dy + 0.5;
-# ifdef xTRACE
+#ifdef xTRACE
if (Trace)
printf("New quad: ix = %d, iy = %d\n", ix, iy);
-# endif
+#endif
Ship.sectx = x;
Ship.secty = y;
compkldist(0);
--- src/games/trek/systemname.c 2009/05/24 19:18:44 1.7
+++ src/games/trek/systemname.c 2009/05/24 20:39:43 1.8
@@ -1,4 +1,4 @@
-/* $NetBSD: systemname.c,v 1.7 2009/05/24 19:18:44 dholland Exp $ */
+/* $NetBSD: systemname.c,v 1.8 2009/05/24 20:39:43 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,11 +34,11 @@
#if 0
static char sccsid[] = "@(#)systemname.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: systemname.c,v 1.7 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: systemname.c,v 1.8 2009/05/24 20:39:43 dholland Exp $");
#endif
#endif /* not lint */
-# include "trek.h"
+#include "trek.h"
/*
** RETRIEVE THE STARSYSTEM NAME
--- src/games/trek/phaser.c 2009/05/24 19:18:44 1.11
+++ src/games/trek/phaser.c 2009/05/24 20:39:43 1.12
@@ -1,4 +1,4 @@
-/* $NetBSD: phaser.c,v 1.11 2009/05/24 19:18:44 dholland Exp $ */
+/* $NetBSD: phaser.c,v 1.12 2009/05/24 20:39:43 dholland Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)phaser.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: phaser.c,v 1.11 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: phaser.c,v 1.12 2009/05/24 20:39:43 dholland Exp $");
#endif
#endif /* not lint */
@@ -45,11 +45,11 @@
/* factors for phaser hits; see description below */
-# define ALPHA 3.0 /* spread */
-# define BETA 3.0 /* franf() */
-# define GAMMA 0.30 /* cos(angle) */
-# define EPSILON 150.0 /* dist ** 2 */
-# define OMEGA 10.596 /* overall scaling factor */
+#define ALPHA 3.0 /* spread */
+#define BETA 3.0 /* franf() */
+#define GAMMA 0.30 /* cos(angle) */
+#define EPSILON 150.0 /* dist ** 2 */
+#define OMEGA 10.596 /* overall scaling factor */
/* OMEGA ~= 100 * (ALPHA + 1) * (BETA + 1) / (EPSILON + 1) */
@@ -244,14 +244,14 @@
b->angle = atan2(dy, dx);
b->spread = 0.0;
b->units = ((n - i) / tot) * extra;
-# ifdef xTRACE
+#ifdef xTRACE
if (Trace)
{
printf("b%d hr%d u%d df%.2f af%.2f\n",
i, hitreqd[i], b->units,
distfactor, anglefactor);
}
-# endif
+#endif
extra -= b->units;
hit = b->units - hitreqd[i];
if (hit > 0)
@@ -285,7 +285,7 @@
}
}
-# ifdef xTRACE
+#ifdef xTRACE
if (Trace)
{
for (i = 0; i < NBANKS; i++)
@@ -298,7 +298,7 @@
printf("\n");
}
}
-# endif
+#endif
/* actually fire the shots */
Move.free = 0;