diff options
author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-03-06 00:26:05 +0000 |
---|---|---|
committer | Björn Steinbrink <B.Steinbrink@gmx.de> | 2006-03-06 00:26:05 +0000 |
commit | 1941e274acd375ff70fd09a9d458755d2a82e66e (patch) | |
tree | 0c159d8d9da64267b7ca56397c775d256cc780e6 /src/skill.cpp | |
parent | 54fa93b126ce6f2ed5ec24b134fe367fa5bc5c87 (diff) | |
download | manaserv-1941e274acd375ff70fd09a9d458755d2a82e66e.tar.gz manaserv-1941e274acd375ff70fd09a9d458755d2a82e66e.tar.bz2 manaserv-1941e274acd375ff70fd09a9d458755d2a82e66e.tar.xz manaserv-1941e274acd375ff70fd09a9d458755d2a82e66e.zip |
Cleaned up unnecessary header dependencies and fixed some indentations.
Diffstat (limited to 'src/skill.cpp')
-rw-r--r-- | src/skill.cpp | 73 |
1 files changed, 38 insertions, 35 deletions
diff --git a/src/skill.cpp b/src/skill.cpp index fab74163..6990a348 100644 --- a/src/skill.cpp +++ b/src/skill.cpp @@ -20,48 +20,50 @@ * $Id$ */ - #include "skill.h" -#include "utils/logger.h" +#include "utils/logger.h" Skill::Skill(const std::string &ident) : - id(ident), - light(0.0), - dark(0.0) + id(ident), + light(0.0), + dark(0.0) { // } -Skill::~Skill() { +Skill::~Skill() +{ //cleanup for (unsigned int i = 0; i < children.size(); i++) { - if (children[i]) - delete children[i]; + if (children[i]) + delete children[i]; } } -bool Skill::addSkill(const std::string &ident, Skill *skill) { +bool Skill::addSkill(const std::string &ident, Skill *skill) +{ if (ident == id) { - //add skill to children - children.push_back(skill); - return true; + //add skill to children + children.push_back(skill); + return true; } for (unsigned int i = 0; i < children.size(); i++) { - //recurse - if (children[i]->addSkill(ident, skill)) - return true; + //recurse + if (children[i]->addSkill(ident, skill)) + return true; } return false; } -bool Skill::useSkill() { +bool Skill::useSkill() +{ #ifdef SCRIPT_SUPPORT //run skill script - LOG_ERROR("Skill: Skills not implemented.", 0) + LOG_ERROR("Skill: Skills not implemented.", 0); #else - LOG_ERROR("Skill: Could not use skill; scripting disabled.", 0) + LOG_ERROR("Skill: Could not use skill; scripting disabled.", 0); #endif return true; } @@ -71,30 +73,31 @@ bool Skill::setScript(const std::string &scriptName) return true; } -bool Skill::deleteSkill(const std::string &ident, bool delTree) { +bool Skill::deleteSkill(const std::string &ident, bool delTree) +{ //prevent deletion of self if (ident == id) { LOG_ERROR("Skill: Attempt to delete self.", 0) - return false; + return false; } for (unsigned int i = 0; i < children.size(); i++) { - if (children[i]->id == ident) { - if (children[i]->children.size() > 0 && delTree) - return false; - else { - //delete skill & remove from children - std::vector<Skill*>::iterator tmp = children.begin() + i; - delete children[i]; - children.erase(tmp); + if (children[i]->id == ident) { + if (children[i]->children.size() > 0 && delTree) + return false; + else { + //delete skill & remove from children + std::vector<Skill*>::iterator tmp = children.begin() + i; + delete children[i]; + children.erase(tmp); - return true; - } - } else { - //recurse - if (children[i]->deleteSkill(ident)) - return true; - } + return true; + } + } else { + //recurse + if (children[i]->deleteSkill(ident)) + return true; + } } return false; } |