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

fix last commit.

This commit is contained in:
Enno Rehling 2016-11-19 16:27:37 +01:00
parent 3de1dec4a5
commit eabaf8bebb
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/alchemy.c
View File

@ -241,6 +241,10 @@ static void init_potiondelay(attrib * a)
a->data.v = malloc(sizeof(potiondelay)); a->data.v = malloc(sizeof(potiondelay));
} }
static void free_potiondelay(attrib * a) {
free(a->data.v);
}
static int age_potiondelay(attrib * a, void *owner) static int age_potiondelay(attrib * a, void *owner)
{ {
potiondelay *pd = (potiondelay *)a->data.v; potiondelay *pd = (potiondelay *)a->data.v;
@ -252,7 +256,7 @@ static int age_potiondelay(attrib * a, void *owner)
attrib_type at_potiondelay = { attrib_type at_potiondelay = {
"potiondelay", "potiondelay",
init_potiondelay, init_potiondelay,
a_finalizeeffect, free_potiondelay,
age_potiondelay, 0, 0 age_potiondelay, 0, 0
}; };

6
src/battle.c
View File

@ -1028,9 +1028,9 @@ int natural_armor(unit * du)
an = armor_bonus(rc); an = armor_bonus(rc);
if (an > 0) { if (an > 0) {
int sk = effskill(du, SK_STAMINA, 0); int sk = effskill(du, SK_STAMINA, 0);
an = sk / an; return rc->armor + sk / an;
} }
return an + rc->armor; return rc->armor;
} }
static int rc_specialdamage(const unit *au, const unit *du, const struct weapon_type *wtype) static int rc_specialdamage(const unit *au, const unit *du, const struct weapon_type *wtype)
@ -2046,7 +2046,7 @@ void dazzle(battle * b, troop * td)
return; return;
} }
#endif #endif
if (td->fighter->person[td->index].flags & (FL_COURAGE|FL_DAZZLED) { if (td->fighter->person[td->index].flags & (FL_COURAGE|FL_DAZZLED)) {
return; return;
} }

1
tolua

@ -1 +0,0 @@
Subproject commit de289b60c5009b6ac8e786f39432c08eadbb69b7