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

parteinummern-wechsel speichern

This commit is contained in:
Enno Rehling 2006-12-09 17:44:49 +00:00
parent 75d6e14c47
commit bf03d8e7c5
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2642,7 +2642,7 @@ renumber_factions(void)
if (!a) continue; if (!a) continue;
want = a->data.i; want = a->data.i;
if (fval(f, FF_NEWID)) { if (fval(f, FFL_NEWID)) {
sprintf(buf, "NUMMER PARTEI %s: Die Partei kann nicht mehr als einmal ihre Nummer wecheln", itoa36(want)); sprintf(buf, "NUMMER PARTEI %s: Die Partei kann nicht mehr als einmal ihre Nummer wecheln", itoa36(want));
addmessage(0, f, buf, MSG_MESSAGE, ML_IMPORTANT); addmessage(0, f, buf, MSG_MESSAGE, ML_IMPORTANT);
} }
@ -2685,7 +2685,7 @@ renumber_factions(void)
funhash(f); funhash(f);
f->no = rp->want; f->no = rp->want;
fhash(f); fhash(f);
fset(f, FF_NEWID); fset(f, FFL_NEWID);
} }
while (renum) { while (renum) {
rp = renum->next; rp = renum->next;

2
src/common/kernel/eressea.h
View File

@ -805,8 +805,6 @@ typedef struct ally {
int status; int status;
} ally; } ally;
#define FF_NEWID (1<<0) /* Die Partei hat bereits einmal ihre no gewechselt */
void remove_empty_units_in_region(struct region *r); void remove_empty_units_in_region(struct region *r);
void remove_empty_units(void); void remove_empty_units(void);
void remove_empty_factions(boolean writedropouts); void remove_empty_factions(boolean writedropouts);

3
src/common/kernel/faction.h
View File

@ -34,6 +34,7 @@ typedef struct shortpwd {
#endif #endif
/* faction flags */ /* faction flags */
#define FFL_NEWID (1<<0) /* Die Partei hat bereits einmal ihre no gewechselt */
#define FFL_ISNEW (1<<1) #define FFL_ISNEW (1<<1)
#define FFL_RESTART (1<<2) #define FFL_RESTART (1<<2)
#define FFL_QUIT (1<<3) #define FFL_QUIT (1<<3)
@ -46,7 +47,7 @@ typedef struct shortpwd {
#define FFL_NOTIMEOUT (1<<29) /* ignore MaxAge() */ #define FFL_NOTIMEOUT (1<<29) /* ignore MaxAge() */
#define FFL_GM (1<<30) /* eine Partei mit Sonderrechten */ #define FFL_GM (1<<30) /* eine Partei mit Sonderrechten */
#define FFL_SAVEMASK (FFL_GM|FFL_NOTIMEOUT|FFL_DBENTRY|FFL_NOTIMEOUT) #define FFL_SAVEMASK (FFL_NEWID|FFL_GM|FFL_NOTIMEOUT|FFL_DBENTRY|FFL_NOTIMEOUT)
typedef struct faction { typedef struct faction {
struct faction *next; struct faction *next;