From 7af4c5b5c561362cb1135ab504095ae667a9270a Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Fri, 27 Jun 2014 19:16:45 -0700 Subject: This is more reliable --- src/proto2/any-user.hpp | 9 +++------ src/proto2/char-map.hpp | 9 +++------ src/proto2/char-user.hpp | 9 +++------ src/proto2/fwd.hpp | 9 +++------ src/proto2/login-admin.hpp | 9 +++------ src/proto2/login-char.hpp | 9 +++------ src/proto2/login-user.hpp | 9 +++------ src/proto2/map-user.hpp | 9 +++------ src/proto2/types.hpp | 41 +++++++++++++++++++---------------------- 9 files changed, 43 insertions(+), 70 deletions(-) (limited to 'src/proto2') diff --git a/src/proto2/any-user.hpp b/src/proto2/any-user.hpp index be77b21..aeb703b 100644 --- a/src/proto2/any-user.hpp +++ b/src/proto2/any-user.hpp @@ -1,5 +1,4 @@ -#ifndef TMWA_PROTO2_ANY_USER_HPP -#define TMWA_PROTO2_ANY_USER_HPP +#pragma once // any-user.hpp - TMWA network protocol: any/user // // Copyright © 2014 Ben Longbons @@ -21,9 +20,9 @@ // This is a generated file, edit tools/protocol.py instead -# include "fwd.hpp" +#include "fwd.hpp" -# include "types.hpp" +#include "types.hpp" namespace tmwa { @@ -213,5 +212,3 @@ bool network_to_native(Packet_Payload<0x8000> *native, NetPacket_Payload<0x8000> } } // namespace tmwa - -#endif // TMWA_PROTO2_ANY_USER_HPP diff --git a/src/proto2/char-map.hpp b/src/proto2/char-map.hpp index bd16099..23798b2 100644 --- a/src/proto2/char-map.hpp +++ b/src/proto2/char-map.hpp @@ -1,5 +1,4 @@ -#ifndef TMWA_PROTO2_CHAR_MAP_HPP -#define TMWA_PROTO2_CHAR_MAP_HPP +#pragma once // char-map.hpp - TMWA network protocol: char/map // // Copyright © 2014 Ben Longbons @@ -21,9 +20,9 @@ // This is a generated file, edit tools/protocol.py instead -# include "fwd.hpp" +#include "fwd.hpp" -# include "types.hpp" +#include "types.hpp" namespace tmwa { @@ -3535,5 +3534,3 @@ bool network_to_native(Packet_Repeat<0x3827> *native, NetPacket_Repeat<0x3827> n } } // namespace tmwa - -#endif // TMWA_PROTO2_CHAR_MAP_HPP diff --git a/src/proto2/char-user.hpp b/src/proto2/char-user.hpp index 89d19de..ed58d69 100644 --- a/src/proto2/char-user.hpp +++ b/src/proto2/char-user.hpp @@ -1,5 +1,4 @@ -#ifndef TMWA_PROTO2_CHAR_USER_HPP -#define TMWA_PROTO2_CHAR_USER_HPP +#pragma once // char-user.hpp - TMWA network protocol: char/user // // Copyright © 2014 Ben Longbons @@ -21,9 +20,9 @@ // This is a generated file, edit tools/protocol.py instead -# include "fwd.hpp" +#include "fwd.hpp" -# include "types.hpp" +#include "types.hpp" namespace tmwa { @@ -621,5 +620,3 @@ bool network_to_native(Packet_Fixed<0x0071> *native, NetPacket_Fixed<0x0071> net } } // namespace tmwa - -#endif // TMWA_PROTO2_CHAR_USER_HPP diff --git a/src/proto2/fwd.hpp b/src/proto2/fwd.hpp index 82d917d..6077913 100644 --- a/src/proto2/fwd.hpp +++ b/src/proto2/fwd.hpp @@ -1,5 +1,4 @@ -#ifndef TMWA_PROTO2_FWD_HPP -#define TMWA_PROTO2_FWD_HPP +#pragma once // proto2/fwd.hpp - Forward declarations of network packets // // Copyright © 2014 Ben Longbons @@ -19,9 +18,9 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -# include "../sanity.hpp" +#include "../sanity.hpp" -# include +#include namespace tmwa { @@ -1722,5 +1721,3 @@ struct NetPacket_Payload<0x8000>; } // namespace tmwa - -#endif // TMWA_PROTO2_FWD_HPP diff --git a/src/proto2/login-admin.hpp b/src/proto2/login-admin.hpp index f4965d0..9d5fb5e 100644 --- a/src/proto2/login-admin.hpp +++ b/src/proto2/login-admin.hpp @@ -1,5 +1,4 @@ -#ifndef TMWA_PROTO2_LOGIN_ADMIN_HPP -#define TMWA_PROTO2_LOGIN_ADMIN_HPP +#pragma once // login-admin.hpp - TMWA network protocol: login/admin // // Copyright © 2014 Ben Longbons @@ -21,9 +20,9 @@ // This is a generated file, edit tools/protocol.py instead -# include "fwd.hpp" +#include "fwd.hpp" -# include "types.hpp" +#include "types.hpp" namespace tmwa { @@ -2217,5 +2216,3 @@ bool network_to_native(Packet_Fixed<0x7955> *native, NetPacket_Fixed<0x7955> net } } // namespace tmwa - -#endif // TMWA_PROTO2_LOGIN_ADMIN_HPP diff --git a/src/proto2/login-char.hpp b/src/proto2/login-char.hpp index 6b96a03..6bd939c 100644 --- a/src/proto2/login-char.hpp +++ b/src/proto2/login-char.hpp @@ -1,5 +1,4 @@ -#ifndef TMWA_PROTO2_LOGIN_CHAR_HPP -#define TMWA_PROTO2_LOGIN_CHAR_HPP +#pragma once // login-char.hpp - TMWA network protocol: login/char // // Copyright © 2014 Ben Longbons @@ -21,9 +20,9 @@ // This is a generated file, edit tools/protocol.py instead -# include "fwd.hpp" +#include "fwd.hpp" -# include "types.hpp" +#include "types.hpp" namespace tmwa { @@ -1234,5 +1233,3 @@ bool network_to_native(Packet_Fixed<0x2741> *native, NetPacket_Fixed<0x2741> net } } // namespace tmwa - -#endif // TMWA_PROTO2_LOGIN_CHAR_HPP diff --git a/src/proto2/login-user.hpp b/src/proto2/login-user.hpp index 822d224..fb6fcc7 100644 --- a/src/proto2/login-user.hpp +++ b/src/proto2/login-user.hpp @@ -1,5 +1,4 @@ -#ifndef TMWA_PROTO2_LOGIN_USER_HPP -#define TMWA_PROTO2_LOGIN_USER_HPP +#pragma once // login-user.hpp - TMWA network protocol: login/user // // Copyright © 2014 Ben Longbons @@ -21,9 +20,9 @@ // This is a generated file, edit tools/protocol.py instead -# include "fwd.hpp" +#include "fwd.hpp" -# include "types.hpp" +#include "types.hpp" namespace tmwa { @@ -324,5 +323,3 @@ bool network_to_native(Packet_Fixed<0x006a> *native, NetPacket_Fixed<0x006a> net } } // namespace tmwa - -#endif // TMWA_PROTO2_LOGIN_USER_HPP diff --git a/src/proto2/map-user.hpp b/src/proto2/map-user.hpp index efeb0bc..630c4f2 100644 --- a/src/proto2/map-user.hpp +++ b/src/proto2/map-user.hpp @@ -1,5 +1,4 @@ -#ifndef TMWA_PROTO2_MAP_USER_HPP -#define TMWA_PROTO2_MAP_USER_HPP +#pragma once // map-user.hpp - TMWA network protocol: map/user // // Copyright © 2014 Ben Longbons @@ -21,9 +20,9 @@ // This is a generated file, edit tools/protocol.py instead -# include "fwd.hpp" +#include "fwd.hpp" -# include "types.hpp" +#include "types.hpp" namespace tmwa { @@ -7930,5 +7929,3 @@ bool network_to_native(Packet_Fixed<0x0212> *native, NetPacket_Fixed<0x0212> net } } // namespace tmwa - -#endif // TMWA_PROTO2_MAP_USER_HPP diff --git a/src/proto2/types.hpp b/src/proto2/types.hpp index bd13114..c6581d8 100644 --- a/src/proto2/types.hpp +++ b/src/proto2/types.hpp @@ -1,5 +1,4 @@ -#ifndef TMWA_PROTO2_TYPES_HPP -#define TMWA_PROTO2_TYPES_HPP +#pragma once // proto2/types.hpp - Forward declarations of packet component types // // Copyright © 2014 Ben Longbons @@ -19,27 +18,27 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -# include "fwd.hpp" +#include "fwd.hpp" -# include "../generic/array.hpp" -# include "../mmo/consts.hpp" +#include "../generic/array.hpp" +#include "../mmo/consts.hpp" //TODO split the includes -# include -# include "../ints/little.hpp" -# include "../strings/vstring.hpp" -# include "../net/ip.hpp" -# include "../net/timer.t.hpp" -# include "../mmo/consts.hpp" -# include "../mmo/enums.hpp" -# include "../mmo/human_time_diff.hpp" -# include "../mmo/ids.hpp" -# include "../mmo/strs.hpp" -# include "../mmo/utils.hpp" -# include "../mmo/version.hpp" -# include "../login/login.t.hpp" -# include "../map/clif.t.hpp" -# include "../map/skill.t.hpp" +#include +#include "../ints/little.hpp" +#include "../strings/vstring.hpp" +#include "../net/ip.hpp" +#include "../net/timer.t.hpp" +#include "../mmo/consts.hpp" +#include "../mmo/enums.hpp" +#include "../mmo/human_time_diff.hpp" +#include "../mmo/ids.hpp" +#include "../mmo/strs.hpp" +#include "../mmo/utils.hpp" +#include "../mmo/version.hpp" +#include "../login/login.t.hpp" +#include "../map/clif.t.hpp" +#include "../map/skill.t.hpp" namespace tmwa { @@ -1420,5 +1419,3 @@ bool network_to_native(Storage *native, NetStorage network) } } // namespace tmwa - -#endif // TMWA_PROTO2_TYPES_HPP -- cgit v1.2.3-60-g2f50