Refactor Player::golem()

diasurgical · Mar 12, 2024 · 40a6c25 · 40a6c25
1 parent 5d933d7
commit 40a6c25
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Source/player.cpp b/Source/player.cpp
@@ -2096,9 +2096,9 @@ bool Player::isLevelOwnedByLocalClient() const
 	return false;
 }
 
-Monster *Player::golem() const
+Monster &Player::golem() const
 {
-	return &Monsters[getId()];
+	return Monsters[getId()];
 }
 
 Player *PlayerAtPosition(Point position, bool ignoreMovingPlayers /*= false*/)

diff --git a/Source/player.h b/Source/player.h
@@ -895,7 +895,7 @@ struct Player {
 	/** @brief Checks if the player level is owned by local client. */
 	bool isLevelOwnedByLocalClient() const;
 
-	Monster *golem() const;
+	Monster &golem() const;
 };
 
 extern DVL_API_FOR_TEST uint8_t MyPlayerId;

diff --git a/Source/spells.cpp b/Source/spells.cpp
@@ -148,9 +148,9 @@ int GetManaAmount(const Player &player, SpellID sn)
 void ConsumeSpell(Player &player, SpellID sn)
 {
 	if (sn == SpellID::Golem && &player == MyPlayer) {
-		Monster *golem = player.golem();
+		Monster &golem = player.golem();
 
-		if (golem->hitPoints <= 0)
+		if (golem.hitPoints <= 0)
 			return;
 	}
 	switch (player.executedSpell.spellType) {