/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
*
* Known contributors to this file:
* Dave Pare, 1994
+ * Markus Armbruster, 2005-2013
*/
#include <config.h>
{
struct natstr *mynp = getnatp(us);
struct natstr *themnp = getnatp(them);
- char *myname = cname(us);
- char *themname;
int oldrel;
char *whichway;
int n_up = 0;
return;
if (us == them)
return;
- oldrel = getrel(mynp, them);
+ oldrel = relations_with(us, them);
if (oldrel == rel)
return;
- themname = cname(them);
if (rel > oldrel)
whichway = "upgraded";
else
if (addendum && us == player->cnum && !update_running)
pr("%s\n", addendum);
mpr(us, "Diplomatic relations with %s %s to \"%s\".\n",
- themname, whichway, relates[rel]);
+ cname(them), whichway, relates[rel]);
if (!(getrejects(us, themnp) & REJ_TELE))
mpr(them,
- "Country %s (#%d) has %s their relations with you to \"%s\"!\n",
- myname, us, whichway, relates[rel]);
+ "Country %s has %s their relations with you to \"%s\"!\n",
+ prnat(mynp), whichway, relates[rel]);
putrel(mynp, them, rel);
putnat(mynp);