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

Merge pull request #707 from ennorehling/develop 

BUG 2256: kill the FFL_NEWID flag
This commit is contained in:
Enno Rehling 2017-07-09 15:50:07 +02:00 committed by GitHub
parent 72a1877d26 de9d73bd5a
commit a0afa1f225
5 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/core/messages.xml
View File

@ -8001,14 +8001,6 @@
<text locale="en">"$unit($unit) tried but failed to send $unit($target) to another world."</text> <text locale="en">"$unit($unit) tried but failed to send $unit($target) to another world."</text>
</message> </message>
<message name="renumber_twice" section="errors">
<type>
<arg name="id" type="int"/>
</type>
<text locale="de">"NUMMER PARTEI $int36($id): Die Partei kann nicht mehr als einmal ihre Nummer wecheln."</text>
<text locale="en">"NUMBER FACTION $int36($id): Your faction can only change its number once."</text>
</message>
<message name="renumber_inuse" section="errors"> <message name="renumber_inuse" section="errors">
<type> <type>
<arg name="id" type="int"/> <arg name="id" type="int"/>

2
scripts/tests/common.lua
View File

@ -51,7 +51,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 = 50332673 local flags = 50332672
f.flags = flags f.flags = flags
eressea.write_game("test.dat") eressea.write_game("test.dat")

1
src/kernel/faction.c
View File

@ -497,7 +497,6 @@ void renumber_faction(faction * f, int no)
funhash(f); funhash(f);
f->no = no; f->no = no;
fhash(f); fhash(f);
fset(f, FFL_NEWID);
} }
void update_interval(struct faction *f, struct region *r) void update_interval(struct faction *f, struct region *r)

11
src/kernel/faction.h
View File

@ -36,21 +36,20 @@ extern "C" {
struct selist; struct selist;
/* faction flags */ /* faction flags */
#define FFL_NEWID (1<<0) /* Die Partei hat bereits einmal ihre no gewechselt */ #define FFL_NOAID (1<<0) /* Hilfsflag Kampf */
#define FFL_ISNEW (1<<1) #define FFL_ISNEW (1<<1)
#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_DEFENDER (1<<10)
#define FFL_NOAID (1<<21) /* Hilfsflag Kampf */
#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) /* f<>r markierende algorithmen, die das #define FFL_MARK (1<<23) /* fuer markierende algorithmen, die das
* hinterher auch wieder l<EFBFBD>schen m<EFBFBD>ssen! * hinterher auch wieder loeschen muessen!
* (FFL_SELECT muss man vorher initialisieren, * (FFL_SELECT muss man vorher initialisieren,
* FL_MARK hinterher l<EFBFBD>schen) */ * 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_NEWID|FFL_NPC|FFL_NOIDLEOUT|FFL_CURSED) #define FFL_SAVEMASK (FFL_DEFENDER|FFL_NPC|FFL_NOIDLEOUT|FFL_CURSED)
typedef struct faction { typedef struct faction {
struct faction *next; struct faction *next;

4
src/renumber.c
View File

@ -40,10 +40,6 @@ void renumber_factions(void)
if (!a) if (!a)
continue; continue;
want = a->data.i; want = a->data.i;
if (fval(f, FFL_NEWID)) {
ADDMSG(&f->msgs, msg_message("renumber_twice", "id", want));
continue;
}
if (!faction_id_is_unused(want)) { if (!faction_id_is_unused(want)) {
a_remove(&f->attribs, a); a_remove(&f->attribs, a);
ADDMSG(&f->msgs, msg_message("renumber_inuse", "id", want)); ADDMSG(&f->msgs, msg_message("renumber_inuse", "id", want));