From 83b2e0b3ceda907b7186acfcc56c214fc04d9c13 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 7 Feb 2013 19:38:32 -0800 Subject: Remove some macros --- src/map/skill.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/map/skill.hpp') diff --git a/src/map/skill.hpp b/src/map/skill.hpp index 7ecdd37..9fb95a2 100644 --- a/src/map/skill.hpp +++ b/src/map/skill.hpp @@ -5,9 +5,9 @@ #include "map.hpp" -#define MAX_SKILL_PRODUCE_DB 150 -#define MAX_SKILL_ARROW_DB 150 -#define MAX_SKILL_ABRA_DB 350 +constexpr int MAX_SKILL_PRODUCE_DB = 150; +constexpr int MAX_SKILL_ARROW_DB = 150; +constexpr int MAX_SKILL_ABRA_DB = 350; // スキルデータベース struct skill_db @@ -29,7 +29,7 @@ struct skill_db int itemid[10], amount[10]; int castnodex[MAX_SKILL_LEVEL]; }; -extern earray skill_db; +extern earray skill_db; struct skill_name_db { @@ -105,9 +105,9 @@ void skill_reload(void); // [Fate] Skill pools API // Max. # of active entries in the skill pool -#define MAX_SKILL_POOL 3 +constexpr int MAX_SKILL_POOL = 3; // Max. # of skills that may be classified as pool skills in db/skill_db.txt -#define MAX_POOL_SKILLS 128 +constexpr int MAX_POOL_SKILLS = 128; extern SkillID skill_pool_skills[MAX_POOL_SKILLS]; // All pool skills extern int skill_pool_skills_size; // Number of entries in skill_pool_skills -- cgit v1.2.3-70-g09d2