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

http://eressea.upb.de/mantis/view.php?id=1344

Browse source 
"Kampfallianzen fehlerhaft"
New units must not be added to a group in another faction, ever.
This commit is contained in:
Enno Rehling 2008-03-05 19:30:52 +00:00
parent 33da72e28a
commit 91ece491e5
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/kernel/alchemy.h
View file

@ -51,9 +51,9 @@ enum {
MAX_POTIONS
};
void herbsearch(struct region * r, struct unit * u, int max);
int use_potion(struct unit * u, const struct item_type * itype, int amount, struct order *);
void init_potions(void);
extern void herbsearch(struct region * r, struct unit * u, int max);
extern int use_potion(struct unit * u, const struct item_type * itype, int amount, struct order *);
extern void init_potions(void);
extern int get_effect(const struct unit * u, const struct potion_type * effect);
extern int change_effect(struct unit * u, const struct potion_type * effect, int value);

2
src/common/kernel/unit.c
View file

@ -1382,7 +1382,7 @@ create_unit(region * r, faction * f, int number, const struct race *urace, int i
}
/* Gruppen */
if (fval(creator, UFL_GROUP)) {
if (creator->faction==f && fval(creator, UFL_GROUP)) {
a = a_find(creator->attribs, &at_group);
if (a) {
group * g = (group*)a->data.v;

2
src/common/spells/combatspells.c
View file

@ -1584,7 +1584,7 @@ sp_undeadhero(fighter * fi, int level, double power, spell * sp)
setstatus(u, du->status);
setguard(u, GUARD_NONE);
/* inheit stealth from magician */
/* inherit stealth from magician */
if (fval(mage, UFL_PARTEITARNUNG)) {
fset(u, UFL_PARTEITARNUNG);
}