From 985ec19f8b37ab43a2bbd45d592798d470d62ace Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 5 Feb 2011 09:31:44 +0100 Subject: [PATCH] Make setrel() refuse to change relations to self No current caller actually attempts that, but let's make it obvious. --- src/lib/subs/rej.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c index 9663e729..05a2a814 100644 --- a/src/lib/subs/rej.c +++ b/src/lib/subs/rej.c @@ -60,6 +60,8 @@ setrel(natid us, natid them, int rel) rel = ALLIED; if (CANT_HAPPEN(!mynp || !themnp)) return; + if (us == them) + return; oldrel = getrel(mynp, them); if (oldrel == rel) return;