forked from github/server
refactor and kill dead code.
indentation normalization, copyright update.
This commit is contained in:
Enno Rehling
parent
a58afb9d15
commit
5626abd8dc
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright (c) 1998-2010, Enno Rehling <enno@eressea.de>
|
||||
Copyright (c) 1998-2014, Enno Rehling <enno@eressea.de>
|
||||
Katja Zedel <katze@felidae.kn-bremen.de
|
||||
Christian Schlittchen <corwin@amber.kn-bremen.de>
|
||||
|
||||
|
|
@ -126,7 +126,8 @@ int curse_age(attrib * a)
|
|||
}
|
||||
if (result != 0) {
|
||||
c->duration = 0;
|
||||
} else if (c->duration != INT_MAX) {
|
||||
}
|
||||
else if (c->duration != INT_MAX) {
|
||||
c->duration = _max(0, c->duration - 1);
|
||||
}
|
||||
return c->duration;
|
||||
|
|
@ -198,19 +199,22 @@ int curse_read(attrib * a, void *owner, struct storage *store)
|
|||
if (global.data_version >= CURSEVIGOURISFLOAT_VERSION) {
|
||||
READ_FLT(store, &flt);
|
||||
c->vigour = flt;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
READ_INT(store, &n);
|
||||
c->vigour = (float)n;
|
||||
}
|
||||
if (global.data_version < INTPAK_VERSION) {
|
||||
ur = read_reference(&c->magician, store, read_int, resolve_unit);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
ur = read_reference(&c->magician, store, read_unit_reference, resolve_unit);
|
||||
}
|
||||
if (global.data_version < CURSEFLOAT_VERSION) {
|
||||
READ_INT(store, &n);
|
||||
c->effect = (float)n;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
READ_FLT(store, &flt);
|
||||
c->effect = flt;
|
||||
}
|
||||
|
|
@ -225,7 +229,8 @@ int curse_read(attrib * a, void *owner, struct storage *store)
|
|||
}
|
||||
if (global.data_version < CURSEFLAGS_VERSION) {
|
||||
c_setflag(c, flags);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
c->flags = flags;
|
||||
}
|
||||
c_clearflag(c, CURSE_ISNEW);
|
||||
|
|
@ -312,7 +317,8 @@ const curse_type *ct_find(const char *c)
|
|||
|
||||
if (strcmp(c, type->cname) == 0) {
|
||||
return type;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
size_t k = _min(strlen(c), strlen(type->cname));
|
||||
if (!_memicmp(c, type->cname, k)) {
|
||||
return type;
|
||||
|
|
@ -327,7 +333,7 @@ const curse_type *ct_find(const char *c)
|
|||
* einen pointer auf die struct zurück.
|
||||
*/
|
||||
|
||||
bool cmp_curse(const attrib * a, const void *data)
|
||||
static bool cmp_curse(const attrib * a, const void *data)
|
||||
{
|
||||
const curse *c = (const curse *)data;
|
||||
if (a->type->flags & ATF_CURSE) {
|
||||
|
|
@ -337,29 +343,6 @@ bool cmp_curse(const attrib * a, const void *data)
|
|||
return false;
|
||||
}
|
||||
|
||||
bool cmp_cursetype(const attrib * a, const void *data)
|
||||
{
|
||||
const curse_type *ct = (const curse_type *)data;
|
||||
if (a->type->flags & ATF_CURSE) {
|
||||
if (!data || ct == ((curse *) a->data.v)->type)
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
curse *get_cursex(attrib * ap, const curse_type * ctype, variant data,
|
||||
bool(*compare) (const curse *, variant))
|
||||
{
|
||||
attrib *a = a_select(ap, ctype, cmp_cursetype);
|
||||
while (a) {
|
||||
curse *c = (curse *) a->data.v;
|
||||
if (compare(c, data))
|
||||
return c;
|
||||
a = a_select(a->next, ctype, cmp_cursetype);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
curse *get_curse(attrib * ap, const curse_type * ctype)
|
||||
{
|
||||
attrib *a = ap;
|
||||
|
|
@ -372,7 +355,8 @@ curse *get_curse(attrib * ap, const curse_type * ctype)
|
|||
return c;
|
||||
a = a->next;
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
a = a->nexttype;
|
||||
}
|
||||
}
|
||||
|
|
@ -388,11 +372,10 @@ curse *findcurse(int cid)
|
|||
}
|
||||
|
||||
/* ------------------------------------------------------------- */
|
||||
void remove_curse(attrib ** ap, const curse * c)
|
||||
bool remove_curse(attrib ** ap, const curse * c)
|
||||
{
|
||||
attrib *a = a_select(*ap, c, cmp_curse);
|
||||
if (a)
|
||||
a_remove(ap, a);
|
||||
return a && a_remove(ap, a) == 1;
|
||||
}
|
||||
|
||||
/* gibt die allgemeine Stärke der Verzauberung zurück. id2 wird wie
|
||||
|
|
@ -423,7 +406,8 @@ float curse_changevigour(attrib ** ap, curse * c, float vigour)
|
|||
if (vigour <= 0) {
|
||||
remove_curse(ap, c);
|
||||
vigour = 0;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
set_cursevigour(c, vigour);
|
||||
}
|
||||
return vigour;
|
||||
|
|
@ -576,7 +560,8 @@ curse *create_curse(unit * magician, attrib ** ap, const curse_type * ct,
|
|||
}
|
||||
}
|
||||
set_curseingmagician(magician, *ap, ct);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
c = make_curse(magician, ap, ct, vigour, duration, effect, men);
|
||||
}
|
||||
return c;
|
||||
|
|
@ -798,16 +783,19 @@ float destr_curse(curse * c, int cast_level, float force)
|
|||
force -= c->vigour;
|
||||
if (c->type->change_vigour) {
|
||||
c->type->change_vigour(c, -((float)cast_level + 1) / 2);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
c->vigour -= cast_level + 1 / 2;
|
||||
}
|
||||
}
|
||||
} else { /* Zauber ist stärker als curse */
|
||||
}
|
||||
else { /* Zauber ist stärker als curse */
|
||||
if (force >= c->vigour) { /* reicht die Kraft noch aus? */
|
||||
force -= c->vigour;
|
||||
if (c->type->change_vigour) {
|
||||
c->type->change_vigour(c, -c->vigour);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
c->vigour = 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright (c) 1998-2010, Enno Rehling <enno@eressea.de>
|
||||
Copyright (c) 1998-2014, Enno Rehling <enno@eressea.de>
|
||||
Katja Zedel <katze@felidae.kn-bremen.de
|
||||
Christian Schlittchen <corwin@amber.kn-bremen.de>
|
||||
|
||||
|
|
@ -251,7 +251,7 @@ extern "C" {
|
|||
bool is_cursed_internal(struct attrib *ap, const curse_type * ctype);
|
||||
/* ignoriert CURSE_ISNEW */
|
||||
|
||||
extern void remove_curse(struct attrib **ap, const struct curse *c);
|
||||
bool remove_curse(struct attrib **ap, const struct curse *c);
|
||||
/* löscht einen konkreten Spruch auf einem Objekt.
|
||||
*/
|
||||
|
||||
|
|
@ -280,11 +280,6 @@ extern "C" {
|
|||
* unterschiedlich gewünscht sein
|
||||
* */
|
||||
|
||||
extern struct curse *get_cursex(struct attrib *ap, const curse_type * ctype,
|
||||
variant data, bool(*compare) (const struct curse *, variant));
|
||||
/* gibt pointer auf die erste curse-struct zurück, deren Typ ctype ist,
|
||||
* und für die compare() true liefert, oder einen NULL-pointer.
|
||||
* */
|
||||
extern struct curse *get_curse(struct attrib *ap, const curse_type * ctype);
|
||||
/* gibt pointer auf die erste curse-struct zurück, deren Typ ctype ist,
|
||||
* oder einen NULL-pointer
|
||||
|
|
@ -303,9 +298,6 @@ extern "C" {
|
|||
extern void curse_done(struct attrib *a);
|
||||
extern int curse_age(struct attrib *a);
|
||||
|
||||
extern bool cmp_curse(const struct attrib *a, const void *data);
|
||||
extern bool cmp_cursetype(const struct attrib *a, const void *data);
|
||||
|
||||
extern float destr_curse(struct curse *c, int cast_level, float force);
|
||||
|
||||
extern int resolve_curse(variant data, void *address);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright (c) 1998-2010, Enno Rehling <enno@eressea.de>
|
||||
Copyright (c) 1998-2014, Enno Rehling <enno@eressea.de>
|
||||
Katja Zedel <katze@felidae.kn-bremen.de
|
||||
Christian Schlittchen <corwin@amber.kn-bremen.de>
|
||||
|
||||
|
|
@ -62,12 +62,10 @@ static int removecurse_handle(trigger * t, void *data)
|
|||
*/
|
||||
removecurse_data *td = (removecurse_data *)t->data.v;
|
||||
if (td->curse && td->target) {
|
||||
attrib *a = a_select(td->target->attribs, td->curse, cmp_curse);
|
||||
if (a) {
|
||||
a_remove(&td->target->attribs, a);
|
||||
} else
|
||||
if (!remove_curse(&td->target->attribs, td->curse)) {
|
||||
log_error("could not perform removecurse::handle()\n");
|
||||
}
|
||||
}
|
||||
unused_arg(data);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue