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

removed R_ANTIMAGICCRYSTAL as well.

This commit is contained in:
Enno Rehling 2005-10-23 10:15:30 +00:00
parent 8483c555fc
commit 4d38380766
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/gamecode/items.c
View File

@ -98,7 +98,13 @@ use_speedsail(struct unit * u, const struct item_type * itype, int amount, struc
static void static void
use_antimagiccrystal(region * r, unit * mage, int amount, struct order * ord) use_antimagiccrystal(region * r, unit * mage, int amount, struct order * ord)
{ {
const resource_type rt_crystal = NULL;
int i; int i;
if (rt_crystal == NULL) {
rt_crystal = rt_find("antimagic");
assert(rt_crystal!=NULL);
}
for (i=0;i!=amount;++i) { for (i=0;i!=amount;++i) {
int effect, duration = 2; int effect, duration = 2;
double force; double force;
@ -143,9 +149,8 @@ use_antimagiccrystal(region * r, unit * mage, int amount, struct order * ord)
var.i = effect; var.i = effect;
create_curse(mage, &r->attribs, ct_find("antimagiczone"), force, duration, var, 0); create_curse(mage, &r->attribs, ct_find("antimagiczone"), force, duration, var, 0);
} }
} }
use_pooled(mage, mage->region, R_ANTIMAGICCRYSTAL, amount); new_use_pooled(mage, rt_crystal, GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, amount);
ADDMSG(&mage->faction->msgs, msg_message("use_antimagiccrystal", ADDMSG(&mage->faction->msgs, msg_message("use_antimagiccrystal",
"unit region", mage, r)); "unit region", mage, r));
return; return;

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

@ -374,7 +374,6 @@ enum {
R_PEGASUS, R_PEGASUS,
R_UNICORN, R_UNICORN,
R_DOLPHIN, R_DOLPHIN,
R_ANTIMAGICCRYSTAL,
R_RING_OF_NIMBLEFINGER, R_RING_OF_NIMBLEFINGER,
R_TROLLBELT, R_TROLLBELT,
R_PRESSCARD, R_PRESSCARD,