Fix nullptr check

otland · Oct 24, 2024 · 29d7f70 · 29d7f70
1 parent 88f1b7a
commit 29d7f70
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/src/combat.cpp b/src/combat.cpp
@@ -1368,8 +1368,10 @@ void MagicField::onStepInField(Creature* creature)
 			bool harmfulField = true;
 
 			if (g_game.getWorldType() == WORLD_TYPE_NO_PVP || getTile()->hasFlag(TILESTATE_NOPVPZONE)) {
-				if (Creature* owner = g_game.getCreatureByID(ownerId); owner->hasPlayerOwned()) {
-					harmfulField = false;
+				if (Creature* owner = g_game.getCreatureByID(ownerId)) {
+					if (owner->hasPlayerOwned()) {
+						harmfulField = false;
+					}
 				}
 			}
 

diff --git a/src/creature.cpp b/src/creature.cpp
@@ -1463,8 +1463,8 @@ int64_t Creature::getStepDuration() const
 	double duration = std::floor(1000 * groundSpeed / calculatedStepSpeed);
 	int64_t stepDuration = std::ceil(duration / 50) * 50;
 
-	if (const Monster* monster = getMonster(); monster->isTargetNearby()) {
-		if (!monster->isFleeing()) {
+	if (const Monster* monster = getMonster()) {
+		if (monster->isTargetNearby() && !monster->isFleeing()) {
 			stepDuration *= 2;
 		}
 	}

diff --git a/src/monster.cpp b/src/monster.cpp
@@ -446,8 +446,10 @@ bool Monster::isOpponent(const Creature* creature) const
 		return true;
 	}
 
-	if (const Player* player = creature->getPlayer(); !player->hasFlag(PlayerFlag_IgnoredByMonsters)) {
-		return true;
+	if (const Player* player = creature->getPlayer()) {
+		if (!player->hasFlag(PlayerFlag_IgnoredByMonsters)) {
+			return true;
+		}
 	}
 
 	if (creature->isPlayerSummon()) {

diff --git a/src/player.cpp b/src/player.cpp
@@ -3690,9 +3690,11 @@ void Player::onAttackedCreatureDrainHealth(Creature* target, int32_t points)
 
 	if (party && target) {
 		if (!target->hasPlayerOwned()) {
-			if (const Monster* monster = target->getMonster(); monster->isHostile()) {
-				// We have fulfilled a requirement for shared experience
-				party->updatePlayerTicks(this, points);
+			if (const Monster* monster = target->getMonster()) {
+				if (monster->isHostile()) {
+					// We have fulfilled a requirement for shared experience
+					party->updatePlayerTicks(this, points);
+				}
 			}
 		}
 	}

diff --git a/src/tile.cpp b/src/tile.cpp
@@ -505,8 +505,10 @@ ReturnValue Tile::queryAdd(int32_t, const Thing& thing, uint32_t, uint32_t flags
 				if (!creatures->empty()) {
 					if (monster->canPushCreatures() && !monster->isSummon()) {
 						for (Creature* tileCreature : *creatures) {
-							if (const Player* tilePlayer = tileCreature->getPlayer(); tilePlayer->isInGhostMode()) {
-								continue;
+							if (const Player* tilePlayer = tileCreature->getPlayer()) {
+								if (tilePlayer->isInGhostMode()) {
+									continue;
+								}
 							}
 
 							if (!tileCreature->isPushable()) {