/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
#include "update.h"
void
-setrel(natid us, natid them, int rel)
+setrel(natid us, natid them, enum relations rel)
{
+ struct relatstr *relp = getrelatp(us);
struct natstr *mynp = getnatp(us);
- int oldrel;
+ enum relations oldrel;
char *whichway;
int n_up = 0;
int n_down = 0;
rel = AT_WAR;
if (CANT_HAPPEN(rel > ALLIED))
rel = ALLIED;
- if (CANT_HAPPEN(!mynp))
+ if (CANT_HAPPEN(!relp || !mynp))
return;
if (us == them)
return;
if (addendum && us == player->cnum && !update_running)
pr("%s\n", addendum);
mpr(us, "Diplomatic relations with %s %s to \"%s\".\n",
- cname(them), whichway, relates[rel]);
+ cname(them), whichway, relations_string(rel));
if (nat_accepts(them, us, REJ_TELE))
mpr(them,
"Country %s has %s their relations with you to \"%s\"!\n",
- prnat(mynp), whichway, relates[rel]);
+ prnat(mynp), whichway, relations_string(rel));
- mynp->nat_relate[them] = rel;
- putnat(mynp);
+ relp->rel_relate[them] = rel;
+ putrelat(relp);
if (!player->god) {
if (oldrel == ALLIED)