From 96dcf214a8c40529b251ea31ef037868583dd1da Mon Sep 17 00:00:00 2001
From: Charles Cabergs <me@cacharle.xyz>
Date: Thu, 12 Nov 2020 10:54:47 +0100
Subject: Fixing cpp03, moved more common logic in ClapTrap, Added better main

---
 cpp03/ex04/ScavTrap.hpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'cpp03/ex04/ScavTrap.hpp')

diff --git a/cpp03/ex04/ScavTrap.hpp b/cpp03/ex04/ScavTrap.hpp
index e908722..32e8dd4 100644
--- a/cpp03/ex04/ScavTrap.hpp
+++ b/cpp03/ex04/ScavTrap.hpp
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/13 14:11:51 by charles           #+#    #+#             */
-/*   Updated: 2020/11/11 07:04:45 by cacharle         ###   ########.fr       */
+/*   Updated: 2020/11/12 09:18:43 by cacharle         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,18 +14,22 @@
 # define SCAVTRAP_HPP
 
 # include <cstdlib>
+# include <iostream>
+# include <string>
 # include "ClapTrap.hpp"
 
-class ScavTrap : virtual public ClapTrap
+class ScavTrap : public ClapTrap
 {
 public:
-    ScavTrap();
     ScavTrap(std::string const& name);
     ScavTrap(ScavTrap const& other);
     ScavTrap& operator=(ScavTrap const& other);
     ~ScavTrap();
 
     void challengeNewcomer(std::string const& target);
+
+private:
+    ScavTrap();
 };
 
 #endif
-- 
cgit