fix cpp03

Author: MarJC5

CPP_03/ex00/srcs/ClapTrap.cpp

@@ -6,7 +6,7 @@
 /*   By: jmartin <jmartin@student.42lausanne.ch>    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/11/08 15:21:31 by jmartin           #+#    #+#             */
-/*   Updated: 2022/11/08 15:21:32 by jmartin          ###   ########.fr       */
+/*   Updated: 2022/11/24 10:29:57 by jmartin          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -98,7 +98,7 @@ void    ClapTrap::takeDamage(unsigned int amount) {
 }
 
 void    ClapTrap::beRepaired(unsigned int amount) {
-	if (energyCost() == 0) {
+	if (this->getEnergyPoints() == 0) {
 		std::cout << this->getName()
 		          << " has no energy left."
 		          << std::endl;
@@ -116,6 +116,7 @@ void    ClapTrap::beRepaired(unsigned int amount) {
 		          << std::endl;
 		return ;
 	}
+	energyCost();
 	this->setHitPoints(this->getHitPoints() + amount);
 	std::cout << this->getName()
 	          << " is repaired by "

CPP_03/ex03/srcs/DiamondTrap.cpp

@@ -6,7 +6,7 @@
 /*   By: jmartin <jmartin@student.42lausanne.ch>    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/11/08 15:21:56 by jmartin           #+#    #+#             */
-/*   Updated: 2022/11/08 15:21:56 by jmartin          ###   ########.fr       */
+/*   Updated: 2022/11/24 10:41:31 by jmartin          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,9 +16,10 @@
  * CONSTRUCTORS / DESTRUCTORS
  */
 
-DiamondTrap::DiamondTrap(std::string name) : ClapTrap(name + "_clap_name"), ScavTrap(name), FragTrap(name)
+DiamondTrap::DiamondTrap(std::string name) : ScavTrap(name), FragTrap(name)
 {
 	this->_name = name;
+	this->ClapTrap::_name = name + "_clap_name";
 	this->setHitPoints(FragTrap::hitPointsInit);
 	this->setEnergyPoints(ScavTrap::energyPointsInit);
 	this->setAttackDamage(FragTrap::attackDamageInit);
@@ -29,7 +30,7 @@ DiamondTrap::DiamondTrap(std::string name) : ClapTrap(name + "_clap_name"), Scav
 	return ;
 }
 
-DiamondTrap::DiamondTrap(DiamondTrap const &instance) : ClapTrap(instance), ScavTrap(instance), FragTrap(instance)
+DiamondTrap::DiamondTrap(DiamondTrap const &instance) : ScavTrap(instance), FragTrap(instance)
 {
 	this->setName(instance.getName());
 	std::cout << "DiamondTrap"

CPP_06/ex02/srcs/main.cpp

@@ -6,7 +6,7 @@
 /*   By: jmartin <jmartin@student.42lausanne.ch>    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/11/08 15:22:42 by jmartin           #+#    #+#             */
-/*   Updated: 2022/11/08 15:22:42 by jmartin          ###   ########.fr       */
+/*   Updated: 2022/11/24 09:46:23 by jmartin          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -50,13 +50,14 @@ void    identify(Base* p)
 {
 	std::cout << "Identify by pointer: \n" << GREEN;
 
-	if (dynamic_cast<A*>(p))
-		std::cout << "A" << std::endl;
-	else if (dynamic_cast<B*>(p))
-		std::cout << "B" << std::endl;
-	else if (dynamic_cast<C*>(p))
-		std::cout << "C" << std::endl;
-	std::cout << NC << std::endl;
+	if (dynamic_cast<A*>(p) != NULL)
+		std::cout << "A" << NC << std::endl;
+	else if (dynamic_cast<B*>(p) != NULL)
+		std::cout << "B" << NC << std::endl;
+	else if (dynamic_cast<C*>(p) != NULL)
+		std::cout << "C" << NC << std::endl;
+	else
+		std::cerr << RED << "Error type" << NC << std::endl;
 }
 
 /*
@@ -72,7 +73,7 @@ void    identify(Base& p)
 		std::cout << GREEN << "A" << NC << std::endl;
 	}
 	catch (std::exception &e) {
-		std::cout << RED << "A" << NC << std::endl;
+		std::cerr << RED << "A" << NC << std::endl;
 	}
 
 	try {
@@ -81,7 +82,7 @@ void    identify(Base& p)
 		std::cout << GREEN << "B" << NC << std::endl;
 	}
 	catch (std::exception &e) {
-		std::cout << RED << "B" << NC << std::endl;
+		std::cerr << RED << "B" << NC << std::endl;
 	}
 
 	try {
@@ -90,7 +91,7 @@ void    identify(Base& p)
 		std::cout << GREEN << "C" << NC << std::endl;
 	}
 	catch (std::exception &e) {
-		std::cout << RED << "C" << NC << std::endl;
+		std::cerr << RED << "C" << NC << std::endl;
 	}
 }