diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2020-11-12 10:54:47 +0100 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2020-11-12 10:54:47 +0100 |
| commit | 96dcf214a8c40529b251ea31ef037868583dd1da (patch) | |
| tree | ecbb74fd1982829b550f5b5f5451497245db1358 /cpp03/ex04/NinjaTrap.hpp | |
| parent | 2e0cf63a219d24ef07412deca9b0e6cb02882b46 (diff) | |
| download | piscine_cpp-96dcf214a8c40529b251ea31ef037868583dd1da.tar.gz piscine_cpp-96dcf214a8c40529b251ea31ef037868583dd1da.tar.bz2 piscine_cpp-96dcf214a8c40529b251ea31ef037868583dd1da.zip | |
Fixing cpp03, moved more common logic in ClapTrap, Added better main
Diffstat (limited to 'cpp03/ex04/NinjaTrap.hpp')
| -rw-r--r-- | cpp03/ex04/NinjaTrap.hpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp03/ex04/NinjaTrap.hpp b/cpp03/ex04/NinjaTrap.hpp index d075dba..86aa4f3 100644 --- a/cpp03/ex04/NinjaTrap.hpp +++ b/cpp03/ex04/NinjaTrap.hpp @@ -6,7 +6,7 @@ /* By: charles <charles.cabergs@gmail.com> +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2020/04/13 17:31:24 by charles #+# #+# */ -/* Updated: 2020/11/10 14:43:01 by cacharle ### ########.fr */ +/* Updated: 2020/11/12 08:54:34 by cacharle ### ########.fr */ /* */ /* ************************************************************************** */ @@ -17,10 +17,9 @@ # include "FragTrap.hpp" # include "ScavTrap.hpp" -class NinjaTrap : public ClapTrap +class NinjaTrap : virtual public ClapTrap { public: - NinjaTrap(); NinjaTrap(std::string const& name); NinjaTrap(NinjaTrap const& other); NinjaTrap& operator=(NinjaTrap const& other); @@ -30,6 +29,9 @@ public: void ninjaShoebox(FragTrap const& target); void ninjaShoebox(ScavTrap const& target); void ninjaShoebox(ClapTrap const& target); + +protected: + NinjaTrap(); }; #endif |