From 33fb378b7605d34e73d9187cfb36aa8535b96cd0 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Thu, 6 Jun 2024 17:50:58 +0200 Subject: Generate code out of tree --- src/char/char.cpp | 22 +++++++++++----------- src/char/fwd.hpp | 4 ++-- src/char/globals.cpp | 8 ++++---- src/char/int_party.cpp | 4 ++-- src/char/int_storage.cpp | 4 ++-- src/char/inter.cpp | 4 ++-- src/char/inter.hpp | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/char') diff --git a/src/char/char.cpp b/src/char/char.cpp index 7ffdd0f..c398e39 100644 --- a/src/char/char.cpp +++ b/src/char/char.cpp @@ -60,12 +60,12 @@ #include "../net/socket.hpp" #include "../net/timer.hpp" -#include "../proto2/any-user.hpp" -#include "../proto2/login-admin.hpp" -#include "../proto2/login-char.hpp" -#include "../proto2/login-user.hpp" -#include "../proto2/char-map.hpp" -#include "../proto2/char-user.hpp" +#include "proto2/any-user.hpp" +#include "proto2/login-admin.hpp" +#include "proto2/login-char.hpp" +#include "proto2/login-user.hpp" +#include "proto2/char-map.hpp" +#include "proto2/char-user.hpp" #include "../mmo/config_parse.hpp" #include "../mmo/cxxstdio_enums.hpp" @@ -80,11 +80,11 @@ #include "../wire/packets.hpp" -#include "char_conf.hpp" -#include "char_lan_conf.hpp" +#include "char/char_conf.hpp" +#include "char/char_lan_conf.hpp" #include "globals.hpp" -#include "inter.hpp" -#include "inter_conf.hpp" +#include "char/inter.hpp" +#include "char/inter_conf.hpp" #include "int_party.hpp" #include "int_storage.hpp" @@ -816,7 +816,7 @@ void create_online_files(void) if (!server_for(&cd)) continue; - + p = cd.data.get(); // failsafe diff --git a/src/char/fwd.hpp b/src/char/fwd.hpp index 8086083..3836576 100644 --- a/src/char/fwd.hpp +++ b/src/char/fwd.hpp @@ -18,7 +18,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "../sanity.hpp" +#include "sanity.hpp" #include "../ints/fwd.hpp" // rank 1 #include "../strings/fwd.hpp" // rank 1 @@ -27,7 +27,7 @@ #include "../io/fwd.hpp" // rank 4 #include "../net/fwd.hpp" // rank 5 #include "../mmo/fwd.hpp" // rank 6 -#include "../proto2/fwd.hpp" // rank 8 +#include "proto2/fwd.hpp" // rank 8 #include "../high/fwd.hpp" // rank 9 #include "../wire/fwd.hpp" // rank 9 // char/fwd.hpp is rank ∞ because it is an executable diff --git a/src/char/globals.cpp b/src/char/globals.cpp index 6733ad5..bb81c34 100644 --- a/src/char/globals.cpp +++ b/src/char/globals.cpp @@ -22,13 +22,13 @@ #include "../generic/db.hpp" -#include "../proto2/net-Storage.hpp" +#include "proto2/net-Storage.hpp" #include "char.hpp" -#include "char_conf.hpp" -#include "char_lan_conf.hpp" +#include "char/char_conf.hpp" +#include "char/char_lan_conf.hpp" #include "inter.hpp" -#include "inter_conf.hpp" +#include "char/inter_conf.hpp" #include "../poison.hpp" diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp index 7b2ecc2..98e5194 100644 --- a/src/char/int_party.cpp +++ b/src/char/int_party.cpp @@ -34,7 +34,7 @@ #include "../io/read.hpp" #include "../io/write.hpp" -#include "../proto2/char-map.hpp" +#include "proto2/char-map.hpp" #include "../mmo/ids.hpp" @@ -46,7 +46,7 @@ #include "char.hpp" #include "globals.hpp" #include "inter.hpp" -#include "inter_conf.hpp" +#include "char/inter_conf.hpp" #include "../poison.hpp" diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp index 32af231..86d76e2 100644 --- a/src/char/int_storage.cpp +++ b/src/char/int_storage.cpp @@ -33,7 +33,7 @@ #include "../io/read.hpp" #include "../io/write.hpp" -#include "../proto2/char-map.hpp" +#include "proto2/char-map.hpp" #include "../mmo/cxxstdio_enums.hpp" @@ -43,7 +43,7 @@ #include "../wire/packets.hpp" #include "globals.hpp" -#include "inter_conf.hpp" +#include "char/inter_conf.hpp" #include "../poison.hpp" diff --git a/src/char/inter.cpp b/src/char/inter.cpp index 3f2d1aa..06b18db 100644 --- a/src/char/inter.cpp +++ b/src/char/inter.cpp @@ -42,7 +42,7 @@ #include "../mmo/config_parse.hpp" -#include "../proto2/char-map.hpp" +#include "proto2/char-map.hpp" #include "../high/extract_mmo.hpp" #include "../high/mmo.hpp" @@ -51,7 +51,7 @@ #include "char.hpp" #include "globals.hpp" -#include "inter_conf.hpp" +#include "char/inter_conf.hpp" #include "int_party.hpp" #include "int_storage.hpp" diff --git a/src/char/inter.hpp b/src/char/inter.hpp index c641254..4656639 100644 --- a/src/char/inter.hpp +++ b/src/char/inter.hpp @@ -27,7 +27,7 @@ #include "../mmo/consts.hpp" #include "../mmo/ids.hpp" -#include "../proto2/net-GlobalReg.hpp" +#include "proto2/net-GlobalReg.hpp" namespace tmwa -- cgit v1.2.3-70-g09d2