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=1351

Browse source 
"Gegner bewegt sich im Astralraum, obwohl er einen langen Kampf hatte"
- made guarding astral space work.
This commit is contained in:
Enno Rehling 2008-02-05 15:23:07 +00:00
parent f51e9c9de1
commit 55fc1ccd47
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/kernel/battle.c
View file

@ -2141,7 +2141,7 @@ make_side(battle * b, const faction * f, const group * g, unsigned int flags, co
bfaction * bf; bfaction * bf;
#ifdef SIMPLE_COMBAT #ifdef SIMPLE_COMBAT
if (!fval(b->region->terrain, LAND_REGION)) { if (fval(b->region->terrain, SEA_REGION)) {
/* every fight in an ocean is short */ /* every fight in an ocean is short */
flags |= SIDE_HASGUARDS; flags |= SIDE_HASGUARDS;
} else { } else {
@ -2282,7 +2282,7 @@ aftermath(battle * b)
side *s; side *s;
int dead_players = 0; int dead_players = 0;
bfaction * bf; bfaction * bf;
boolean battle_was_relevant = (boolean)(b->turn+(b->has_tactics_turn?1:0)>2); boolean ships_damaged = (boolean)(b->turn+(b->has_tactics_turn?1:0)>2); /* only used for ship damage! */
#ifdef TROLLSAVE #ifdef TROLLSAVE
int *trollsave = calloc(2 * cv_size(&b->factions), sizeof(int)); int *trollsave = calloc(2 * cv_size(&b->factions), sizeof(int));
@ -2552,7 +2552,7 @@ aftermath(battle * b)
/* Wenn sich die Einheit auf einem Schiff befindet, wird /* Wenn sich die Einheit auf einem Schiff befindet, wird
* dieses Schiff beschädigt. Andernfalls ein Schiff, welches * dieses Schiff beschädigt. Andernfalls ein Schiff, welches
* evt. zuvor verlassen wurde. */ * evt. zuvor verlassen wurde. */
if (battle_was_relevant) { if (ships_damaged) {
if (du->ship) sh = du->ship; if (du->ship) sh = du->ship;
else sh = leftship(du); else sh = leftship(du);
@ -2567,7 +2567,7 @@ aftermath(battle * b)
} }
} }
if (battle_was_relevant) { if (ships_damaged) {
ship **sp = &r->ships; ship **sp = &r->ships;
while (*sp) { while (*sp) {
@ -2587,7 +2587,7 @@ aftermath(battle * b)
fprintf(bdebug, "The battle lasted %d turns, %s and %s.\n", fprintf(bdebug, "The battle lasted %d turns, %s and %s.\n",
b->turn, b->turn,
b->has_tactics_turn?"had a tactic turn":"had no tactic turn", b->has_tactics_turn?"had a tactic turn":"had no tactic turn",
battle_was_relevant?"was relevant":"was not relevant."); ships_damaged?"was relevant":"was not relevant.");
} }
} }

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

@ -2180,7 +2180,7 @@ setguard(unit * u, unsigned int flags)
unsigned int unsigned int
getguard(const unit * u) getguard(const unit * u)
{ {
if (!fval(u->region->terrain, LAND_REGION)) return GUARD_NONE; if (fval(u->region->terrain, SEA_REGION)) return GUARD_NONE;
if (fval(u, UFL_GUARD)) { if (fval(u, UFL_GUARD)) {
attrib * a = a_find(u->attribs, &at_guard); attrib * a = a_find(u->attribs, &at_guard);
if (a) return (unsigned int)a->data.i; if (a) return (unsigned int)a->data.i;

2
src/common/kernel/eressea.h
View file

@ -41,7 +41,7 @@ extern "C" {
#define HERBS_ROT /* herbs owned by units have a chance to rot. */ #define HERBS_ROT /* herbs owned by units have a chance to rot. */
#define SHIPDAMAGE /* Schiffsbeschädigungen */ #define SHIPDAMAGE /* Schiffsbeschädigungen */
#define INSECT_POTION /* Spezialtrank für Insekten */ #define INSECT_POTION /* Spezialtrank für Insekten */
#define ORCIFICATION /* gioving snotlings to the peasants gets counted */ #define ORCIFICATION /* giving snotlings to the peasants gets counted */
#undef TROLLSAVE /* saving throw for dead trolls */ #undef TROLLSAVE /* saving throw for dead trolls */
#include <settings.h> #include <settings.h>