/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
*
* Known contributors to this file:
* Dave Pare, 1994
- * Markus Armbruster, 2005-2013
+ * Markus Armbruster, 2005-2016
*/
#include <config.h>
-#include "file.h"
#include "nat.h"
#include "news.h"
#include "optlist.h"
#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);
- struct natstr *themnp = getnatp(them);
- 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 || !themnp))
+ 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]);
- if (!(getrejects(us, themnp) & REJ_TELE))
+ 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));
- putrel(mynp, them, rel);
- putnat(mynp);
+ relp->rel_relate[them] = rel;
+ putrelat(relp);
if (!player->god) {
if (oldrel == ALLIED)
void
setcont(natid us, natid them, int contact)
{
- struct natstr *np = getnatp(us);
+ struct contactstr *conp = getcontactp(us);
- if (CANT_HAPPEN(!np))
+ if (CANT_HAPPEN(!conp))
return;
- putcontact(np, them, contact);
- putnat(np);
+
+ if (CANT_HAPPEN(contact < 0))
+ contact = 0;
+ if (CANT_HAPPEN(contact > 255))
+ contact = 255;
+
+ if (!opt_LOSE_CONTACT)
+ contact = !!contact;
+ if (conp->con_contact[them] < contact) {
+ conp->con_contact[them] = contact;
+ putcontact(conp);
+ }
}
void
-setrej(natid us, natid them, int how, int what)
+setrej(natid us, natid them, int reject, enum rej_comm what)
{
- struct natstr *np = getnatp(us);
+ struct rejectstr *rejp = getrejectp(us);
- if (CANT_HAPPEN(!np))
+ if (CANT_HAPPEN(!rejp))
return;
- putreject(np, them, how, what);
- putnat(np);
+ if (reject)
+ rejp->rej_rejects[them] |= bit(what);
+ else
+ rejp->rej_rejects[them] &= ~bit(what);
+ putreject(rejp);
}