diff --git a/res/core/de/strings.xml b/res/core/de/strings.xml
index 8b207e6d9..4582644c7 100644
--- a/res/core/de/strings.xml
+++ b/res/core/de/strings.xml
@@ -2456,23 +2456,6 @@
skeleton
-
- Zentaur
- centaur
-
-
- Zentauren
- centaurs
-
-
- Zentauren
- centaurs
-
-
- Zentauren
- centaur
-
-
Schattenritter
shadow knight
diff --git a/res/core/fr/strings.xml b/res/core/fr/strings.xml
index 8acc1d89f..d1801b338 100644
--- a/res/core/fr/strings.xml
+++ b/res/core/fr/strings.xml
@@ -1894,12 +1894,6 @@
aigle
-
- centaures
-
-
- centaure
-
squelettes
diff --git a/res/e3a/races.xml b/res/e3a/races.xml
index 99c3420af..2b0f68b9d 100644
--- a/res/e3a/races.xml
+++ b/res/e3a/races.xml
@@ -890,7 +890,7 @@
-
+
@@ -898,7 +898,7 @@
-
+
@@ -909,7 +909,7 @@
-
+
diff --git a/res/eressea/equipment.xml b/res/eressea/equipment.xml
index d78705a06..f35505bc0 100644
--- a/res/eressea/equipment.xml
+++ b/res/eressea/equipment.xml
@@ -68,10 +68,6 @@
-
-
-
-
diff --git a/res/eressea/races.xml b/res/eressea/races.xml
index 513797d8d..b3f384923 100644
--- a/res/eressea/races.xml
+++ b/res/eressea/races.xml
@@ -27,7 +27,7 @@
-
+
@@ -61,7 +61,7 @@
-
+
@@ -90,7 +90,7 @@
-
+
@@ -118,7 +118,7 @@
-
+
@@ -148,7 +148,7 @@
-
+
@@ -178,7 +178,7 @@
-
+
@@ -209,7 +209,7 @@
-
+
@@ -244,7 +244,7 @@
-
+
@@ -275,7 +275,7 @@
-
+
@@ -308,7 +308,7 @@
-
+
@@ -339,7 +339,7 @@
-
+
@@ -370,7 +370,7 @@
-
+
@@ -401,7 +401,7 @@
-
+
@@ -431,7 +431,7 @@
-
+
@@ -463,7 +463,7 @@
-
+
@@ -495,7 +495,7 @@
-
+
@@ -525,7 +525,7 @@
-
+
@@ -558,7 +558,7 @@
-
+
@@ -589,17 +589,17 @@
-
+
-
+
+ regaura="1.000000" weight="100" capacity="540" speed="1.000000" hp="20" damage="0d0" unarmedattack="0" unarmeddefense="0" attackmodifier="6" defensemodifier="10" scarepeasants="yes" fly="yes" walk="yes" teach="no" invinciblenonmagic="yes">
@@ -607,7 +607,7 @@
-
+
@@ -676,41 +676,41 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -724,13 +724,13 @@
-
+
-
+
@@ -742,7 +742,7 @@
-
+
@@ -755,7 +755,7 @@
-
+
@@ -769,13 +769,13 @@
-
+
-
+
@@ -978,7 +978,7 @@
-
+
@@ -1011,11 +1011,11 @@
-
+
-
+
@@ -1023,7 +1023,7 @@
-
+
@@ -1037,7 +1037,7 @@
-
+
@@ -1055,7 +1055,7 @@
-
+
@@ -1073,7 +1073,7 @@
-
+
@@ -1089,7 +1089,7 @@
-
+
@@ -1104,7 +1104,7 @@
-
+
@@ -1119,7 +1119,7 @@
-
+
@@ -1134,40 +1134,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -1209,36 +1181,6 @@
-
@@ -1328,7 +1270,7 @@
-
+
@@ -1342,13 +1284,13 @@
-
+
-
+
@@ -1357,7 +1299,7 @@
-
+
diff --git a/src/kernel/race.c b/src/kernel/race.c
index b7b466cc8..4003c701e 100644
--- a/src/kernel/race.c
+++ b/src/kernel/race.c
@@ -65,13 +65,13 @@ static const char *racenames[MAXRACES] = {
"dwarf", "elf", NULL, "goblin", "human", "troll", "demon", "insect",
"halfling", "cat", "aquarian", "orc", "snotling", "undead", "illusion",
"youngdragon", "dragon", "wyrm", "ent", "catdragon", "dracoid",
- "special", "spell", "irongolem", "stonegolem", "shadowdemon",
+ NULL, "spell", "irongolem", "stonegolem", "shadowdemon",
"shadowmaster", "mountainguard", "alp", "toad", "braineater", "peasant",
"wolf", NULL, NULL, NULL, NULL, "songdragon", NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, "seaserpent",
- "shadowknight", "centaur", "skeleton", "skeletonlord", "zombie",
- "juju-zombie", "ghoul", "ghast", "museumghost", "gnome", "template",
+ "shadowknight", NULL, "skeleton", "skeletonlord", "zombie",
+ "juju-zombie", "ghoul", "ghast", NULL, NULL, "template",
"clone"
};
diff --git a/src/kernel/race.h b/src/kernel/race.h
index f42e769a6..17c2bc61f 100644
--- a/src/kernel/race.h
+++ b/src/kernel/race.h
@@ -52,37 +52,31 @@ extern "C" {
RC_ELF,
RC_GOBLIN = 3,
RC_HUMAN,
-
RC_TROLL,
RC_DAEMON,
RC_INSECT,
RC_HALFLING,
RC_CAT,
-
RC_AQUARIAN,
RC_ORC,
RC_SNOTLING,
RC_UNDEAD,
RC_ILLUSION,
-
RC_FIREDRAGON,
RC_DRAGON,
RC_WYRM,
RC_TREEMAN,
RC_BIRTHDAYDRAGON,
-
RC_DRACOID,
- RC_SPECIAL,
- RC_SPELL,
+
+ RC_SPELL = 22,
RC_IRONGOLEM,
RC_STONEGOLEM,
-
RC_SHADOW,
RC_SHADOWLORD,
RC_IRONKEEPER,
RC_ALP,
RC_TOAD,
-
RC_HIRNTOETER,
RC_PEASANT,
RC_WOLF = 32,
@@ -91,20 +85,15 @@ extern "C" {
RC_SEASERPENT = 51,
RC_SHADOWKNIGHT,
- RC_CENTAUR,
- RC_SKELETON,
+ RC_SKELETON = 54,
RC_SKELETON_LORD,
RC_ZOMBIE,
RC_ZOMBIE_LORD,
RC_GHOUL,
RC_GHOUL_LORD,
-
- RC_MUS_SPIRIT,
- RC_GNOME,
- RC_TEMPLATE,
+ RC_TEMPLATE = 62,
RC_CLONE,
-
MAXRACES,
NORACE = -1
} race_t;
diff --git a/src/modules/score.c b/src/modules/score.c
index 2fd3cf230..89cf90655 100644
--- a/src/modules/score.c
+++ b/src/modules/score.c
@@ -38,6 +38,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include
/* libc includes */
+#include
#include
#include
@@ -105,14 +106,14 @@ void score(void)
int itemscore = 0;
int i;
faction *f = u->faction;
+ const race *rc = u_race(u);
- if (f == NULL || u_race(u) == get_race(RC_SPELL)
- || u_race(u) == get_race(RC_BIRTHDAYDRAGON)) {
+ if (f == NULL) {
continue;
}
-
- if (old_race(u_race(u)) <= RC_AQUARIAN) {
- f->score += (u_race(u)->recruitcost * u->number) / 50;
+ else if (rc->recruitcost>0) {
+ assert(playerrace(rc));
+ f->score += (rc->recruitcost * u->number) / 50;
}
f->score += get_money(u) / 50;
for (itm = u->items; itm; itm = itm->next) {
diff --git a/src/races/races.c b/src/races/races.c
index 38d69ac3e..68b3c5ae2 100644
--- a/src/races/races.c
+++ b/src/races/races.c
@@ -84,9 +84,6 @@ static void equip_newunits(const struct equipment *eq, struct unit *u)
u_set_ship(u, sh);
}
break;
- case RC_CENTAUR:
- rsethorses(r, 250 + rng_int() % 51 + rng_int() % 51);
- break;
default:
break;
}