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

removing old COUNT_DF define.

Browse source
This commit is contained in:
Enno Rehling 2007-01-30 22:20:13 +00:00
parent 48682dd7bc
commit 2b3daae8e3
2 changed files with 2 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,7 +69,6 @@
#define dbgprintf(a) fprintf a; #define dbgprintf(a) fprintf a;
static FILE *bdebug; static FILE *bdebug;
#undef COUNT_DF
#undef DELAYED_OFFENSE /* non-guarding factions cannot attack after moving */ #undef DELAYED_OFFENSE /* non-guarding factions cannot attack after moving */
#define TACTICS_RANDOM 5 /* define this as 1 to deactivate */ #define TACTICS_RANDOM 5 /* define this as 1 to deactivate */
@ -1995,15 +1994,6 @@ attack(battle *b, troop ta, const att *a, int numattack)
td = select_opponent(b, ta, melee_range[0], melee_range[1]); td = select_opponent(b, ta, melee_range[0], melee_range[1]);
} }
if (!td.fighter) return; if (!td.fighter) return;
#ifdef COUNT_DF
if (td.fighter->person[td.index].last_action < b->turn) {
td.fighter->person[td.index].last_action = b->turn;
#ifndef SIMPLE_COMBAT
td.fighter->action_counter++;
td.fighter->side->bf->lastturn = b->turn;
#endif
}
#endif
if (ta.fighter->person[ta.index].last_action < b->turn) { if (ta.fighter->person[ta.index].last_action < b->turn) {
ta.fighter->person[ta.index].last_action = b->turn; ta.fighter->person[ta.index].last_action = b->turn;
#ifndef SIMPLE_COMBAT #ifndef SIMPLE_COMBAT
@ -2034,15 +2024,6 @@ attack(battle *b, troop ta, const att *a, int numattack)
case AT_NATURAL: case AT_NATURAL:
td = select_opponent(b, ta, melee_range[0], melee_range[1]); td = select_opponent(b, ta, melee_range[0], melee_range[1]);
if (!td.fighter) return; if (!td.fighter) return;
#ifdef COUNT_DF
if(td.fighter->person[td.index].last_action < b->turn) {
td.fighter->person[td.index].last_action = b->turn;
#ifndef SIMPLE_COMBAT
td.fighter->action_counter++;
td.fighter->side->bf->lastturn = b->turn;
#endif
}
#endif
if(ta.fighter->person[ta.index].last_action < b->turn) { if(ta.fighter->person[ta.index].last_action < b->turn) {
ta.fighter->person[ta.index].last_action = b->turn; ta.fighter->person[ta.index].last_action = b->turn;
#ifndef SIMPLE_COMBAT #ifndef SIMPLE_COMBAT
@ -2057,15 +2038,6 @@ attack(battle *b, troop ta, const att *a, int numattack)
case AT_DRAIN_ST: case AT_DRAIN_ST:
td = select_opponent(b, ta, melee_range[0], melee_range[1]); td = select_opponent(b, ta, melee_range[0], melee_range[1]);
if (!td.fighter) return; if (!td.fighter) return;
#ifdef COUNT_DF
if(td.fighter->person[td.index].last_action < b->turn) {
td.fighter->person[td.index].last_action = b->turn;
#ifndef SIMPLE_COMBAT
td.fighter->action_counter++;
td.fighter->side->bf->lastturn = b->turn;
#endif
}
#endif
if(ta.fighter->person[ta.index].last_action < b->turn) { if(ta.fighter->person[ta.index].last_action < b->turn) {
ta.fighter->person[ta.index].last_action = b->turn; ta.fighter->person[ta.index].last_action = b->turn;
#ifndef SIMPLE_COMBAT #ifndef SIMPLE_COMBAT
@ -2088,15 +2060,6 @@ attack(battle *b, troop ta, const att *a, int numattack)
case AT_DRAIN_EXP: case AT_DRAIN_EXP:
td = select_opponent(b, ta, melee_range[0], melee_range[1]); td = select_opponent(b, ta, melee_range[0], melee_range[1]);
if (!td.fighter) return; if (!td.fighter) return;
#ifdef COUNT_DF
if(td.fighter->person[td.index].last_action < b->turn) {
td.fighter->person[td.index].last_action = b->turn;
#ifndef SIMPLE_COMBAT
td.fighter->action_counter++;
td.fighter->side->bf->lastturn = b->turn;
#endif
}
#endif
if(ta.fighter->person[ta.index].last_action < b->turn) { if(ta.fighter->person[ta.index].last_action < b->turn) {
ta.fighter->person[ta.index].last_action = b->turn; ta.fighter->person[ta.index].last_action = b->turn;
#ifndef SIMPLE_COMBAT #ifndef SIMPLE_COMBAT
@ -2111,15 +2074,6 @@ attack(battle *b, troop ta, const att *a, int numattack)
case AT_DAZZLE: case AT_DAZZLE:
td = select_opponent(b, ta, melee_range[0], melee_range[1]); td = select_opponent(b, ta, melee_range[0], melee_range[1]);
if (!td.fighter) return; if (!td.fighter) return;
#ifdef COUNT_DF
if(td.fighter->person[td.index].last_action < b->turn) {
td.fighter->person[td.index].last_action = b->turn;
#ifndef SIMPLE_COMBAT
td.fighter->action_counter++;
td.fighter->side->bf->lastturn = b->turn;
#endif
}
#endif
if(ta.fighter->person[ta.index].last_action < b->turn) { if(ta.fighter->person[ta.index].last_action < b->turn) {
ta.fighter->person[ta.index].last_action = b->turn; ta.fighter->person[ta.index].last_action = b->turn;
#ifndef SIMPLE_COMBAT #ifndef SIMPLE_COMBAT
@ -2918,7 +2872,7 @@ make_fighter(battle * b, unit * u, side * s1, boolean attack)
assert(u->number); assert(u->number);
if (fval(u, UFL_PARTEITARNUNG)!=0) flags |= SIDE_STEALTH; if (fval(u, UFL_PARTEITARNUNG)!=0) flags |= SIDE_STEALTH;
#ifdef SIMPLE_COMBAT #ifdef SIMPLE_COMBAT
if (attack) flags |= SIDE_ATTACKER; if (attack) flags |= SIDE_HASGUARDS;
#endif #endif
if (!init) { if (!init) {
it_demonseye = it_find("demonseye"); it_demonseye = it_find("demonseye");

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

@ -79,7 +79,7 @@ extern "C" {
#define SIDE_STEALTH 1<<0 #define SIDE_STEALTH 1<<0
#ifdef SIMPLE_COMBAT #ifdef SIMPLE_COMBAT
#define SIDE_ATTACKER 1<<1 #define SIDE_HASGUARDS 1<<1
#endif #endif
typedef struct side { typedef struct side {
struct side * next; /* nächstes Heer in der Schlacht */ struct side * next; /* nächstes Heer in der Schlacht */