diff --git a/src/common/gamecode/creport.c b/src/common/gamecode/creport.c
index 9f7d07a60..a9c7054fb 100644
--- a/src/common/gamecode/creport.c
+++ b/src/common/gamecode/creport.c
@@ -997,19 +997,6 @@ cr_find_address(FILE * F, const faction * uf, const faction_list * addresses)
fprintf(F, "%d;alliance\n", f->alliance->id);
fprintf(F, "\"%s\";alliancename\n", f->alliance->name);
}
-#ifdef SHORTPWDS
- if (f->shortpwds) {
- shortpwd * spwd = f->shortpwds;
- while (spwd) {
- unsigned int vacation = 0;
- if (spwd->used) {
- fprintf(F, "VACATION %u\n", ++vacation);
- fprintf(F, "\"%s\";email\n", spwd->email);
- }
- spwd=spwd->next;
- }
- }
-#endif
}
flist = flist->next;
}
diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c
index 253618477..3da27b62f 100644
--- a/src/common/gamecode/report.c
+++ b/src/common/gamecode/report.c
@@ -1722,18 +1722,6 @@ list_address(FILE * F, const faction * uf, const faction_list * seenfactions)
if (ALLIED(uf, f)) label = '*';
else if (alliedfaction(NULL, uf, f, HELP_ALL)) label = '+';
rparagraph(F, buf, 4, 0, label);
-#ifdef SHORTPWDS
- if (f->shortpwds) {
- shortpwd * spwd = f->shortpwds;
- while (spwd) {
- if (spwd->used) {
- sprintf(buf, "Vertretung: %s", spwd->email);
- rparagraph(F, buf, 6, '-');
- }
- spwd=spwd->next;
- }
- }
-#endif
}
flist = flist->next;
diff --git a/src/common/kernel/faction.c b/src/common/kernel/faction.c
index 8088cc14b..aa493abde 100644
--- a/src/common/kernel/faction.c
+++ b/src/common/kernel/faction.c
@@ -182,7 +182,8 @@ addplayer(region *r, faction * f)
assert(f->units==NULL);
set_ursprung(f, 0, r->x, r->y);
u = createunit(r, f, 1, f->race);
- equip_unit(u, get_equipment("new_faction"));
+ equip_items(&u->faction->items, get_equipment("new_faction"));
+ equip_unit(u, get_equipment("first_unit"));
equip_unit(u, get_equipment(u->race->_name[0]));
u->hp = unit_max_hp(u) * u->number;
fset(u, UFL_ISNEW);
@@ -200,16 +201,6 @@ addplayer(region *r, faction * f)
boolean
checkpasswd(const faction * f, const char * passwd, boolean shortp)
{
-#ifdef SHORTPWDS
- shortpwd * slist = f->shortpwds;
- if (shortp) while (slist) {
- if (strcmp(slist->pwd, passwd)==0) {
- slist->used = true;
- return true;
- }
- slist = slist->next;
- }
-#endif
if (unicode_utf8_strcasecmp(f->passw, passwd)==0) return true;
if (unicode_utf8_strcasecmp(f->override, passwd)==0) return true;
return false;
diff --git a/src/common/kernel/faction.h b/src/common/kernel/faction.h
index fd211f0e6..4ee87361e 100644
--- a/src/common/kernel/faction.h
+++ b/src/common/kernel/faction.h
@@ -25,15 +25,6 @@ struct seen_region;
faction is in. defining this speeds up the turn by 30-40% */
#define SMART_INTERVALS
-#ifdef SHORTPWDS
-typedef struct shortpwd {
- struct shortpwd * next;
- char * email;
- char * pwd;
- boolean used;
-} shortpwd;
-#endif
-
/* faction flags */
#define FFL_NEWID (1<<0) /* Die Partei hat bereits einmal ihre no gewechselt */
#define FFL_ISNEW (1<<1)
@@ -74,9 +65,6 @@ typedef struct faction {
char *email;
char *passw;
char *override;
-#ifdef SHORTPWDS
- struct shortpwd * shortpwds;
-#endif
const struct locale * locale;
int lastorders; /* enno: short? */
int age; /* enno: short? */
diff --git a/src/eressea/lua/gamecode.cpp b/src/eressea/lua/gamecode.cpp
index 3a44bd32b..a3242a2c0 100644
--- a/src/eressea/lua/gamecode.cpp
+++ b/src/eressea/lua/gamecode.cpp
@@ -170,45 +170,10 @@ write_summary()
return -1;
}
-#ifdef SHORTPWDS
-static void
-readshortpwds()
-{
- FILE * F;
- char zText[MAX_PATH];
- sprintf(zText, "%s/%s.%u", basepath(), "shortpwds", turn);
-
- F = fopen(zText, "r");
- if (F==NULL) {
- log_error(("could not open password file %s", zText));
- } else {
- while (!feof(F)) {
- faction * f;
- char passwd[16], faction[5], email[64];
- fscanf(F, "%s %s %s\n", faction, passwd, email);
- f = findfaction(atoi36(faction));
- if (f!=NULL) {
- shortpwd * pwd = (shortpwd*)malloc(sizeof(shortpwd));
- if (set_email(&pwd->email, email)!=0) {
- log_error(("Invalid email address: %s\n", email));
- }
- pwd->pwd = strdup(passwd);
- pwd->used = false;
- pwd->next = f->shortpwds;
- f->shortpwds = pwd;
- }
- }
- fclose(F);
- }
-}
-#endif
static int
process_orders(void)
{
-#ifdef SHORTPWDS
- readshortpwds("passwords");
-#endif
turn++;
processorders();
diff --git a/src/res/eressea.xml b/src/res/eressea.xml
index 709dcfce9..ccf7ac919 100644
--- a/src/res/eressea.xml
+++ b/src/res/eressea.xml
@@ -19,6 +19,18 @@
+
+
+