Update Property.cc

ivan2001kkk · web-flow · commit 7c2889afd798 · 2020-08-15T17:14:37.000-04:00
diff --git a/Property.cc b/Property.cc
@@ -45,7 +45,7 @@ void Gym::accept(Player & p) {
     if (this->getOwner() == nullptr) {
         throw NoOwner("This property has no owner yet!");
     }
-    if (this->getOwner()->getName() != p.getName() && !mortgage) {
+    if (this->getOwner()->getName() != p.getName() && !Mortgage()) {
         unsigned int fee = getFee(p);
         p.giveMoney(this->getOwner(), fee);
     }
@@ -74,7 +74,7 @@ void Residence::accept(Player & p) {
     if (this->getOwner() == nullptr) {
         throw NoOwner("This property has no owner yet!");
     }
-    if (this->getOwner()->getName() != p.getName() && !mortgage) {
+    if (this->getOwner()->getName() != p.getName() && !Mortgage()) {
         unsigned int rent = getRent();
         p.giveMoney(this->getOwner(), rent);
     }
@@ -120,7 +120,7 @@ void Academic::accept(Player & p) {
     if (this->getOwner() == nullptr) {
         throw NoOwner("This property has no owner yet!");
     }
-    if (this->getOwner()->getName() != p.getName() && !mortgage) {
+    if (this->getOwner()->getName() != p.getName() && !Mortgage()) {
         unsigned int tuition = getTuition();
         p.giveMoney(this->getOwner(), tuition);
     }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ void Gym::accept(Player & p) {`
`45`	`45`	`if (this->getOwner() == nullptr) {`
`46`	`46`	`throw NoOwner("This property has no owner yet!");`
`47`	`47`	`}`
`48`		`- if (this->getOwner()->getName() != p.getName() && !mortgage) {`
	`48`	`+ if (this->getOwner()->getName() != p.getName() && !Mortgage()) {`
`49`	`49`	`unsigned int fee = getFee(p);`
`50`	`50`	`p.giveMoney(this->getOwner(), fee);`
`51`	`51`	`}`
`@@ -74,7 +74,7 @@ void Residence::accept(Player & p) {`
`74`	`74`	`if (this->getOwner() == nullptr) {`
`75`	`75`	`throw NoOwner("This property has no owner yet!");`
`76`	`76`	`}`
`77`		`- if (this->getOwner()->getName() != p.getName() && !mortgage) {`
	`77`	`+ if (this->getOwner()->getName() != p.getName() && !Mortgage()) {`
`78`	`78`	`unsigned int rent = getRent();`
`79`	`79`	`p.giveMoney(this->getOwner(), rent);`
`80`	`80`	`}`
`@@ -120,7 +120,7 @@ void Academic::accept(Player & p) {`
`120`	`120`	`if (this->getOwner() == nullptr) {`
`121`	`121`	`throw NoOwner("This property has no owner yet!");`
`122`	`122`	`}`
`123`		`- if (this->getOwner()->getName() != p.getName() && !mortgage) {`
	`123`	`+ if (this->getOwner()->getName() != p.getName() && !Mortgage()) {`
`124`	`124`	`unsigned int tuition = getTuition();`
`125`	`125`	`p.giveMoney(this->getOwner(), tuition);`
`126`	`126`	`}`