summaryrefslogtreecommitdiff
path: root/src/map/skill.hpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-02-08 15:09:25 -0800
committerBen Longbons <b.r.longbons@gmail.com>2014-02-08 16:18:22 -0800
commit730e5dde39333cb2f63c72a7d7152bee5c4dbb05 (patch)
tree510ef3e0ad46ecf1f2bee1fa42f26e6377b51686 /src/map/skill.hpp
parent7a15a3efe85837d52d950cc9f895eadcc9eb6be1 (diff)
downloadtmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.tar.gz
tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.tar.bz2
tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.tar.xz
tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.zip
Implement AString
Diffstat (limited to 'src/map/skill.hpp')
-rw-r--r--src/map/skill.hpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/map/skill.hpp b/src/map/skill.hpp
index 5f29443..e8f36ab 100644
--- a/src/map/skill.hpp
+++ b/src/map/skill.hpp
@@ -5,7 +5,8 @@
# include "skill-pools.hpp"
# include "../strings/fwd.hpp"
-# include "../strings/fstring.hpp"
+# include "../strings/rstring.hpp"
+# include "../strings/astring.hpp"
# include "map.hpp"
@@ -39,11 +40,11 @@ earray<skill_db_, SkillID, SkillID::MAX_SKILL_DB> skill_db;
struct skill_name_db
{
SkillID id; // skill id
- FString name; // search strings
- FString desc; // description that shows up for searches
+ RString name; // search strings
+ RString desc; // description that shows up for searches
// this makes const char(&)[] not decay into const char * in {}
- skill_name_db(SkillID i, FString n, FString d)
+ skill_name_db(SkillID i, RString n, RString d)
: id(i), name(n), desc(d)
{}
};
@@ -129,7 +130,7 @@ bool skill_pool_is_activated(dumb_ptr<map_session_data> sd, SkillID skill);
int skill_pool_deactivate(dumb_ptr<map_session_data> sd, SkillID skill);
// Yield configurable skill name
inline
-const FString& skill_name(SkillID skill)
+const RString& skill_name(SkillID skill)
{
return skill_lookup_by_id(skill).desc;
}