resolved one error and one segfault in xpp02

cpp_module_01/Warlock.hpp

@@ -1,15 +1,15 @@
 #ifndef WARLOCK_HPP
-# define WARLOCK_HPP
+#define WARLOCK_HPP
 
-# include <iostream>
-# include <string>
-# include <map>
+#include <iostream>
+#include <string>
+#include <map>
 
-# include "ASpell.hpp"
-# include "ATarget.hpp"
-
-class Warlock {
+#include "ASpell.hpp"
+#include "ATarget.hpp"
 
+class Warlock
+{
 	private:
 		Warlock();
 		Warlock(Warlock const & other);
@@ -17,71 +17,73 @@ class Warlock {
 
 		std::string name;
 		std::string title;
-		std::map<std::string, ASpell *> arr;
+		std::map<std::string, ASpell*> arr;
 
 	public:
 		Warlock(std::string const & name, std::string const & title)
 		{
 			this->name = name;
-			this->title = title;
+		  this->title = title;
 			std::cout << this->name << ": This looks like another boring day.\n";
-		};
+		}
 		~Warlock()
 		{
 			std::cout << this->name << ": My job here is done!\n";
-			std::map<std::string, ASpell *>::iterator it_begin = this->arr.begin();
-			std::map<std::string, ASpell *>::iterator it_end = this->arr.end();
-			while (it_begin != it_end) {
-				delete it_begin->second;
-				++it_begin;
-			}
+
+			std::map<std::string, ASpell*>::iterator it;
+
+			for (it = arr.begin(); it != arr.end(); ++it)
+				delete it->second;
+
 			this->arr.clear();
-		};
+		}
 
 		std::string const & getName() const
 		{
-			return (this->name);
-		};
+			return this->name;
+		}
 		std::string const & getTitle() const
 		{
-			return (this->title);
-		};
+			return this->title;
+		}
 
 		void setTitle(std::string const & title)
 		{
 			this->title = title;
-		};
+		}
 
 		void introduce() const
 		{
 			std::cout << this->name << ": I am " << this->name << ", " << this->title << "!\n";
-		};
+		}
 
 		void learnSpell(ASpell * aspell)
 		{
 			if (aspell)
 			{
-				arr.insert(std::pair<std::string, ASpell *>
+				arr.insert(std::pair<std::string, ASpell*>
 				(
 					aspell->getName(),
 					aspell->clone()
 				));
 			}
-		};
-		void forgetSpell(std::string name)
+		}
+		void forgetSpell(std::string spell_name)
 		{
-			std::map<std::string, ASpell *>::iterator it = arr.find(name);
-			if (it == arr.end())
-				return;
-			delete it->second;
-			arr.erase(name);
-		};
-		void launchSpell(std::string name, ATarget const & target)
-		{
-			ASpell * spell = arr[name];
+			ASpell * spell = arr[spell_name];
 			if (spell)
-				spell->launch(target);
-		};
+			{
+				delete spell;
+				arr.erase(spell_name);
+			}
+		}
+		void launchSpell(std::string spell_name, ATarget const & atarget)
+		{
+			ASpell * spell = arr[spell_name];
+			if (spell)
+				spell->launch(atarget);
+		}
 };
 
 #endif
+