Fix whitespace: space before tab
This commit is contained in:
parent
db4770426e
commit
a9653c475b
17 changed files with 28 additions and 28 deletions
|
@ -172,7 +172,7 @@ use '-' in meta-identifiers and omit the concatenation symbol ','.
|
||||||
|
|
||||||
table = header { record } footer ;
|
table = header { record } footer ;
|
||||||
header = "XDUMP" space [ "meta" space ]
|
header = "XDUMP" space [ "meta" space ]
|
||||||
identifier space timestamp newline ;
|
identifier space timestamp newline ;
|
||||||
identifier = id-chr { id-chr } ;
|
identifier = id-chr { id-chr } ;
|
||||||
id-char = ? ASCII characters 33..126 except '"#()<>=' ? ;
|
id-char = ? ASCII characters 33..126 except '"#()<>=' ? ;
|
||||||
timestamp = intnum ;
|
timestamp = intnum ;
|
||||||
|
|
|
@ -98,7 +98,7 @@ struct emptypedstr {
|
||||||
*/
|
*/
|
||||||
/* Immutable flags, fixed at compile-time */
|
/* Immutable flags, fixed at compile-time */
|
||||||
/* Dereferencing entry address cast to struct emptypedstr * is safe */
|
/* Dereferencing entry address cast to struct emptypedstr * is safe */
|
||||||
#define EFF_TYPED bit(0)
|
#define EFF_TYPED bit(0)
|
||||||
/*
|
/*
|
||||||
* EFF_XY / EFF_OWNER / EFF_GROUP assert that coordinates / owner /
|
* EFF_XY / EFF_OWNER / EFF_GROUP assert that coordinates / owner /
|
||||||
* group of such a table's entries can be safely obtained by
|
* group of such a table's entries can be safely obtained by
|
||||||
|
|
|
@ -182,9 +182,9 @@ extern struct natstr *nat_reset(struct natstr *, enum nat_status, coord, coord);
|
||||||
extern int grant_btus(struct natstr *, int );
|
extern int grant_btus(struct natstr *, int );
|
||||||
|
|
||||||
/* nation flags */
|
/* nation flags */
|
||||||
#define NF_INFORM bit(0) /* Inform me of telegrams right away */
|
#define NF_INFORM bit(0) /* Inform me of telegrams right away */
|
||||||
#define NF_FLASH bit(1) /* Allow other players to flash me (sicko :) */
|
#define NF_FLASH bit(1) /* Allow other players to flash me (sicko :) */
|
||||||
#define NF_BEEP bit(2) /* Make beeping sounds when appropriate */
|
#define NF_BEEP bit(2) /* Make beeping sounds when appropriate */
|
||||||
#define NF_COASTWATCH bit(3) /* Turn auto-coastwatch on */
|
#define NF_COASTWATCH bit(3) /* Turn auto-coastwatch on */
|
||||||
#define NF_SONAR bit(4) /* Turn auto-sonar on */
|
#define NF_SONAR bit(4) /* Turn auto-sonar on */
|
||||||
#define NF_TECHLISTS bit(5) /* Sort lists by tech not type */
|
#define NF_TECHLISTS bit(5) /* Sort lists by tech not type */
|
||||||
|
|
|
@ -10,7 +10,7 @@ Sector-types:
|
||||||
/ wasteland g gold mine n nuclear plant
|
/ wasteland g gold mine n nuclear plant
|
||||||
- wilderness h harbor l library/school
|
- wilderness h harbor l library/school
|
||||||
c capital/city w warehouse e enlistment center
|
c capital/city w warehouse e enlistment center
|
||||||
p park u uranium mine ! headquarters
|
p park u uranium mine ! headquarters
|
||||||
COMMUNICATIONS * airfield
|
COMMUNICATIONS * airfield
|
||||||
+ highway a agribusiness FINANCIAL
|
+ highway a agribusiness FINANCIAL
|
||||||
) radar installation o oil field b bank
|
) radar installation o oil field b bank
|
||||||
|
|
|
@ -36,5 +36,5 @@
|
||||||
.lt 5i \" Title length
|
.lt 5i \" Title length
|
||||||
.po 0.9i \" Page offset
|
.po 0.9i \" Page offset
|
||||||
.ev
|
.ev
|
||||||
\" .so INFO.MAC \" Read in INFO.MAC macros
|
\" .so INFO.MAC \" Read in INFO.MAC macros
|
||||||
\" except that's done by make now
|
\" except that's done by make now
|
||||||
|
|
|
@ -54,7 +54,7 @@ fina(void)
|
||||||
return RET_FAIL;
|
return RET_FAIL;
|
||||||
}
|
}
|
||||||
if (!snxtitem(&ni, EF_LOAN, "*", NULL))
|
if (!snxtitem(&ni, EF_LOAN, "*", NULL))
|
||||||
return RET_SYN;
|
return RET_SYN;
|
||||||
(void)time(&now);
|
(void)time(&now);
|
||||||
pr("\n");
|
pr("\n");
|
||||||
pr(" -= Empire Financial Status Report =- \n");
|
pr(" -= Empire Financial Status Report =- \n");
|
||||||
|
|
|
@ -155,7 +155,7 @@ landmine(void)
|
||||||
prland(&land), total_mines_laid,
|
prland(&land), total_mines_laid,
|
||||||
xyas(sect.sct_x, sect.sct_y, land.lnd_own));
|
xyas(sect.sct_x, sect.sct_y, land.lnd_own));
|
||||||
if (!shells)
|
if (!shells)
|
||||||
pr(" but is now out of supply\n");
|
pr(" but is now out of supply\n");
|
||||||
else
|
else
|
||||||
pr("\n");
|
pr("\n");
|
||||||
} else
|
} else
|
||||||
|
|
|
@ -52,7 +52,7 @@ nati(void)
|
||||||
if (!(natp = natargp(player->argp[1], NULL)))
|
if (!(natp = natargp(player->argp[1], NULL)))
|
||||||
return RET_SYN;
|
return RET_SYN;
|
||||||
} else
|
} else
|
||||||
natp = getnatp(player->cnum);
|
natp = getnatp(player->cnum);
|
||||||
|
|
||||||
cnum = natp->nat_cnum;
|
cnum = natp->nat_cnum;
|
||||||
if (!player->god && cnum != player->cnum) {
|
if (!player->god && cnum != player->cnum) {
|
||||||
|
|
|
@ -62,7 +62,7 @@ news(void)
|
||||||
char *verb;
|
char *verb;
|
||||||
|
|
||||||
if (!snxtitem(&nstr, EF_NEWS, "*", NULL))
|
if (!snxtitem(&nstr, EF_NEWS, "*", NULL))
|
||||||
return RET_SYN;
|
return RET_SYN;
|
||||||
memset(page_has_news, 0, sizeof(page_has_news));
|
memset(page_has_news, 0, sizeof(page_has_news));
|
||||||
memset(sectors_taken, 0, sizeof(sectors_taken));
|
memset(sectors_taken, 0, sizeof(sectors_taken));
|
||||||
(void)time(&now);
|
(void)time(&now);
|
||||||
|
|
|
@ -114,7 +114,7 @@ turn(void)
|
||||||
return RET_FAIL;
|
return RET_FAIL;
|
||||||
}
|
}
|
||||||
if (fclose(fptr)) {
|
if (fclose(fptr)) {
|
||||||
pr("Something went wrong closing the message.\n");
|
pr("Something went wrong closing the message.\n");
|
||||||
logerror("Could not properly close message file (%s).\n",
|
logerror("Could not properly close message file (%s).\n",
|
||||||
msgfilepath);
|
msgfilepath);
|
||||||
return RET_FAIL;
|
return RET_FAIL;
|
||||||
|
|
|
@ -163,7 +163,7 @@ double hap_cons = 600000.0;
|
||||||
double edu_cons = 600000.0;
|
double edu_cons = 600000.0;
|
||||||
|
|
||||||
/* hap and edu avg mean that the weight on current happiness is
|
/* hap and edu avg mean that the weight on current happiness is
|
||||||
* (cur_hap * hap_avg + hap_prod * etu) / (hap_avg + etu); */
|
* (cur_hap * hap_avg + hap_prod * etu) / (hap_avg + etu); */
|
||||||
float hap_avg = 16.0 * 3.0;
|
float hap_avg = 16.0 * 3.0;
|
||||||
float edu_avg = 16.0 * 12.0;
|
float edu_avg = 16.0 * 12.0;
|
||||||
|
|
||||||
|
|
|
@ -186,9 +186,9 @@ player_accept(void *unused)
|
||||||
np = player_new(ns);
|
np = player_new(ns);
|
||||||
if (!np) {
|
if (!np) {
|
||||||
logerror("can't create player for fd %d", ns);
|
logerror("can't create player for fd %d", ns);
|
||||||
close(ns);
|
close(ns);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#ifdef HAVE_GETADDRINFO
|
#ifdef HAVE_GETADDRINFO
|
||||||
inaddr = sap->sa_family == AF_INET
|
inaddr = sap->sa_family == AF_INET
|
||||||
? (void *)&((struct sockaddr_in *)sap)->sin_addr
|
? (void *)&((struct sockaddr_in *)sap)->sin_addr
|
||||||
|
|
|
@ -299,7 +299,7 @@ show_motd(void)
|
||||||
char buf[MAXTELSIZE + 1]; /* UTF-8 */
|
char buf[MAXTELSIZE + 1]; /* UTF-8 */
|
||||||
|
|
||||||
if ((motd_fp = fopen(motdfil, "rb")) == NULL) {
|
if ((motd_fp = fopen(motdfil, "rb")) == NULL) {
|
||||||
if (errno == ENOENT)
|
if (errno == ENOENT)
|
||||||
return RET_OK;
|
return RET_OK;
|
||||||
else {
|
else {
|
||||||
pr ("Could not open motd.\n");
|
pr ("Could not open motd.\n");
|
||||||
|
|
|
@ -48,14 +48,14 @@ static int s_commod(int, int, int, i_type, int, int);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We want to get enough guns to be maxed out, enough shells to
|
* We want to get enough guns to be maxed out, enough shells to
|
||||||
* fire once, one update's worth of food.
|
* fire once, one update's worth of food.
|
||||||
*
|
*
|
||||||
* Firts, try to forage in the sector
|
* Firts, try to forage in the sector
|
||||||
* Second look for a warehouse or headquarters to leech
|
* Second look for a warehouse or headquarters to leech
|
||||||
* Third, look for a ship we own in a harbor
|
* Third, look for a ship we own in a harbor
|
||||||
* Fourth, look for supplies in a supply unit we own
|
* Fourth, look for supplies in a supply unit we own
|
||||||
* (one good reason to do this last is that the supply
|
* (one good reason to do this last is that the supply
|
||||||
* unit will then call resupply, taking more time)
|
* unit will then call resupply, taking more time)
|
||||||
*
|
*
|
||||||
* May want to put code to resupply with SAMs here, later --ts
|
* May want to put code to resupply with SAMs here, later --ts
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -158,7 +158,7 @@ typed_wu(natid from, natid to, char *message, int type)
|
||||||
if (writev(fd, iov, 2) < (int)(iov[0].iov_len + iov[1].iov_len)) {
|
if (writev(fd, iov, 2) < (int)(iov[0].iov_len + iov[1].iov_len)) {
|
||||||
logerror("telegram 'write' to #%d failed", to);
|
logerror("telegram 'write' to #%d failed", to);
|
||||||
} else
|
} else
|
||||||
write_ok = 1;
|
write_ok = 1;
|
||||||
|
|
||||||
if (close(fd) == -1) {
|
if (close(fd) == -1) {
|
||||||
logerror("telegram 'write' to #%d failed to close.", to);
|
logerror("telegram 'write' to #%d failed to close.", to);
|
||||||
|
|
|
@ -62,8 +62,8 @@ install_service(char *program_name, char *service_name, char *config_file)
|
||||||
}
|
}
|
||||||
|
|
||||||
schService = CreateService(schSCManager,
|
schService = CreateService(schSCManager,
|
||||||
service_name,
|
service_name,
|
||||||
service_name, /* service name to display */
|
service_name, /* service name to display */
|
||||||
SERVICE_ALL_ACCESS, /* desired access */
|
SERVICE_ALL_ACCESS, /* desired access */
|
||||||
SERVICE_WIN32_OWN_PROCESS, /* service type */
|
SERVICE_WIN32_OWN_PROCESS, /* service type */
|
||||||
SERVICE_AUTO_START, /* start type */
|
SERVICE_AUTO_START, /* start type */
|
||||||
|
|
|
@ -121,12 +121,12 @@ main(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!force) {
|
if (!force) {
|
||||||
printf("WARNING: this blasts the existing game in %s (if any)\n",
|
printf("WARNING: this blasts the existing game in %s (if any)\n",
|
||||||
gamedir);
|
gamedir);
|
||||||
printf("continue? ");
|
printf("continue? ");
|
||||||
fgets(buf, sizeof(buf), stdin);
|
fgets(buf, sizeof(buf), stdin);
|
||||||
if (*buf != 'y' && *buf != 'Y')
|
if (*buf != 'y' && *buf != 'Y')
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
for (i = 0; i < EF_MAX; i++) {
|
for (i = 0; i < EF_MAX; i++) {
|
||||||
if (!EF_IS_GAME_STATE(i))
|
if (!EF_IS_GAME_STATE(i))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue