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

Katapulte die aus der hinteren Reihe nicht schiessen konnten, haben trotzdem
nachgeladen.
This commit is contained in:
Enno Rehling 2004-10-16 00:46:38 +00:00
parent f5b6d89c1b
commit d6cd1c0efe
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/items/weapons.c
View File

@ -207,8 +207,10 @@ attack_catapult(const troop * at, int * casualties, int row)
weapon * wp = af->person[at->index].missile; weapon * wp = af->person[at->index].missile;
assert(row>=FIGHT_ROW); assert(row>=FIGHT_ROW);
if (row>BEHIND_ROW) return false; /* keine weiteren attacken */ if (row>BEHIND_ROW) {
/* probiere noch weitere attacken, kann nicht schiessen */
return true;
}
assert(wp->type->itype==olditemtype[I_CATAPULT]); assert(wp->type->itype==olditemtype[I_CATAPULT]);
assert(af->person[at->index].reload==0); assert(af->person[at->index].reload==0);

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

@ -2001,18 +2001,15 @@ attack(battle *b, troop ta, const att *a, int numattack)
ta.fighter->person[ta.index].reload--; ta.fighter->person[ta.index].reload--;
} else { } else {
boolean standard_attack = true; boolean standard_attack = true;
boolean reload = false;
/* spezialattacken der waffe nur, wenn erste attacke in der runde. /* spezialattacken der waffe nur, wenn erste attacke in der runde.
* sonst helden mit feuerschwertern zu mächtig */ * sonst helden mit feuerschwertern zu mächtig */
if (numattack==0 && wp && wp->type->attack) { if (numattack==0 && wp && wp->type->attack) {
int dead = 0; int dead = 0;
standard_attack = wp->type->attack(&ta, &dead, row); standard_attack = wp->type->attack(&ta, &dead, row);
if (!standard_attack) reload = true;
af->catmsg += dead; af->catmsg += dead;
/* TODO: dies hier ist nicht richtig. wenn die katapulte/etc. if (!standard_attack && af->person[ta.index].last_action < b->turn) {
* keinen gegner gefunden haben, sollte es nicht erhöht werden.
* außerdem müsste allen gegenern der counter erhöht werden.
*/
if (af->person[ta.index].last_action < b->turn) {
af->person[ta.index].last_action = b->turn; af->person[ta.index].last_action = b->turn;
af->action_counter++; af->action_counter++;
} }
@ -2038,7 +2035,7 @@ attack(battle *b, troop ta, const att *a, int numattack)
ta.fighter->person[ta.index].last_action = b->turn; ta.fighter->person[ta.index].last_action = b->turn;
ta.fighter->action_counter++; ta.fighter->action_counter++;
} }
reload = true;
if (hits(ta, td, wp)) { if (hits(ta, td, wp)) {
const char * d; const char * d;
if (wp == NULL) d = au->race->def_damage; if (wp == NULL) d = au->race->def_damage;
@ -2047,7 +2044,7 @@ attack(battle *b, troop ta, const att *a, int numattack)
terminate(td, ta, a->type, d, missile); terminate(td, ta, a->type, d, missile);
} }
} }
if (wp && wp->type->reload && !getreload(ta)) { if (reload && wp && wp->type->reload && !getreload(ta)) {
int i = setreload(ta); int i = setreload(ta);
sprintf(buf, " Nachladen gesetzt: %d", i); sprintf(buf, " Nachladen gesetzt: %d", i);
battledebug(buf); battledebug(buf);

5
src/common/kernel/region.h
View File

@ -191,10 +191,11 @@ void rsethorses(const struct region * r, int value);
#define riron(r) ((r)->land?(r)->land->iron:0) #define riron(r) ((r)->land?(r)->land->iron:0)
#define rsetiron(r, value) ((r)->land?((r)->land->iron=(value)):(value),0) #define rsetiron(r, value) ((r)->land?((r)->land->iron=(value)):(value),0)
int rlaen(const struct region * r);
void rsetlaen(struct region * r, int value);
#endif /* NEW_RESOURCEGROWTH */ #endif /* NEW_RESOURCEGROWTH */
extern int rlaen(const struct region * r);
extern void rsetlaen(struct region * r, int value);
#define rherbtype(r) ((r)->land?(r)->land->herbtype:0) #define rherbtype(r) ((r)->land?(r)->land->herbtype:0)
#define rsetherbtype(r, value) ((r)->land?((r)->land->herbtype=(value)):(value),0) #define rsetherbtype(r, value) ((r)->land?((r)->land->herbtype=(value)):(value),0)