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

nat: Move putnat() into nat_reset() and simplify

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-10-31 17:20:05 +01:00
parent 414a5e179f
commit 33f7ae79fe
4 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/nat.h
View file

@ -206,8 +206,7 @@ extern int nat_accepts(natid, natid, enum rej_comm);
extern int in_contact(natid, natid);
extern void agecontact(struct natstr *np);
extern int influx(struct natstr *np);
extern struct natstr *nat_reset(struct natstr *, natid, char *, char *,
enum nat_status);
extern void nat_reset(natid, char *, char *, enum nat_status);
/* src/lib/subs/natsub.c */
extern int check_nat_name(char *, natid);

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

@ -28,7 +28,7 @@
*
* Known contributors to this file:
* Steve McClure, 2000
* Markus Armbruster, 2004-2013
* Markus Armbruster, 2004-2016
*/
#include <config.h>
@ -117,7 +117,7 @@ add(void)
pr("%s is logged in!\n", prnat(natp));
return RET_FAIL;
}
nat_reset(natp, natp->nat_cnum, cntryname, pname, stat);
putnat(natp);
return 0;
nat_reset(natp->nat_cnum, cntryname, pname, stat);
return RET_OK;
}

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

@ -125,37 +125,37 @@ influx(struct natstr *np)
}
/*
* Initialize @natp for country #@cnum in status @stat.
* Initialize country #@cnum in status @stat.
* @stat must be STAT_UNUSED, STAT_NEW, STAT_VIS or STAT_GOD.
* Also wipe realms and telegrams.
*/
struct natstr *
nat_reset(struct natstr *natp, natid cnum, char *name, char *rep,
enum nat_status stat)
void
nat_reset(natid cnum, char *name, char *rep, enum nat_status stat)
{
struct natstr nat;
struct realmstr newrealm;
char buf[1024];
int i;
ef_blank(EF_NATION, cnum, natp);
natp->nat_stat = stat;
strncpy(natp->nat_cnam, name, sizeof(natp->nat_cnam) - 1);
strncpy(natp->nat_pnam, rep, sizeof(natp->nat_pnam) - 1);
ef_blank(EF_NATION, cnum, &nat);
nat.nat_stat = stat;
strncpy(nat.nat_cnam, name, sizeof(nat.nat_cnam) - 1);
strncpy(nat.nat_pnam, rep, sizeof(nat.nat_pnam) - 1);
if (stat == STAT_GOD)
natp->nat_money = 123456789;
nat.nat_money = 123456789;
for (i = 0; i < MAXNOR; i++) {
ef_blank(EF_REALM, i + cnum * MAXNOR, &newrealm);
putrealm(&newrealm);
}
mailbox_create(mailbox(buf, cnum));
/* FIXME natp->nat_ann = #annos */
natp->nat_level[NAT_HLEV] = start_happiness;
natp->nat_level[NAT_RLEV] = start_research;
natp->nat_level[NAT_TLEV] = start_technology;
natp->nat_level[NAT_ELEV] = start_education;
/* FIXME nat.nat_ann = #annos */
nat.nat_level[NAT_HLEV] = start_happiness;
nat.nat_level[NAT_RLEV] = start_research;
nat.nat_level[NAT_TLEV] = start_technology;
nat.nat_level[NAT_ELEV] = start_education;
for (i = 0; i < MAXNOC; i++)
natp->nat_relate[i] = NEUTRAL;
natp->nat_flags =
nat.nat_relate[i] = NEUTRAL;
nat.nat_flags =
NF_FLASH | NF_BEEP | NF_COASTWATCH | NF_SONAR | NF_TECHLISTS;
return natp;
putnat(&nat);
}

8
src/util/files.c
View file

@ -30,7 +30,7 @@
* Thomas Ruschak
* Ken Stevens, 1995
* Steve McClure, 1998
* Markus Armbruster, 2004-2011
* Markus Armbruster, 2004-2016
*/
#include <config.h>
@ -60,7 +60,6 @@ int
main(int argc, char *argv[])
{
char buf[255];
struct natstr nat;
int i;
int opt;
char *config_file = NULL;
@ -135,9 +134,8 @@ main(int argc, char *argv[])
if (mailbox_create(annfil) < 0)
exit(1);
nat_reset(&nat, 0, "POGO", "peter", STAT_GOD);
putnat(&nat);
printf("All praise to %s!\n", nat.nat_cnam);
nat_reset(0, "POGO", "peter", STAT_GOD);
printf("All praise to POGO!\n");
for (i = 0; i < EF_MAX; i++) {
if (!EF_IS_GAME_STATE(i))