From 402c19d8fc4bde1db22a067aa5893c3fa06e287d Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 11 Sep 2016 16:35:55 +0200 Subject: [PATCH] dn't warn new player about NMR. newbie info text was no longer valid. --- conf/e2/config.xml | 2 +- conf/e3/config.xml | 2 +- conf/e4/config.xml | 2 +- res/eressea/strings.xml | 8 +------- src/kernel/faction.c | 1 + src/kernel/faction.h | 4 +--- src/kernel/faction.test.c | 2 +- src/report.c | 9 ++------- 8 files changed, 9 insertions(+), 21 deletions(-) diff --git a/conf/e2/config.xml b/conf/e2/config.xml index 5516fd601..f7f227824 100644 --- a/conf/e2/config.xml +++ b/conf/e2/config.xml @@ -57,7 +57,7 @@ eressea-server@eressea.de eressea-server@eressea.de - + Bitte denke daran, deine Befehle mit dem Betreff ERESSEA 2 BEFEHLE an eressea-server@eressea.de zu senden. Remember to send your orders to diff --git a/conf/e3/config.xml b/conf/e3/config.xml index 04af3858d..d337ead42 100644 --- a/conf/e3/config.xml +++ b/conf/e3/config.xml @@ -49,7 +49,7 @@ eressea-server@eressea.de eressea-server@eressea.de - + Bitte denke daran, deine Befehle mit dem Betreff ERESSEA 3 BEFEHLE an eressea-server@eressea.de zu senden. Remember to send your orders to diff --git a/conf/e4/config.xml b/conf/e4/config.xml index 2def4f1a8..5c99f7d7e 100644 --- a/conf/e4/config.xml +++ b/conf/e4/config.xml @@ -50,7 +50,7 @@ eressea-server@eressea.de eressea-server@eressea.de - + Bitte denke daran, deine Befehle mit dem Betreff ERESSEA 4 BEFEHLE an eressea-server@eressea.de zu senden. Remember to send your orders to diff --git a/res/eressea/strings.xml b/res/eressea/strings.xml index b7db0eb4b..61a35ebe5 100644 --- a/res/eressea/strings.xml +++ b/res/eressea/strings.xml @@ -268,13 +268,7 @@ Muscheln seashells - - - Die ersten beiden Züge mußt du abgeben, sonst wird deine - Partei sofort wieder gelöscht, um Karteileichen zu vermeiden. - If you fail to send in orders for one of the first two turns, your faction will be erased from the game to reduce the number of inactive players in Eressea. - - + Mit der ersten Auswertung bekommst du einen Computerreport, den du mit vielen Tools wie z.B. Magellan benutzen kannst. Wenn du ihn weiterhin bekommen willst, gib einer deiner Einheiten den Befehl OPTION diff --git a/src/kernel/faction.c b/src/kernel/faction.c index 8ca5297b0..6e249bca7 100755 --- a/src/kernel/faction.c +++ b/src/kernel/faction.c @@ -261,6 +261,7 @@ faction *addfaction(const char *email, const char *password, f->magiegebiet = 0; f->locale = loc; f->subscription = subscription; + f->flags = FFL_ISNEW; f->options = want(O_REPORT) | want(O_ZUGVORLAGE) | want(O_COMPUTER) | want(O_COMPRESS) | diff --git a/src/kernel/faction.h b/src/kernel/faction.h index 5f7e1f91f..2cb2fc9f3 100644 --- a/src/kernel/faction.h +++ b/src/kernel/faction.h @@ -40,7 +40,6 @@ extern "C" { /* faction flags */ #define FFL_NEWID (1<<0) /* Die Partei hat bereits einmal ihre no gewechselt */ #define FFL_ISNEW (1<<1) -#define FFL_RESTART (1<<2) #define FFL_QUIT (1<<3) #define FFL_CURSED (1<<4) /* you're going to have a bad time */ #define FFL_DEFENDER (1<<10) @@ -52,8 +51,7 @@ extern "C" { * FL_MARK hinterher löschen) */ #define FFL_NOIDLEOUT (1<<24) /* Partei stirbt nicht an NMRs */ #define FFL_NPC (1<<25) /* eine Partei mit Monstern */ -#define FFL_DBENTRY (1<<28) /* Partei ist in Datenbank eingetragen */ -#define FFL_SAVEMASK (FFL_DEFENDER|FFL_NEWID|FFL_NPC|FFL_DBENTRY|FFL_NOIDLEOUT|FFL_CURSED) +#define FFL_SAVEMASK (FFL_DEFENDER|FFL_NEWID|FFL_NPC|FFL_NOIDLEOUT|FFL_CURSED) typedef struct faction { struct faction *next; diff --git a/src/kernel/faction.test.c b/src/kernel/faction.test.c index 0d7e7b877..f1917242c 100644 --- a/src/kernel/faction.test.c +++ b/src/kernel/faction.test.c @@ -117,7 +117,7 @@ static void test_addfaction(CuTest *tc) { CuAssertTrue(tc, checkpasswd(f, "hurrdurr")); CuAssertPtrEquals(tc, (void *)lang, (void *)f->locale); CuAssertIntEquals(tc, 1234, f->subscription); - CuAssertIntEquals(tc, 0, f->flags); + CuAssertIntEquals(tc, FFL_ISNEW, f->flags); CuAssertIntEquals(tc, 0, f->age); CuAssertTrue(tc, faction_alive(f)); CuAssertIntEquals(tc, M_GRAY, f->magiegebiet); diff --git a/src/report.c b/src/report.c index e77ee3038..be6c2273f 100644 --- a/src/report.c +++ b/src/report.c @@ -2106,19 +2106,14 @@ const char *charset) if (f->age <= 2) { const char *s; - s = locale_getstring(f->locale, "newbie_info_1"); - if (s) { - newline(out); - centre(out, s, true); - } - s = locale_getstring(f->locale, "newbie_info_2"); + s = locale_getstring(f->locale, "newbie_info_game"); if (s) { newline(out); centre(out, s, true); } if ((f->options & want(O_COMPUTER)) == 0) { f->options |= want(O_COMPUTER); - s = locale_getstring(f->locale, "newbie_info_3"); + s = locale_getstring(f->locale, "newbie_info_cr"); if (s) { newline(out); centre(out, s, true);