aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorraczman <none@none>2009-04-14 15:41:59 +0200
committerraczman <none@none>2009-04-14 15:41:59 +0200
commitf4287650651bc28832b50148b4c1d1d0ac0d6cb3 (patch)
tree09ad77865563452ee9c3a1d2bcc0d8e92d9ce89e /src
parent408bb461b35e102036d2006925c69bb3e11db0a5 (diff)
Fix build on windows.
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Creature.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 493f505e327..db64c07fa23 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -422,7 +422,7 @@ void Creature::Update(uint32 diff)
if(targetGuid == m_DBTableGuid) // if linking self, never respawn (check delayed to next day)
SetRespawnTime(DAY);
else
- m_respawnTime = MAX(time(NULL),GetLinkedCreatureRespawnTime())+urand(5,MINUTE); // else copy time from master and add a little
+ m_respawnTime = (time(NULL)>GetLinkedCreatureRespawnTime()? time(NULL):GetLinkedCreatureRespawnTime())+urand(5,MINUTE); // else copy time from master and add a little
SaveRespawnTime(); // also save to DB immediately
}
else