nochmal commit, datenfile lesen können wir jetzt

src/common/attributes/attributes.c

@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: attributes.c,v 1.2 2001/01/26 16:19:39 enno Exp $
+ * $Id: attributes.c,v 1.3 2001/01/27 19:30:07 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -27,9 +27,24 @@
 /* util includes */
 #include <attrib.h>
 
+/*
+ * simple attributes that do not yet have their own file 
+ */
+
+attrib_type at_orcification = {
+	"orcification", NULL, NULL, NULL, a_writedefault, a_readdefault, ATF_UNIQUE
+};
+
+/*
+ * library initialization
+ */
+
+
 void
 init_attributes(void)
 {
+	at_register(&at_orcification);
+
 	/* at_iceberg */
 	init_iceberg();
 	/* at_key */

src/common/attributes/targetregion.c

@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- * $Id: targetregion.c,v 1.2 2001/01/26 16:19:39 enno Exp $
+ * $Id: targetregion.c,v 1.3 2001/01/27 19:30:07 enno Exp $
  * Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -40,7 +40,7 @@ read_targetregion(attrib * a, FILE * F)
 }
 
 attrib_type at_targetregion = {
-	"targetregions",
+	"targetregion",
 	NULL,
 	NULL,
 	NULL,

src/common/gamecode/randenc.c

@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: randenc.c,v 1.2 2001/01/26 16:19:39 enno Exp $
+ *	$Id: randenc.c,v 1.3 2001/01/27 19:30:07 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -57,10 +57,7 @@
 
 #include <attributes/iceberg.h>
 extern attrib_type at_unitdissolve;
-
+extern attrib_type at_orcification;
-attrib_type at_orcification = {
-	"orcification", NULL, NULL, NULL, a_writedefault, a_readdefault, ATF_UNIQUE
-};
 
 int
 nrand(int start, int sub)

src/common/kernel/save.c

@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: save.c,v 1.3 2001/01/27 18:15:32 enno Exp $
+ *	$Id: save.c,v 1.4 2001/01/27 19:30:07 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -2112,7 +2112,6 @@ attrib_init(void)
 
 	/* Alle speicherbaren Attribute müssen hier registriert werden */
 	at_register(&at_unitdissolve);
-	at_register(&at_orcification);
 	at_register(&at_key);
 	at_register(&at_traveldir_new);
 	at_register(&at_familiar);

src/eressea/korrektur.c

@@ -1,6 +1,6 @@
 /* vi: set ts=2:
  *
- *	$Id: korrektur.c,v 1.3 2001/01/27 18:15:32 enno Exp $
+ *	$Id: korrektur.c,v 1.4 2001/01/27 19:30:07 enno Exp $
  *	Eressea PB(E)M host Copyright (C) 1998-2000
  *      Christian Schlittchen (corwin@amber.kn-bremen.de)
  *      Katja Zedel (katze@felidae.kn-bremen.de)
@@ -1649,8 +1649,10 @@ convert_triggers(void)
 				switch (rel->id) {
 				case REL_FAMILIAR:
 					if (u && u2) {
-						if (nonplayer(u)) set_familiar(u2, u);
+						if (nonplayer(u) || u->race==RC_GOBLIN)
-						else set_familiar(u, u2);
+							set_familiar(u2, u);
+						else 
+							set_familiar(u, u2);
 					} else {
 						if (u2) fprintf(stderr, "WARNING: FAMILIAR info for %s may be broken!\n", unitname(u2));
 						if (u) fprintf(stderr, "WARNING: FAMILIAR info for %s may be broken!\n", unitname(u));