mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-09 02:21:11 +00:00
Remove some unneeded includes of array.hpp and move it to where really needed.
This commit is contained in:
parent
e0fd4c8524
commit
6dcf0be3dc
@ -25,6 +25,7 @@
|
|||||||
#include "ai_python.hpp"
|
#include "ai_python.hpp"
|
||||||
#endif
|
#endif
|
||||||
#include "actions.hpp"
|
#include "actions.hpp"
|
||||||
|
#include "array.hpp"
|
||||||
#include "callable_objects.hpp"
|
#include "callable_objects.hpp"
|
||||||
#include "dialogs.hpp"
|
#include "dialogs.hpp"
|
||||||
#include "foreach.hpp"
|
#include "foreach.hpp"
|
||||||
@ -48,6 +49,8 @@
|
|||||||
#define WRN_AI LOG_STREAM(warn, ai)
|
#define WRN_AI LOG_STREAM(warn, ai)
|
||||||
#define ERR_AI LOG_STREAM(err, ai)
|
#define ERR_AI LOG_STREAM(err, ai)
|
||||||
|
|
||||||
|
typedef util::array<gamemap::location,6> adjacent_tiles_array;
|
||||||
|
|
||||||
/** A trivial ai that sits around doing absolutely nothing. */
|
/** A trivial ai that sits around doing absolutely nothing. */
|
||||||
class idle_ai : public ai_interface {
|
class idle_ai : public ai_interface {
|
||||||
public:
|
public:
|
||||||
|
@ -17,7 +17,6 @@
|
|||||||
|
|
||||||
#include "global.hpp"
|
#include "global.hpp"
|
||||||
|
|
||||||
#include "array.hpp"
|
|
||||||
#include "builder.hpp"
|
#include "builder.hpp"
|
||||||
#include "config.hpp"
|
#include "config.hpp"
|
||||||
#include "log.hpp"
|
#include "log.hpp"
|
||||||
|
@ -24,7 +24,6 @@ class gamestatus;
|
|||||||
class unit;
|
class unit;
|
||||||
class unit_map;
|
class unit_map;
|
||||||
|
|
||||||
#include "array.hpp"
|
|
||||||
#include "map.hpp"
|
#include "map.hpp"
|
||||||
#include "pathutils.hpp"
|
#include "pathutils.hpp"
|
||||||
#include "team.hpp"
|
#include "team.hpp"
|
||||||
@ -36,9 +35,6 @@ class unit_map;
|
|||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
|
|
||||||
/** A convenient type for storing a list of tiles adjacent to a certain tile. */
|
|
||||||
typedef util::array<gamemap::location,6> adjacent_tiles_array;
|
|
||||||
|
|
||||||
class xy_pred : public std::unary_function<gamemap::location const&, bool>
|
class xy_pred : public std::unary_function<gamemap::location const&, bool>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user