From c812c92d1a1835f0bda783e709481188c8d92225 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 15 Mar 2014 19:34:59 -0700 Subject: Clean up header organization --- src/char/GNUmakefile | 7 ------- src/char/char.cpp | 19 +++++++++++-------- src/char/char.hpp | 13 +++++++------ src/char/int_party.cpp | 9 +++++---- src/char/int_party.hpp | 6 +++--- src/char/int_storage.cpp | 9 +++++---- src/char/int_storage.hpp | 6 +++--- src/char/inter.cpp | 13 +++++++------ src/char/inter.hpp | 6 +++--- src/char/main.cpp | 2 ++ 10 files changed, 46 insertions(+), 44 deletions(-) delete mode 100644 src/char/GNUmakefile (limited to 'src/char') diff --git a/src/char/GNUmakefile b/src/char/GNUmakefile deleted file mode 100644 index 48b4c0a..0000000 --- a/src/char/GNUmakefile +++ /dev/null @@ -1,7 +0,0 @@ -.SUFFIXES: -bin/tmwa-char: - ${MAKE} -C ../.. bin/tmwa-char -clean: - rm -r ../../obj/char/ -%:: - ${MAKE} -C ../.. obj/char/$@ diff --git a/src/char/char.cpp b/src/char/char.cpp index f6fd492..b74df46 100644 --- a/src/char/char.cpp +++ b/src/char/char.cpp @@ -17,24 +17,27 @@ #include #include +#include "../compat/alg.hpp" + #include "../strings/mstring.hpp" #include "../strings/astring.hpp" #include "../strings/zstring.hpp" #include "../strings/xstring.hpp" +#include "../generic/db.hpp" + #include "../io/cxxstdio.hpp" #include "../io/lock.hpp" #include "../io/read.hpp" #include "../io/tty.hpp" -#include "../common/config_parse.hpp" -#include "../common/core.hpp" -#include "../common/db.hpp" -#include "../common/extract.hpp" -#include "../common/human_time_diff.hpp" -#include "../common/socket.hpp" -#include "../common/timer.hpp" -#include "../common/version.hpp" +#include "../mmo/config_parse.hpp" +#include "../mmo/core.hpp" +#include "../mmo/extract.hpp" +#include "../mmo/human_time_diff.hpp" +#include "../mmo/socket.hpp" +#include "../mmo/timer.hpp" +#include "../mmo/version.hpp" #include "inter.hpp" #include "int_party.hpp" diff --git a/src/char/char.hpp b/src/char/char.hpp index 57cacee..6c47c1a 100644 --- a/src/char/char.hpp +++ b/src/char/char.hpp @@ -1,11 +1,12 @@ -#ifndef CHAR_HPP -#define CHAR_HPP +#ifndef TMWA_CHAR_CHAR_HPP +#define TMWA_CHAR_CHAR_HPP # include "../strings/fwd.hpp" -# include "../common/const_array.hpp" -# include "../common/ip.hpp" -# include "../common/mmo.hpp" +# include "../generic/const_array.hpp" + +# include "../mmo/ip.hpp" +# include "../mmo/mmo.hpp" class Session; @@ -32,4 +33,4 @@ void char_log(XString line); # define CHAR_LOG(fmt, ...) \ char_log(STRPRINTF(fmt, ## __VA_ARGS__)) -#endif // CHAR_HPP +#endif // TMWA_CHAR_CHAR_HPP diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp index 85af96c..c0bedde 100644 --- a/src/char/int_party.cpp +++ b/src/char/int_party.cpp @@ -7,14 +7,15 @@ #include "../strings/astring.hpp" #include "../strings/xstring.hpp" +#include "../generic/db.hpp" + #include "../io/cxxstdio.hpp" #include "../io/lock.hpp" #include "../io/read.hpp" -#include "../common/db.hpp" -#include "../common/extract.hpp" -#include "../common/mmo.hpp" -#include "../common/socket.hpp" +#include "../mmo/extract.hpp" +#include "../mmo/mmo.hpp" +#include "../mmo/socket.hpp" #include "char.hpp" #include "inter.hpp" diff --git a/src/char/int_party.hpp b/src/char/int_party.hpp index e4dedd1..73020a9 100644 --- a/src/char/int_party.hpp +++ b/src/char/int_party.hpp @@ -1,5 +1,5 @@ -#ifndef INT_PARTY_HPP -#define INT_PARTY_HPP +#ifndef TMWA_CHAR_INT_PARTY_HPP +#define TMWA_CHAR_INT_PARTY_HPP # include "../strings/fwd.hpp" @@ -14,4 +14,4 @@ void inter_party_leave(int party_id, int account_id); extern AString party_txt; -#endif // INT_PARTY_HPP +#endif // TMWA_CHAR_INT_PARTY_HPP diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp index 91151ec..0794c8f 100644 --- a/src/char/int_storage.cpp +++ b/src/char/int_storage.cpp @@ -9,14 +9,15 @@ #include "../strings/astring.hpp" #include "../strings/xstring.hpp" +#include "../generic/db.hpp" + #include "../io/cxxstdio.hpp" #include "../io/lock.hpp" #include "../io/read.hpp" -#include "../common/db.hpp" -#include "../common/extract.hpp" -#include "../common/mmo.hpp" -#include "../common/socket.hpp" +#include "../mmo/extract.hpp" +#include "../mmo/mmo.hpp" +#include "../mmo/socket.hpp" #include "../poison.hpp" diff --git a/src/char/int_storage.hpp b/src/char/int_storage.hpp index 7081f30..356d924 100644 --- a/src/char/int_storage.hpp +++ b/src/char/int_storage.hpp @@ -1,5 +1,5 @@ -#ifndef INT_STORAGE_HPP -#define INT_STORAGE_HPP +#ifndef TMWA_CHAR_INT_STORAGE_HPP +#define TMWA_CHAR_INT_STORAGE_HPP # include "../strings/fwd.hpp" @@ -14,4 +14,4 @@ int inter_storage_parse_frommap(Session *ms); extern AString storage_txt; -#endif // INT_STORAGE_HPP +#endif // TMWA_CHAR_INT_STORAGE_HPP diff --git a/src/char/inter.cpp b/src/char/inter.cpp index 4fea6be..c287844 100644 --- a/src/char/inter.cpp +++ b/src/char/inter.cpp @@ -11,16 +11,17 @@ #include "../strings/zstring.hpp" #include "../strings/xstring.hpp" +#include "../generic/db.hpp" + #include "../io/cxxstdio.hpp" #include "../io/lock.hpp" #include "../io/read.hpp" -#include "../common/config_parse.hpp" -#include "../common/db.hpp" -#include "../common/extract.hpp" -#include "../common/socket.hpp" -#include "../common/timer.hpp" -#include "../common/utils.hpp" +#include "../mmo/config_parse.hpp" +#include "../mmo/extract.hpp" +#include "../mmo/socket.hpp" +#include "../mmo/timer.hpp" +#include "../mmo/utils.hpp" #include "char.hpp" #include "int_party.hpp" diff --git a/src/char/inter.hpp b/src/char/inter.hpp index b566575..6dd907d 100644 --- a/src/char/inter.hpp +++ b/src/char/inter.hpp @@ -1,5 +1,5 @@ -#ifndef INTER_HPP -#define INTER_HPP +#ifndef TMWA_CHAR_INTER_HPP +#define TMWA_CHAR_INTER_HPP # include "../strings/fwd.hpp" @@ -14,4 +14,4 @@ int inter_check_length(Session *ms, int length); extern int party_share_level; -#endif // INTER_HPP +#endif // TMWA_CHAR_INTER_HPP diff --git a/src/char/main.cpp b/src/char/main.cpp index 9f68e0f..de51ae3 100644 --- a/src/char/main.cpp +++ b/src/char/main.cpp @@ -1,2 +1,4 @@ // dummy file to make Make dependencies work #include "char.hpp" + +#include "../poison.hpp" -- cgit v1.2.3-60-g2f50