diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/object.h | 4 | ||||
-rw-r--r-- | src/skill.cpp | 8 | ||||
-rw-r--r-- | src/skill.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/object.h b/src/object.h index a3031598..8a8a4d2a 100644 --- a/src/object.h +++ b/src/object.h @@ -49,7 +49,7 @@ class Object int x; int y; public: - ~Object() { } + virtual ~Object() { } virtual void update() = 0; }; @@ -91,7 +91,7 @@ class Being : public Object #endif public: - ~Being() { } //empty definition + virtual ~Being() { } //empty definition //update void update() { diff --git a/src/skill.cpp b/src/skill.cpp index 752d1df9..56076411 100644 --- a/src/skill.cpp +++ b/src/skill.cpp @@ -34,7 +34,7 @@ Skill::Skill(const std::string &ident) : Skill::~Skill() { //cleanup - for (int i = 0; i < children.size(); i++) { + for (unsigned int i = 0; i < children.size(); i++) { if (children[i]) delete children[i]; } @@ -47,7 +47,7 @@ bool Skill::addSkill(const std::string &ident, Skill *skill) { return true; } - for (int i = 0; i < children.size(); i++) { + for (unsigned int i = 0; i < children.size(); i++) { //recurse if (children[i]->addSkill(ident, skill)) return true; @@ -62,10 +62,12 @@ bool Skill::useSkill() { #else logger->log("Error: Skill: Could not use skill; scripting disabled."); #endif + return true; } bool Skill::setScript(const std::string &scriptName) { + return true; } bool Skill::deleteSkill(const std::string &ident, bool delTree) { @@ -75,7 +77,7 @@ bool Skill::deleteSkill(const std::string &ident, bool delTree) { return false; } - for (int i = 0; i < children.size(); i++) { + for (unsigned int i = 0; i < children.size(); i++) { if (children[i]->id == ident) { if (children[i]->children.size() > 0 && delTree) return false; diff --git a/src/skill.h b/src/skill.h index 305d4e19..cfaeae8e 100644 --- a/src/skill.h +++ b/src/skill.h @@ -98,7 +98,7 @@ class Skill */ void printTree(const std::string &indent) { std::cerr << indent << id << std::endl; - for (int i = 0; i < children.size(); i++) { + for (unsigned int i = 0; i < children.size(); i++) { children[i]->printTree(indent + " "); } } |