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

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

"Angegriffene Einheiten auf Schiffen an Land fliehen nicht"

Also:
- printing the monster faction in reports
This commit is contained in:
Enno Rehling 2008-05-20 08:39:56 +00:00
parent dcf7166973
commit ad14e45341
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/gamecode/creport.c
View File

@ -995,10 +995,10 @@ cr_find_address(FILE * F, const faction * uf, const faction_list * addresses)
const faction_list * flist = addresses; const faction_list * flist = addresses;
while (flist!=NULL) { while (flist!=NULL) {
const faction * f = flist->data; const faction * f = flist->data;
if (uf!=f && !is_monsters(f)) { if (uf!=f) {
fprintf(F, "PARTEI %d\n", f->no); fprintf(F, "PARTEI %d\n", f->no);
fprintf(F, "\"%s\";Parteiname\n", f->name); fprintf(F, "\"%s\";Parteiname\n", f->name);
fprintf(F, "\"%s\";email\n", f->email); if (f->email) fprintf(F, "\"%s\";email\n", f->email);
fprintf(F, "\"%s\";banner\n", f->banner); fprintf(F, "\"%s\";banner\n", f->banner);
fprintf(F, "\"%s\";locale\n", locale_name(f->locale)); fprintf(F, "\"%s\";locale\n", locale_name(f->locale));
if (f->alliance!=NULL && f->alliance==uf->alliance) { if (f->alliance!=NULL && f->alliance==uf->alliance) {

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

@ -3898,7 +3898,6 @@ battle_flee(battle * b)
int runhp = min(600,(int)(0.9+unit_max_hp(u)*hpflee(u->status))); int runhp = min(600,(int)(0.9+unit_max_hp(u)*hpflee(u->status)));
if (fval(u->race, RCF_UNDEAD) || u->race == new_race[RC_SHADOWKNIGHT]) continue; if (fval(u->race, RCF_UNDEAD) || u->race == new_race[RC_SHADOWKNIGHT]) continue;
if (u->ship) continue;
dt.fighter = fig; dt.fighter = fig;
#ifndef SIMPLE_ESCAPE #ifndef SIMPLE_ESCAPE
if (!fig->run.region) fig->run.region = fleeregion(u); if (!fig->run.region) fig->run.region = fleeregion(u);