From 0f0466b9a273a7f4481acae47f5cb1166a2d145a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 28 Nov 2014 16:33:25 +0300 Subject: Move struct files into struct directory. --- src/map/clif.c | 4 ++-- src/map/lang.c | 2 +- src/map/mapd.c | 2 +- src/map/mapdext.h | 13 ------------- src/map/npc.c | 2 +- src/map/parse.c | 2 +- src/map/pc.c | 2 +- src/map/script.c | 4 ++-- src/map/session.c | 2 +- src/map/sessionext.h | 13 ------------- src/map/struct/mapdext.h | 13 +++++++++++++ src/map/struct/sessionext.h | 13 +++++++++++++ 12 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 src/map/mapdext.h delete mode 100644 src/map/sessionext.h create mode 100644 src/map/struct/mapdext.h create mode 100644 src/map/struct/sessionext.h (limited to 'src/map') diff --git a/src/map/clif.c b/src/map/clif.c index 3ceaabd..0ea0983 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -18,10 +18,10 @@ #include "map/clif.h" #include "map/lang.h" #include "map/mapd.h" -#include "map/mapdext.h" #include "map/send.h" #include "map/session.h" -#include "map/sessionext.h" +#include "map/struct/mapdext.h" +#include "map/struct/sessionext.h" void eclif_quest_send_list(struct map_session_data *sd) { diff --git a/src/map/lang.c b/src/map/lang.c index 02fae53..66cdb0d 100644 --- a/src/map/lang.c +++ b/src/map/lang.c @@ -15,7 +15,7 @@ #include "map/lang.h" #include "map/session.h" -#include "map/sessionext.h" +#include "map/struct/sessionext.h" #define MAX_LANGS 100 diff --git a/src/map/mapd.c b/src/map/mapd.c index d47015c..7b72d6d 100644 --- a/src/map/mapd.c +++ b/src/map/mapd.c @@ -13,7 +13,7 @@ #include "../../../map/map.h" #include "map/mapd.h" -#include "map/mapdext.h" +#include "map/struct/mapdext.h" struct MapdExt *mapd_get(int m) { diff --git a/src/map/mapdext.h b/src/map/mapdext.h deleted file mode 100644 index 0c3c03a..0000000 --- a/src/map/mapdext.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Copyright (c) Hercules Dev Team, licensed under GNU GPL. -// Copyright (c) 2014 Evol developers - -#ifndef EVOL_MAP_MAPDEXT -#define EVOL_MAP_MAPDEXT - -struct MapdExt -{ - unsigned int mask; - bool invisible; -}; - -#endif // EVOL_MAP_MAPDEXT diff --git a/src/map/npc.c b/src/map/npc.c index ee0ff47..f5a07ea 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -15,7 +15,7 @@ #include "../../../map/pc.h" #include "map/mapd.h" -#include "map/mapdext.h" +#include "map/struct/mapdext.h" #include "map/npc.h" struct npc_data* enpc_checknear(struct map_session_data* sd, struct block_list* bl) diff --git a/src/map/parse.c b/src/map/parse.c index 6257a34..954e45c 100644 --- a/src/map/parse.c +++ b/src/map/parse.c @@ -13,7 +13,7 @@ #include "map/parse.h" #include "map/session.h" -#include "map/sessionext.h" +#include "map/struct/sessionext.h" void map_parse_version(int fd) { diff --git a/src/map/pc.c b/src/map/pc.c index 315595e..5e82c19 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -15,7 +15,7 @@ #include "map/pc.h" #include "map/session.h" -#include "map/sessionext.h" +#include "map/struct/sessionext.h" int langScriptId; diff --git a/src/map/script.c b/src/map/script.c index 8b8cbfe..f387714 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -21,11 +21,11 @@ #include "map/clif.h" #include "map/lang.h" #include "map/mapd.h" -#include "map/mapdext.h" #include "map/scriptdefines.h" #include "map/send.h" #include "map/session.h" -#include "map/sessionext.h" +#include "map/struct/mapdext.h" +#include "map/struct/sessionext.h" #include "map/utils/formatutils.h" BUILDIN(l) diff --git a/src/map/session.c b/src/map/session.c index 942da0b..7291772 100644 --- a/src/map/session.c +++ b/src/map/session.c @@ -13,7 +13,7 @@ #include "../../../map/pc.h" #include "map/session.h" -#include "map/sessionext.h" +#include "map/struct/sessionext.h" struct SessionExt *session_get(int fd) { diff --git a/src/map/sessionext.h b/src/map/sessionext.h deleted file mode 100644 index cd94393..0000000 --- a/src/map/sessionext.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Copyright (c) Hercules Dev Team, licensed under GNU GPL. -// Copyright (c) 2014 Evol developers - -#ifndef EVOL_MAP_SESSIONEXT -#define EVOL_MAP_SESSIONEXT - -struct SessionExt -{ - int clientVersion; - int language; -}; - -#endif // EVOL_MAP_SESSIONEXT diff --git a/src/map/struct/mapdext.h b/src/map/struct/mapdext.h new file mode 100644 index 0000000..0c3c03a --- /dev/null +++ b/src/map/struct/mapdext.h @@ -0,0 +1,13 @@ +// Copyright (c) Copyright (c) Hercules Dev Team, licensed under GNU GPL. +// Copyright (c) 2014 Evol developers + +#ifndef EVOL_MAP_MAPDEXT +#define EVOL_MAP_MAPDEXT + +struct MapdExt +{ + unsigned int mask; + bool invisible; +}; + +#endif // EVOL_MAP_MAPDEXT diff --git a/src/map/struct/sessionext.h b/src/map/struct/sessionext.h new file mode 100644 index 0000000..cd94393 --- /dev/null +++ b/src/map/struct/sessionext.h @@ -0,0 +1,13 @@ +// Copyright (c) Copyright (c) Hercules Dev Team, licensed under GNU GPL. +// Copyright (c) 2014 Evol developers + +#ifndef EVOL_MAP_SESSIONEXT +#define EVOL_MAP_SESSIONEXT + +struct SessionExt +{ + int clientVersion; + int language; +}; + +#endif // EVOL_MAP_SESSIONEXT -- cgit v1.2.3-70-g09d2