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

Merge pull request #936 from stm2/dreams_and_allies 

FFL_DEFENDER is deprecated and interfers with dreams
This commit is contained in:
Enno Rehling 2021-03-24 21:24:27 +01:00 committed by GitHub
parent 5b1d787102 598b566ab8
commit 3cf58f74af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/tests/common.lua
View File

@ -66,7 +66,7 @@ function test_flags()
local f = create_faction('halfling') local f = create_faction('halfling')
local u = unit.create(f, r, 1) local u = unit.create(f, r, 1)
local no = itoa36(f.id) local no = itoa36(f.id)
local flags = 50332672 local flags = 50331648
f.flags = flags f.flags = flags
eressea.write_game("test.dat") eressea.write_game("test.dat")

13
src/kernel/ally.c
View File

@ -326,7 +326,6 @@ int alliedunit(const unit * u, const faction * f2, int mask)
{ {
assert(u); assert(u);
assert(f2); assert(f2);
assert(u->region); /* the unit should be in a region, but it's possible that u->number==0 (TEMP units) */
if (u->faction == f2) { if (u->faction == f2) {
return mask; return mask;
} }
@ -335,17 +334,6 @@ int alliedunit(const unit * u, const faction * f2, int mask)
} }
if (u->faction != NULL && f2 != NULL) { if (u->faction != NULL && f2 != NULL) {
group *g; group *g;
if (mask & HELP_FIGHT) {
if ((u->flags & UFL_DEFENDER) || (u->faction->flags & FFL_DEFENDER)) {
faction *owner = region_get_owner(u->region);
/* helps the owner of the region */
if (owner == f2) {
return HELP_FIGHT;
}
}
}
g = get_group(u); g = get_group(u);
if (g) { if (g) {
return alliedgroup(u->faction, f2, g, mask); return alliedgroup(u->faction, f2, g, mask);
@ -354,4 +342,3 @@ int alliedunit(const unit * u, const faction * f2, int mask)
} }
return 0; return 0;
} }

3
src/kernel/faction.h
View File

@ -27,7 +27,6 @@ extern "C" {
#define FFL_PWMSG (1<<2) /* received a "new password" message */ #define FFL_PWMSG (1<<2) /* received a "new password" message */
#define FFL_QUIT (1<<3) #define FFL_QUIT (1<<3)
#define FFL_CURSED (1<<4) /* you're going to have a bad time */ #define FFL_CURSED (1<<4) /* you're going to have a bad time */
#define FFL_DEFENDER (1<<10)
#define FFL_SELECT (1<<22) /* ehemals f->dh, u->dh, r->dh, etc... */ #define FFL_SELECT (1<<22) /* ehemals f->dh, u->dh, r->dh, etc... */
#define FFL_MARK (1<<23) /* fuer markierende algorithmen, die das #define FFL_MARK (1<<23) /* fuer markierende algorithmen, die das
* hinterher auch wieder loeschen muessen! * hinterher auch wieder loeschen muessen!
@ -35,7 +34,7 @@ extern "C" {
* FL_MARK hinterher loeschen) */ * FL_MARK hinterher loeschen) */
#define FFL_NOIDLEOUT (1<<24) /* Partei stirbt nicht an NMRs */ #define FFL_NOIDLEOUT (1<<24) /* Partei stirbt nicht an NMRs */
#define FFL_NPC (1<<25) /* eine Partei mit Monstern */ #define FFL_NPC (1<<25) /* eine Partei mit Monstern */
#define FFL_SAVEMASK (FFL_DEFENDER|FFL_NPC|FFL_NOIDLEOUT|FFL_CURSED) #define FFL_SAVEMASK (FFL_NPC|FFL_NOIDLEOUT|FFL_CURSED)
typedef struct origin { typedef struct origin {
struct origin *next; struct origin *next;

3
src/kernel/unit.h
View File

@ -28,7 +28,6 @@ extern "C" {
#define UFL_HERO (1<<7) #define UFL_HERO (1<<7)
#define UFL_MOVED (1<<8) #define UFL_MOVED (1<<8)
#define UFL_NOTMOVING (1<<9) /* Die Einheit kann sich wg. langen Kampfes nicht bewegen */ #define UFL_NOTMOVING (1<<9) /* Die Einheit kann sich wg. langen Kampfes nicht bewegen */
#define UFL_DEFENDER (1<<10)
#define UFL_HUNGER (1<<11) /* kann im Folgemonat keinen langen Befehl ausser ARBEITE ausfuehren */ #define UFL_HUNGER (1<<11) /* kann im Folgemonat keinen langen Befehl ausser ARBEITE ausfuehren */
#define UFL_TARGET (1<<13) /* speedup: hat ein target, siehe attribut */ #define UFL_TARGET (1<<13) /* speedup: hat ein target, siehe attribut */
#define UFL_WERE (1<<14) #define UFL_WERE (1<<14)
@ -52,7 +51,7 @@ extern "C" {
#define UFL_GROUP (1<<28) #define UFL_GROUP (1<<28)
/* Flags, die gespeichert werden sollen: */ /* Flags, die gespeichert werden sollen: */
#define UFL_SAVEMASK (UFL_DEFENDER|UFL_MOVED|UFL_NOAID|UFL_ANON_FACTION|UFL_LOCKED|UFL_HUNGER|UFL_TAKEALL|UFL_GUARD|UFL_STEALTH|UFL_GROUP|UFL_HERO) #define UFL_SAVEMASK (UFL_MOVED|UFL_NOAID|UFL_ANON_FACTION|UFL_LOCKED|UFL_HUNGER|UFL_TAKEALL|UFL_GUARD|UFL_STEALTH|UFL_GROUP|UFL_HERO)
#define UNIT_MAXSIZE 128 * 1024 #define UNIT_MAXSIZE 128 * 1024
extern int maxheroes(const struct faction *f); extern int maxheroes(const struct faction *f);

6
src/spy.test.c
View File

@ -200,17 +200,17 @@ static void test_setstealth_cmd(CuTest *tc) {
test_setup(); test_setup();
u = test_create_unit(test_create_faction(), test_create_plain(0, 0)); u = test_create_unit(test_create_faction(), test_create_plain(0, 0));
lang = u->faction->locale; lang = u->faction->locale;
u->flags = UFL_ANON_FACTION | UFL_DEFENDER; u->flags = UFL_ANON_FACTION | UFL_MOVED;
u->thisorder = create_order(K_SETSTEALTH, lang, "%s %s", u->thisorder = create_order(K_SETSTEALTH, lang, "%s %s",
LOC(lang, parameters[P_FACTION]), LOC(lang, parameters[P_FACTION]),
LOC(lang, parameters[P_NOT])); LOC(lang, parameters[P_NOT]));
setstealth_cmd(u, u->thisorder); setstealth_cmd(u, u->thisorder);
CuAssertIntEquals(tc, UFL_DEFENDER, u->flags); CuAssertIntEquals(tc, UFL_MOVED, u->flags);
free_order(u->thisorder); free_order(u->thisorder);
u->thisorder = create_order(K_SETSTEALTH, lang, "%s", u->thisorder = create_order(K_SETSTEALTH, lang, "%s",
LOC(lang, parameters[P_FACTION])); LOC(lang, parameters[P_FACTION]));
setstealth_cmd(u, u->thisorder); setstealth_cmd(u, u->thisorder);
CuAssertIntEquals(tc, UFL_DEFENDER | UFL_ANON_FACTION, u->flags); CuAssertIntEquals(tc, UFL_MOVED | UFL_ANON_FACTION, u->flags);
test_teardown(); test_teardown();
} }