forked from github/server
add missing guard.h include everywhere, remove duplicate prototypes from config.h
This commit is contained in:
parent
dd9420fc38
commit
71c4cb53c0
|
@ -11,6 +11,8 @@
|
||||||
#include <kernel/item.h>
|
#include <kernel/item.h>
|
||||||
#include <kernel/region.h>
|
#include <kernel/region.h>
|
||||||
|
|
||||||
|
#include "guard.h"
|
||||||
|
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
#include <CuTest.h>
|
#include <CuTest.h>
|
||||||
|
|
|
@ -19,6 +19,7 @@ without prior permission by the authors of Eressea.
|
||||||
#include "move.h"
|
#include "move.h"
|
||||||
#include "reports.h"
|
#include "reports.h"
|
||||||
#include "seen.h"
|
#include "seen.h"
|
||||||
|
#include "guard.h"
|
||||||
|
|
||||||
/* attributes includes */
|
/* attributes includes */
|
||||||
#include <attributes/racename.h>
|
#include <attributes/racename.h>
|
||||||
|
|
|
@ -224,16 +224,6 @@ extern "C" {
|
||||||
|
|
||||||
void setstatus(struct unit *u, int status);
|
void setstatus(struct unit *u, int status);
|
||||||
/* !< sets combatstatus of a unit */
|
/* !< sets combatstatus of a unit */
|
||||||
void setguard(struct unit *u, unsigned int flags);
|
|
||||||
/* !< setzt die guard-flags der Einheit */
|
|
||||||
unsigned int getguard(const struct unit *u);
|
|
||||||
/* liest die guard-flags der Einheit */
|
|
||||||
void guard(struct unit *u, unsigned int mask);
|
|
||||||
/* Einheit setzt "BEWACHE", rassenspezifzisch.
|
|
||||||
* 'mask' kann einzelne flags zusätzlich und-maskieren.
|
|
||||||
*/
|
|
||||||
unsigned int guard_flags(const struct unit *u);
|
|
||||||
|
|
||||||
int besieged(const struct unit *u);
|
int besieged(const struct unit *u);
|
||||||
int maxworkingpeasants(const struct region *r);
|
int maxworkingpeasants(const struct region *r);
|
||||||
bool has_horses(const struct unit *u);
|
bool has_horses(const struct unit *u);
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "move.h"
|
#include "move.h"
|
||||||
|
|
||||||
|
#include "guard.h"
|
||||||
|
|
||||||
#include <kernel/config.h>
|
#include <kernel/config.h>
|
||||||
#include <kernel/ally.h>
|
#include <kernel/ally.h>
|
||||||
#include <kernel/building.h>
|
#include <kernel/building.h>
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
#include <kernel/race.h>
|
#include <kernel/race.h>
|
||||||
#include <kernel/terrain.h>
|
#include <kernel/terrain.h>
|
||||||
|
|
||||||
|
#include <guard.h>
|
||||||
#include <battle.h>
|
#include <battle.h>
|
||||||
#include <move.h>
|
#include <move.h>
|
||||||
|
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
c93c:Menschen:1:4
|
|
||||||
c93c:Menschen:1:4
|
|
Loading…
Reference in New Issue