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/mmo/consts.hpp | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'src/mmo/consts.hpp') diff --git a/src/mmo/consts.hpp b/src/mmo/consts.hpp index 0fdd7de..2a20cff 100644 --- a/src/mmo/consts.hpp +++ b/src/mmo/consts.hpp @@ -1,5 +1,4 @@ -#ifndef TMWA_MMO_CONSTS_HPP -#define TMWA_MMO_CONSTS_HPP +#pragma once // consts.hpp - Huge mess of constants. // // Copyright © ????-2004 Athena Dev Teams @@ -21,12 +20,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -# include "fwd.hpp" +#include "fwd.hpp" -# include "../net/timer.t.hpp" +#include "../net/timer.t.hpp" -# include "ids.hpp" -# include "strs.hpp" +#include "ids.hpp" +#include "strs.hpp" namespace tmwa @@ -48,12 +47,12 @@ constexpr interval_t MAX_WALK_SPEED = std::chrono::seconds(1); constexpr int MAX_STORAGE = 300; constexpr int MAX_PARTY = 12; -# define MIN_HAIR_STYLE battle_config.min_hair_style -# define MAX_HAIR_STYLE battle_config.max_hair_style -# define MIN_HAIR_COLOR battle_config.min_hair_color -# define MAX_HAIR_COLOR battle_config.max_hair_color -# define MIN_CLOTH_COLOR battle_config.min_cloth_color -# define MAX_CLOTH_COLOR battle_config.max_cloth_color +#define MIN_HAIR_STYLE battle_config.min_hair_style +#define MAX_HAIR_STYLE battle_config.max_hair_style +#define MIN_HAIR_COLOR battle_config.min_hair_color +#define MAX_HAIR_COLOR battle_config.max_hair_color +#define MIN_CLOTH_COLOR battle_config.min_cloth_color +#define MAX_CLOTH_COLOR battle_config.max_cloth_color // WTF is this doing here? struct PartyMember @@ -65,5 +64,3 @@ struct PartyMember struct map_session_data *sd; }; } // namespace tmwa - -#endif // TMWA_MMO_CONSTS_HPP -- cgit v1.2.3-70-g09d2