empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some s_char killings.

Browse source
This commit is contained in:
Markus Armbruster 2006-01-04 21:40:30 +00:00
parent 78dd01ab8e
commit bea83adb93
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/nat.h
View file

@ -146,7 +146,7 @@ struct natstr {
/* Coastwatch and skywatch */ /* Coastwatch and skywatch */
#define FOUND_COAST 3 #define FOUND_COAST 3
extern s_char *relates[]; extern char *relates[];
/* procedures relating to nation stuff */ /* procedures relating to nation stuff */
@ -159,10 +159,10 @@ extern double tfact(natid cn, double mult);
extern double tfactfire(natid cn, double mult); extern double tfactfire(natid cn, double mult);
extern double techfact(int level, double mult); extern double techfact(int level, double mult);
extern s_char *cname(natid n); extern char *cname(natid n);
extern s_char *relatename(struct natstr *np, natid other); extern char *relatename(struct natstr *np, natid other);
extern s_char *rejectname(struct natstr *np, natid other); extern char *rejectname(struct natstr *np, natid other);
extern s_char *natstate(struct natstr *np); extern char *natstate(struct natstr *np);
extern int getrel(struct natstr *np, natid them); extern int getrel(struct natstr *np, natid them);
extern int getrejects(natid them, struct natstr *np); extern int getrejects(natid them, struct natstr *np);
extern int getcontact(struct natstr *np, natid them); extern int getcontact(struct natstr *np, natid them);

12
src/lib/common/nat.c
View file

@ -39,13 +39,13 @@
#include "file.h" #include "file.h"
#include "optlist.h" #include "optlist.h"
s_char *relates[] = { char *relates[] = {
/* must follow nation relation defines in nat.h */ /* must follow nation relation defines in nat.h */
"At War", "Sitzkrieg", "Mobilizing", "Hostile", "Neutral", "Friendly", "At War", "Sitzkrieg", "Mobilizing", "Hostile", "Neutral", "Friendly",
"Allied" "Allied"
}; };
s_char * char *
cname(natid n) cname(natid n)
{ {
struct natstr *np; struct natstr *np;
@ -55,16 +55,16 @@ cname(natid n)
return np->nat_cnam; return np->nat_cnam;
} }
s_char * char *
relatename(struct natstr *np, natid other) relatename(struct natstr *np, natid other)
{ {
return relates[getrel(np, other)]; return relates[getrel(np, other)];
} }
s_char * char *
rejectname(struct natstr *np, natid other) rejectname(struct natstr *np, natid other)
{ {
s_char *rejects[] = { char *rejects[] = {
/* must follow reject flags defined in nat.h */ /* must follow reject flags defined in nat.h */
" YES YES YES YES", " YES YES YES YES",
" NO YES YES YES", " NO YES YES YES",
@ -87,7 +87,7 @@ rejectname(struct natstr *np, natid other)
return rejects[getrejects(other, np)]; return rejects[getrejects(other, np)];
} }
s_char * char *
natstate(struct natstr *np) natstate(struct natstr *np)
{ {
if ((np->nat_stat & STAT_INUSE) == 0) if ((np->nat_stat & STAT_INUSE) == 0)