From 9122b84f73573ee79d95f3bb43a6066000922226 Mon Sep 17 00:00:00 2001 From: Christian Schlittchen Date: Sun, 27 Apr 2003 07:44:05 +0000 Subject: [PATCH] - Fixes Stirb-Erweiterung --- src/common/gamecode/laws.c | 4 ++-- src/common/settings-vinyambar-3.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index 3ff993500..ab2565bf8 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -1032,7 +1032,7 @@ transfer_faction(faction *f, faction *f2) unit *u, *un; for (u = f->units; u;) { - un = u->next; + un = u->nextF; if(!unit_has_cursed_item(u) && !has_skill(u, SK_MAGIC) && !has_skill(u, SK_ALCHEMY)) { @@ -1079,7 +1079,7 @@ quit(void) #else #warning ENHANCED_QUIT defined without ALLIANCES #endif - } else if(alliedfaction(NULL, f, f2, HELP_MONEY)) { + } else if(!alliedfaction(NULL, f, f2, HELP_MONEY)) { cmistake(u, S->s, 316, MSG_EVENT); } else { transfer_faction(f,f2); diff --git a/src/common/settings-vinyambar-3.h b/src/common/settings-vinyambar-3.h index 294dc3c9c..d8b6d6fc3 100644 --- a/src/common/settings-vinyambar-3.h +++ b/src/common/settings-vinyambar-3.h @@ -46,7 +46,7 @@ #define ROIBONUS 4 #endif -#define ENHANCED_QUIT +#define ENHANCED_QUIT #define ALLIANCES #undef ALLIANCEJOIN #define AUTOALLIANCE (HELP_FIGHT)