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

paused factions: resume when new orders arrive

This commit is contained in:
Enno Rehling 2021-05-20 20:52:44 +02:00
parent 18b1139616
commit e5b4d925c6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/kernel/faction.h
View File

@ -27,14 +27,15 @@ 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_SELECT (1<<22) /* ehemals f->dh, u->dh, r->dh, etc... */ #define FFL_PAUSED (1<<5) /* faction is parked until it receives orders again */
#define FFL_MARK (1<<23) /* fuer markierende algorithmen, die das #define FFL_SELECT (1<<6) /* ehemals f->dh, u->dh, r->dh, etc... */
#define FFL_MARK (1<<7) /* fuer markierende algorithmen, die das
* hinterher auch wieder loeschen muessen! * hinterher auch wieder loeschen muessen!
* (FFL_SELECT muss man vorher initialisieren, * (FFL_SELECT muss man vorher initialisieren,
* 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_NPC|FFL_NOIDLEOUT|FFL_CURSED) #define FFL_SAVEMASK (FFL_NPC|FFL_NOIDLEOUT|FFL_CURSED|FFL_PAUSED)
typedef struct origin { typedef struct origin {
struct origin *next; struct origin *next;

1
src/orderfile.c
View File

@ -66,6 +66,7 @@ static void handle_faction(void *userData, int no, const char *password) {
if (checkpasswd(f, password)) { if (checkpasswd(f, password)) {
state->f = f; state->f = f;
f->lastorders = turn; f->lastorders = turn;
freset(f, FFL_PAUSED);
} }
else { else {
log_debug("invalid password for faction %s", itoa36(no)); log_debug("invalid password for faction %s", itoa36(no));