Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Fixes Stirb-Erweiterung

This commit is contained in:
Christian Schlittchen 2003-04-27 07:44:05 +00:00
parent f2788aba4a
commit 9122b84f73
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/gamecode/laws.c
View File

@ -1032,7 +1032,7 @@ transfer_faction(faction *f, faction *f2)
unit *u, *un; unit *u, *un;
for (u = f->units; u;) { for (u = f->units; u;) {
un = u->next; un = u->nextF;
if(!unit_has_cursed_item(u) if(!unit_has_cursed_item(u)
&& !has_skill(u, SK_MAGIC) && !has_skill(u, SK_MAGIC)
&& !has_skill(u, SK_ALCHEMY)) { && !has_skill(u, SK_ALCHEMY)) {
@ -1079,7 +1079,7 @@ quit(void)
#else #else
#warning ENHANCED_QUIT defined without ALLIANCES #warning ENHANCED_QUIT defined without ALLIANCES
#endif #endif
} else if(alliedfaction(NULL, f, f2, HELP_MONEY)) { } else if(!alliedfaction(NULL, f, f2, HELP_MONEY)) {
cmistake(u, S->s, 316, MSG_EVENT); cmistake(u, S->s, 316, MSG_EVENT);
} else { } else {
transfer_faction(f,f2); transfer_faction(f,f2);

2
src/common/settings-vinyambar-3.h
View File

@ -46,7 +46,7 @@
#define ROIBONUS 4 #define ROIBONUS 4
#endif #endif
#define ENHANCED_QUIT #define ENHANCED_QUIT
#define ALLIANCES #define ALLIANCES
#undef ALLIANCEJOIN #undef ALLIANCEJOIN
#define AUTOALLIANCE (HELP_FIGHT) #define AUTOALLIANCE (HELP_FIGHT)