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

Move setting nat_cnam, nat_pnam into nat_reset()

Browse source
This commit is contained in:
Markus Armbruster 2011-11-06 13:56:34 +01:00
parent bb442abdcd
commit ad308c5de8
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/nat.h
View file

@ -177,7 +177,8 @@ extern void putreject(struct natstr *np, natid them, int how, int what);
extern void putcontact(struct natstr *np, natid them, int contact); extern void putcontact(struct natstr *np, natid them, int contact);
extern void agecontact(struct natstr *np); extern void agecontact(struct natstr *np);
extern int influx(struct natstr *np); extern int influx(struct natstr *np);
extern struct natstr *nat_reset(struct natstr *, natid, enum nat_status); extern struct natstr *nat_reset(struct natstr *, natid, char *, char *,
enum nat_status);
extern int check_nat_name(char *, natid); extern int check_nat_name(char *, natid);

4
src/lib/commands/add.c
View file

@ -110,9 +110,7 @@ add(void)
pr("Illegal status\n"); pr("Illegal status\n");
return RET_SYN; return RET_SYN;
} }
nat_reset(natp, natp->nat_cnum, stat); nat_reset(natp, natp->nat_cnum, cntryname, pname, stat);
strcpy(natp->nat_cnam, cntryname);
strcpy(natp->nat_pnam, pname);
putnat(natp); putnat(natp);
return 0; return 0;
} }

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

@ -191,7 +191,8 @@ influx(struct natstr *np)
* Also wipe realms and telegrams. * Also wipe realms and telegrams.
*/ */
struct natstr * struct natstr *
nat_reset(struct natstr *natp, natid cnum, enum nat_status stat) nat_reset(struct natstr *natp, natid cnum, char *name, char *rep,
enum nat_status stat)
{ {
struct realmstr newrealm; struct realmstr newrealm;
char buf[1024]; char buf[1024];
@ -199,6 +200,8 @@ nat_reset(struct natstr *natp, natid cnum, enum nat_status stat)
ef_blank(EF_NATION, cnum, natp); ef_blank(EF_NATION, cnum, natp);
natp->nat_stat = stat; natp->nat_stat = stat;
strncpy(natp->nat_cnam, name, sizeof(natp->nat_cnam) - 1);
strncpy(natp->nat_pnam, rep, sizeof(natp->nat_pnam) - 1);
for (i = 0; i < MAXNOR; i++) { for (i = 0; i < MAXNOR; i++) {
ef_blank(EF_REALM, i + cnum * MAXNOR, &newrealm); ef_blank(EF_REALM, i + cnum * MAXNOR, &newrealm);
putrealm(&newrealm); putrealm(&newrealm);

4
src/util/files.c
View file

@ -146,9 +146,7 @@ main(int argc, char *argv[])
} }
close(creat(annfil, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP)); close(creat(annfil, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP));
nat_reset(&nat, 0, STAT_GOD); nat_reset(&nat, 0, "POGO", "peter", STAT_GOD);
strcpy(nat.nat_cnam, "POGO");
strcpy(nat.nat_pnam, "peter");
nat.nat_btu = 255; nat.nat_btu = 255;
nat.nat_money = 123456789; nat.nat_money = 123456789;
putnat(&nat); putnat(&nat);