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

COMPATIBILITY macro removed, hasn't been used since item_type got introduced.

This commit is contained in:
Enno Rehling 2005-07-31 19:49:04 +00:00
parent fc6e6d40dc
commit bfd26dc9b4
6 changed files with 0 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/gamecode/report.c
View File

@ -3096,18 +3096,6 @@ make_summary(void)
s->ruestungen += get_item(u, I_CHAIN_MAIL); s->ruestungen += get_item(u, I_CHAIN_MAIL);
s->ruestungen += get_item(u, I_PLATE_ARMOR); s->ruestungen += get_item(u, I_PLATE_ARMOR);
#ifdef COMPATIBILITY
s->ruestungen += get_item(u, I_CLOAK_OF_INVULNERABILITY);
s->artefakte += get_item(u, I_AMULET_OF_DARKNESS);
s->artefakte += get_item(u, I_AMULET_OF_HEALING);
s->artefakte += get_item(u, I_CLOAK_OF_INVULNERABILITY);
s->artefakte += get_item(u, I_SHIELDSTONE);
s->artefakte += get_item(u, I_STAFF_OF_FIRE);
s->artefakte += get_item(u, I_STAFF_OF_LIGHTNING);
s->artefakte += get_item(u, I_WAND_OF_TELEPORTATION);
#endif
s->artefakte += get_item(u, I_AMULET_OF_TRUE_SEEING); s->artefakte += get_item(u, I_AMULET_OF_TRUE_SEEING);
s->artefakte += get_item(u, I_RING_OF_INVISIBILITY); s->artefakte += get_item(u, I_RING_OF_INVISIBILITY);
s->artefakte += get_item(u, I_SPHERE_OF_INVISIBILITY); s->artefakte += get_item(u, I_SPHERE_OF_INVISIBILITY);

6
src/common/items/weapons.c
View File

@ -265,9 +265,6 @@ attack_catapult(const troop * at, int * casualties, int row)
} }
enum { enum {
#ifdef COMPATIBILITY
AR_MAGICAL,
#endif
AR_PLATE, AR_PLATE,
AR_CHAIN, AR_CHAIN,
AR_RUSTY_CHAIN, AR_RUSTY_CHAIN,
@ -287,9 +284,6 @@ typedef struct armordata {
static armordata armortable[] = static armordata armortable[] =
/* penalty; magres; prot; shield; item; */ /* penalty; magres; prot; shield; item; */
{ {
#ifdef COMPATIBILITY
{-0.80, 5, 0, I_CLOAK_OF_INVULNERABILITY },
#endif
{ 0.30, 0.00, 5, 0, I_PLATE_ARMOR}, { 0.30, 0.00, 5, 0, I_PLATE_ARMOR},
{ 0.15, 0.00, 3, 0, I_CHAIN_MAIL}, { 0.15, 0.00, 3, 0, I_CHAIN_MAIL},
{ 0.30, 0.00, 3, 0, I_RUSTY_CHAIN_MAIL}, { 0.30, 0.00, 3, 0, I_RUSTY_CHAIN_MAIL},

2
src/common/kernel/eressea.h
View File

@ -101,8 +101,6 @@ struct building_type;
#define NEW_RECEIPIES /* Vereinfachte, besser verteilte Kräuterzutaten für Tränke */ #define NEW_RECEIPIES /* Vereinfachte, besser verteilte Kräuterzutaten für Tränke */
#define GOBLINKILL #define GOBLINKILL
#undef COMPATIBILITY
#define MONSTER_FACTION 0 /* Die Partei, in der die Monster sind. */ #define MONSTER_FACTION 0 /* Die Partei, in der die Monster sind. */
/** /**

75
src/common/kernel/item.c
View File

@ -943,16 +943,6 @@ static t_item itemdata[MAXITEMS] = {
{"Weihrauch", "Weihrauch", "Weihrauch", "Weihrauch"}, {"Weihrauch", "Weihrauch", "Weihrauch", "Weihrauch"},
IS_LUXURY, 0, 0, {0, 0, 0, 0, 0, 0}, 200, 4, 0, NULL IS_LUXURY, 0, 0, {0, 0, 0, 0, 0, 0}, 200, 4, 0, NULL
}, },
#ifdef COMPATIBILITY
{ /* I_AMULET_OF_DARKNESS */
{"Amulett der Dunkelheit", "Amulette der Dunkelheit", "Amulett", "Amulette"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
{ /* I_AMULET_OF_DEATH */
{"Amulett des Todes", "Amulette des Todes", "Amulett", "Amulette"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
#endif
{ /* I_AMULET_OF_HEALING */ { /* I_AMULET_OF_HEALING */
{"Amulett der Heilung", "Amulette der Heilung", "Amulett", "Amulette"}, {"Amulett der Heilung", "Amulette der Heilung", "Amulett", "Amulette"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
@ -962,13 +952,6 @@ static t_item itemdata[MAXITEMS] = {
"Amulette"}, "Amulette"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
}, },
#ifdef COMPATIBILITY
{ /* I_CLOAK_OF_INVULNERABILITY 23 */
{"Mantel der Unverletzlichkeit", "Mäntel der Unverletzlichkeit",
"Kettenhemd", "Kettenhemden"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
#endif
{ /* I_RING_OF_INVISIBILITY 24 */ { /* I_RING_OF_INVISIBILITY 24 */
{"Ring der Unsichtbarkeit", "Ringe der Unsichtbarkeit", "", ""}, {"Ring der Unsichtbarkeit", "Ringe der Unsichtbarkeit", "", ""},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
@ -982,37 +965,6 @@ static t_item itemdata[MAXITEMS] = {
"Flammenschwert", "Flammenschwerter"}, "Flammenschwert", "Flammenschwerter"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 100, 0, 0, NULL IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 100, 0, 0, NULL
}, },
#ifdef COMPATIBILITY
{ /* I_SHIELDSTONE 27 */
{"Schildstein", "Schildsteine", "Amulett", "Amulette"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
{ /* I_STAFF_OF_FIRE 28 */
{"Zauberstab des Feuers", "Zauberstäbe des Feuers", "Zauberstab",
"Zauberstäbe"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
{ /* I_STAFF_OF_LIGHTNING 29 */
{"Zauberstab der Blitze", "Zauberstäbe der Blitze", "Zauberstab",
"Zauberstäbe"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
{ /* I_WAND_OF_TELEPORTATION 30 */
{"Zauberstab der Teleportation", "Zauberstäbe der Teleportation",
"Zauberstab", "Zauberstäbe"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
{ /* I_EYE_OF_HORAX 31 */
{"Kristallauge des Einhorns", "Kristallaugen des Einhorns",
"Kristallauge des Einhorns", "Kristallaugen des Einhorns"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
{ /* I_TELEPORTCRYSTAL 32 */
{"Kristall der Weiten Reise", "Kristalle der Weiten Reise",
"Kristall der Weiten Reise", "Kristalle der Weiten Reise"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
#endif
{ /* I_DRAGONHEAD 33 */ { /* I_DRAGONHEAD 33 */
{"Drachenkopf", "Drachenköpfe", "Drachenkopf", "Drachenköpfe"}, {"Drachenkopf", "Drachenköpfe", "Drachenkopf", "Drachenköpfe"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 500, 0, 0, NULL IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 500, 0, 0, NULL
@ -1066,33 +1018,6 @@ static t_item itemdata[MAXITEMS] = {
{"Mandelkern", "Mandelkerne", "Mandelkern", "Mandelkerne"}, {"Mandelkern", "Mandelkerne", "Mandelkern", "Mandelkerne"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
}, },
#ifdef COMPATIBILITY
{ /* I_STAB_DES_SCHICKSALS 53 */
{"Stab des Schicksals", "Stäbe des Schicksals",
"Stab des Schicksals", "Stäbe des Schicksals"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
{ /* I_STAB_DER_VERDAMMNIS 54 */
{"Stab der Verdammnis", "Stäbe der Verdammnis",
"Stab der Verdammnis", "Stäbe der Verdammnis"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
{ /* I_STAB_DES_TODES 55 */
{"Stab des Todes", "Stäbe des Todes",
"Stab des Todes", "Stäbe des Todes"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
{ /* I_STAB_DES_CHAOS 56 */
{"Stab des Chaos", "Stäbe des Chaos",
"Stab des Chaos", "Stäbe des Chaos"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
{ /* I_STECKEN_DER_MACHT 57 */
{"Stecken der Macht", "Stecken der Macht",
"Stecken der Macht", "Stecken der Macht"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
#endif
{ /* I_AMULETT_DES_TREFFENS 58 */ { /* I_AMULETT_DES_TREFFENS 58 */
{"Amulett des Treffens", "Amulette des Treffens", {"Amulett des Treffens", "Amulette des Treffens",
"Amulett des Treffens", "Amulette des Treffens"}, "Amulett des Treffens", "Amulette des Treffens"},

38
src/common/kernel/item.h
View File

@ -296,27 +296,11 @@ enum {
I_SILK, I_SILK,
I_INCENSE, I_INCENSE,
/* alte Artefakte */ /* alte Artefakte */
#ifdef COMPATIBILITY
I_AMULET_OF_DARKNESS, /* weg */
I_AMULET_OF_DEATH, /* weg */
#endif
I_AMULET_OF_HEALING, I_AMULET_OF_HEALING,
I_AMULET_OF_TRUE_SEEING, I_AMULET_OF_TRUE_SEEING,
#ifdef COMPATIBILITY
I_CLOAK_OF_INVULNERABILITY, /* weg */
#endif
I_RING_OF_INVISIBILITY, I_RING_OF_INVISIBILITY,
I_RING_OF_POWER, I_RING_OF_POWER,
I_FIRESWORD, /* Runenschwert ersetzen durch Flammenschwert */ I_FIRESWORD, /* Runenschwert ersetzen durch Flammenschwert */
#ifdef COMPATIBILITY
I_SHIELDSTONE, /* weg */
I_STAFF_OF_FIRE, /* weg */
I_STAFF_OF_LIGHTNING, /* weg */
I_WAND_OF_TELEPORTATION, /* weg */
/* Ende alte Artefakte */
I_EYE_OF_HORAX,
I_TELEPORTCRYSTAL,
#endif
I_DRAGONHEAD, I_DRAGONHEAD,
I_CHASTITY_BELT, /* bleibt */ I_CHASTITY_BELT, /* bleibt */
I_GREATSWORD, I_GREATSWORD,
@ -387,26 +371,11 @@ enum {
R_OIL, R_OIL,
R_SILK, R_SILK,
R_INCENSE, R_INCENSE,
#ifdef COMPATIBILITY
R_AMULET_OF_DARKNESS,
R_AMULET_OF_DEATH,
#endif
R_AMULET_OF_HEALING, R_AMULET_OF_HEALING,
R_AMULET_OF_TRUE_SEEING, R_AMULET_OF_TRUE_SEEING,
#ifdef COMPATIBILITY
R_CLOAK_OF_INVULNERABILITY,
#endif
R_RING_OF_INVISIBILITY, R_RING_OF_INVISIBILITY,
R_RING_OF_POWER, R_RING_OF_POWER,
R_FIRESWORD, R_FIRESWORD,
#ifdef COMPATIBILITY
R_SHIELDSTONE,
R_STAFF_OF_FIRE,
R_STAFF_OF_LIGHTNING,
R_WAND_OF_TELEPORTATION,
R_EYE_OF_HORAX,
R_TELEPORTCRYSTAL,
#endif
R_DRAGONHEAD, R_DRAGONHEAD,
R_CHASTITY_BELT, R_CHASTITY_BELT,
R_GREATSWORD, R_GREATSWORD,
@ -420,13 +389,6 @@ enum {
R_APFEL, R_APFEL,
R_NUSS, R_NUSS,
R_MANDELKERN, R_MANDELKERN,
#ifdef COMPATIBILITY
R_STAB_DES_SCHICKSALS,
R_STAB_DER_VERDAMMNIS,
R_STAB_DES_TODES,
R_STAB_DES_CHAOS,
R_STECKEN_DER_MACHT,
#endif
R_AMULETT_DES_TREFFENS, R_AMULETT_DES_TREFFENS,
R_DRACHENBLUT, R_DRACHENBLUT,
R_FEENSTIEFEL, R_FEENSTIEFEL,

2
src/common/kernel/save.c
View File

@ -1817,12 +1817,10 @@ readgame(const char * filename, int backup)
if (global.data_version >= GLOBAL_ATTRIB_VERSION) { if (global.data_version >= GLOBAL_ATTRIB_VERSION) {
a_read(F, &global.attribs); a_read(F, &global.attribs);
} }
#ifndef COMPATIBILITY
if (global.data_version < ITEMTYPE_VERSION) { if (global.data_version < ITEMTYPE_VERSION) {
fprintf(stderr, "kann keine alten datenfiles einlesen"); fprintf(stderr, "kann keine alten datenfiles einlesen");
exit(-1); exit(-1);
} }
#endif
global.data_turn = turn = ri(F); global.data_turn = turn = ri(F);
ri(F); /* max_unique_id = */ ri(F); /* max_unique_id = */
nextborder = ri(F); nextborder = ri(F);