Add files via upload

2 files changed, 4 insertions, 2 deletions

diff --git a/Big4AndInheritance/Drinks/AlcoholDrink.cpp b/Big4AndInheritance/Drinks/AlcoholDrink.cpp
index 560d357..db3619c 100644
--- a/Big4AndInheritance/Drinks/AlcoholDrink.cpp
+++ b/Big4AndInheritance/Drinks/AlcoholDrink.cpp
@@ -1,4 +1,5 @@
-include "AlcoholDrink.h"

+#include "AlcoholDrink.h"

+

 

 

 AlcoholDrink::AlcoholDrink(const char* mark, int ml, int percentAlcohol) : Drink(mark,ml)

@@ -13,5 +14,5 @@ void AlcoholDrink::setAlcohol(int alcohol)
 }

 int AlcoholDrink::getAlcohol() const

 {

-	return alcohol;

+	return percentAlcohol;

 }

diff --git a/Big4AndInheritance/Drinks/AlcoholDrink.h b/Big4AndInheritance/Drinks/AlcoholDrink.h
index fdac1bd..a2b8021 100644
--- a/Big4AndInheritance/Drinks/AlcoholDrink.h
+++ b/Big4AndInheritance/Drinks/AlcoholDrink.h
@@ -8,4 +8,5 @@ private:
 public:

 	AlcoholDrink(const char* mark, int ml, int percentAlcohol);

 	void setAlcohol(int alcohol);

+	int AlcoholDrink::getAlcohol() const;

 };