summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2008-01-23 22:56:43 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2008-01-23 22:56:43 +0000
commitff6dc70fc1a23562fbaf675ba252f7710451e417 (patch)
tree509bde0e44bbf67e178ca9a12a9265b4f1916f31
parent553c82854a643a3c158f1e467d21411d444f4801 (diff)
downloadmanaserv-ff6dc70fc1a23562fbaf675ba252f7710451e417.tar.gz
manaserv-ff6dc70fc1a23562fbaf675ba252f7710451e417.tar.bz2
manaserv-ff6dc70fc1a23562fbaf675ba252f7710451e417.tar.xz
manaserv-ff6dc70fc1a23562fbaf675ba252f7710451e417.zip
Made the gameserver work more and complain less about not having enough time.
-rw-r--r--ChangeLog2
-rw-r--r--src/game-server/main-game.cpp12
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c9f27e07..c292d400 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2008-01-23 Philipp Sehmisch <tmw@crushnet.org>
* src/game-server/being.cpp: Fixed "immortal monster" bug.
+ * src/game-server/main-game.cpp: Made the gameserver work more and
+ complain less about not having enough time.
2008-01-10 Philipp Sehmisch <tmw@crushnet.org>
diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp
index b84bcd53..4694e4b2 100644
--- a/src/game-server/main-game.cpp
+++ b/src/game-server/main-game.cpp
@@ -287,13 +287,14 @@ int main(int argc, char *argv[])
while (running) {
elapsedWorldTicks = worldTimer.poll();
- if (elapsedWorldTicks > 0) {
+ if (elapsedWorldTicks > 0)
+ {
worldTime += elapsedWorldTicks;
if (elapsedWorldTicks > 1)
{
- LOG_WARN(elapsedWorldTicks -1 << " World Tick(s) skipped "
- "because of insufficient time. Please buy a faster "
+ LOG_WARN("Not enough time to calculate "<< elapsedWorldTicks -1
+ << " World Tick(s) - skipping. Please buy a faster "
"machine ;-)");
};
@@ -311,7 +312,10 @@ int main(int argc, char *argv[])
// Send potentially urgent outgoing messages
gameHandler->flush();
}
- worldTimer.sleep();
+ else
+ {
+ worldTimer.sleep();
+ }
}
LOG_INFO("Received: Quit signal, closing down...");