summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-08-09 21:42:52 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-08-26 22:56:47 +0200
commitff7b47229238738f92125e84d30d4e35efb362c8 (patch)
tree9d88937e869c4e047c0476e08c81d34e04bf3c9b /src
parentba573fcc38580a01985172b9bc864c97ce855af3 (diff)
downloadmanaserv-ff7b47229238738f92125e84d30d4e35efb362c8.tar.gz
manaserv-ff7b47229238738f92125e84d30d4e35efb362c8.tar.bz2
manaserv-ff7b47229238738f92125e84d30d4e35efb362c8.tar.xz
manaserv-ff7b47229238738f92125e84d30d4e35efb362c8.zip
Use '/' as seperator for ability categories rather than '_'
I find this a lot more readable.
Diffstat (limited to 'src')
-rw-r--r--src/game-server/abilitymanager.cpp6
-rw-r--r--src/scripting/lua.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/game-server/abilitymanager.cpp b/src/game-server/abilitymanager.cpp
index f6367933..b03c0828 100644
--- a/src/game-server/abilitymanager.cpp
+++ b/src/game-server/abilitymanager.cpp
@@ -106,7 +106,7 @@ void AbilityManager::readAbilityNode(xmlNodePtr abilityNode,
mAbilitiesInfo[newInfo->id] = newInfo;
- std::string keyName = categoryName + "_" + newInfo->name;
+ std::string keyName = categoryName + "/" + newInfo->name;
mNamedAbilitiesInfo[keyName] = newInfo;
}
@@ -134,7 +134,7 @@ void AbilityManager::clear()
unsigned AbilityManager::getId(const std::string &category,
const std::string &name) const
{
- std::string key = utils::toLower(category) + "_" + utils::toLower(name);
+ std::string key = utils::toLower(category) + "/" + utils::toLower(name);
return getId(key);
}
@@ -168,7 +168,7 @@ AbilityManager::AbilityInfo *AbilityManager::getAbilityInfo(
const std::string &category,
const std::string &name) const
{
- std::string key = utils::toLower(category) + "_" + utils::toLower(name);
+ std::string key = utils::toLower(category) + "/" + utils::toLower(name);
return getAbilityInfo(key);
}
diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp
index f22309f7..c8c9e17c 100644
--- a/src/scripting/lua.cpp
+++ b/src/scripting/lua.cpp
@@ -1285,7 +1285,7 @@ static int chr_set_quest(lua_State *s)
* Sets the amout of ticks that a ability needs to cooldown.
*
* **Note:** When passing the `abilitynam` as parameter make sure that it is
- * formatted in this way: &lt;setname&gt;_&lt;abilityname&gt; (for eg. "Magic_Healingspell").
+ * formatted in this way: &lt;setname&gt;/&lt;abilityname&gt; (for eg. "Magic_Healingspell").
*/
static int entity_set_ability_cooldown(lua_State *s)
{
@@ -1303,7 +1303,7 @@ static int entity_set_ability_cooldown(lua_State *s)
* **Return value:** The remaining time of the ability cooldown.
*
* **Note:** When passing the `abilityname` as parameter make sure that it is
- * formatted in this way: &lt;setname&gt;_&lt;abilityname&gt; (for eg. "Magic_Healingspell").
+ * formatted in this way: &lt;setname&gt;/&lt;abilityname&gt; (for eg. "Magic_Healingspell").
*/
static int entity_get_ability_cooldown(lua_State *s)
{
@@ -2847,7 +2847,7 @@ static int get_distance(lua_State *s)
* See below for usage of that object.
*
* **Note:** When passing the `abilityName` as parameter make sure that it is
- * formatted in this way: &lt;setname&gt;_&lt;abilityname&gt; (for eg. "Magic_Healingspell").
+ * formatted in this way: &lt;setname&gt;/&lt;abilityname&gt; (for eg. "Magic_Healingspell").
*/
static int get_ability_info(lua_State *s)
{