diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-11 21:55:13 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-11 23:27:33 -0700 |
| commit | 8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13 (patch) | |
| tree | 15e8a4841af992e17794f26fc7991ed40c35bd51 /src/map/skill.hpp | |
| parent | 8c6072df499ef9068346fbe8313b63dbba1e4e82 (diff) | |
| download | tmwa-8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13.tar.gz tmwa-8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13.tar.bz2 tmwa-8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13.tar.xz tmwa-8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13.zip | |
Allegedly remove all manual memory management
Diffstat (limited to 'src/map/skill.hpp')
| -rw-r--r-- | src/map/skill.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/skill.hpp b/src/map/skill.hpp index ec354e2..42caf0b 100644 --- a/src/map/skill.hpp +++ b/src/map/skill.hpp @@ -33,8 +33,8 @@ extern earray<struct skill_db, SkillID, SkillID::MAX_SKILL_DB> skill_db; struct skill_name_db { SkillID id; // skill id - const char *name; // search strings - const char *desc; // description that shows up for search's + std::string name; // search strings + std::string desc; // description that shows up for searches }; // used only by @skillid for iteration - should be depublicized @@ -122,7 +122,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 char *skill_name(SkillID skill) +const std::string& skill_name(SkillID skill) { return skill_lookup_by_id(skill).desc; } |