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

der curse heißt nicht MAGICSTONE sondern magicwalls

This commit is contained in:
Katja Zedel 2002-05-11 18:12:25 +00:00
parent 5e6df3b13f
commit a26a079f10
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/kernel/battle.c
View File

@ -1639,10 +1639,10 @@ skilldiff(troop at, troop dt, int dist)
if (df->building) { if (df->building) {
boolean init = false; boolean init = false;
static const curse_type * strongwall_ct, * magicstone_ct; static const curse_type * strongwall_ct, * magicwalls_ct;
if (!init) { if (!init) {
strongwall_ct = ct_find("strongwall"); strongwall_ct = ct_find("strongwall");
magicstone_ct = ct_find("magicstone"); magicwalls_ct = ct_find("magicwalls");
init=true; init=true;
} }
if (df->building->type->flags & BTF_PROTECTION) { if (df->building->type->flags & BTF_PROTECTION) {
@ -1663,7 +1663,7 @@ skilldiff(troop at, troop dt, int dist)
is_protected = 2; is_protected = 2;
} }
} }
if (magicstone_ct && curse_active(get_curse(df->building->attribs, magicstone_ct))) { if (magicwalls_ct && curse_active(get_curse(df->building->attribs, magicwalls_ct))) {
/* Verdoppelt Burgenbonus */ /* Verdoppelt Burgenbonus */
skdiff -= buildingeffsize(df->building, false); skdiff -= buildingeffsize(df->building, false);
} }

6
src/common/kernel/build.c
View File

@ -182,8 +182,8 @@ siege(region * r, unit * u)
int d; int d;
int bewaffnete, katapultiere = 0; int bewaffnete, katapultiere = 0;
static boolean init = false; static boolean init = false;
static const curse_type * magicstone_ct; static const curse_type * magicwalls_ct;
if (!init) { init = true; magicstone_ct = ct_find("magicstone"); } if (!init) { init = true; magicwalls_ct = ct_find("magicwalls"); }
/* gibt es ueberhaupt Burgen? */ /* gibt es ueberhaupt Burgen? */
b = getbuilding(r); b = getbuilding(r);
@ -233,7 +233,7 @@ siege(region * r, unit * u)
d = min(d, b->size - 1); d = min(d, b->size - 1);
/* meldung, schaden anrichten */ /* meldung, schaden anrichten */
if (d && !curse_active(get_curse(b->attribs, magicstone_ct))) { if (d && !curse_active(get_curse(b->attribs, magicwalls_ct))) {
b->size -= d; b->size -= d;
new_use_pooled(u, &rt_catapultammo, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, d); new_use_pooled(u, &rt_catapultammo, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, d);
d = 100 * d / b->size; d = 100 * d / b->size;

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

@ -100,7 +100,7 @@ enum {
C_SHIP_FLYING, /* 10 - Luftschiff-Zauber */ C_SHIP_FLYING, /* 10 - Luftschiff-Zauber */
C_SHIP_NODRIFT, /* 11 - GünstigeWinde-Zauber */ C_SHIP_NODRIFT, /* 11 - GünstigeWinde-Zauber */
C_DEPRESSION, C_DEPRESSION,
C_MAGICSTONE, /* 13 - Heimstein */ C_MAGICWALLS, /* 13 - Heimstein */
C_STRONGWALL, /* 14 - Feste Mauer - Precombat*/ C_STRONGWALL, /* 14 - Feste Mauer - Precombat*/
C_ASTRALBLOCK, /* 15 - Astralblock */ C_ASTRALBLOCK, /* 15 - Astralblock */
C_GENEROUS, /* 16 - Unterhaltung vermehren */ C_GENEROUS, /* 16 - Unterhaltung vermehren */

4
src/common/kernel/spell.c
View File

@ -2098,7 +2098,7 @@ sp_homestone(castorder *co)
return 0; return 0;
} }
c = create_curse(mage, &mage->building->attribs, ct_find("magicstone"), c = create_curse(mage, &mage->building->attribs, ct_find("magicwalls"),
force*force, 1, 0, 0); force*force, 1, 0, 0);
if (c==NULL) { if (c==NULL) {
@ -2433,7 +2433,7 @@ sp_earthquake(castorder *co)
continue; continue;
/* Schutzzauber */ /* Schutzzauber */
if(is_cursed(burg->attribs, C_MAGICSTONE, 0)) if(is_cursed(burg->attribs, C_MAGICWALLS, 0))
continue; continue;
/* Magieresistenz */ /* Magieresistenz */

2
src/common/spells/buildingcurse.c
View File

@ -53,7 +53,7 @@ cinfo_building(const locale * lang, void * obj, typ_t typ, curse *c, int self)
/* CurseInfo mit Spezialabfragen */ /* CurseInfo mit Spezialabfragen */
/* C_MAGICSTONE*/ /* C_MAGICWALLS*/
static int static int
cinfo_magicrunes(void * obj, typ_t typ, curse *c, int self) cinfo_magicrunes(void * obj, typ_t typ, curse *c, int self)
{ {