summaryrefslogtreecommitdiff
path: root/src/game-server
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2008-10-22 12:19:59 +0000
committerDavid Athay <ko2fan@gmail.com>2008-10-22 12:19:59 +0000
commitf598952da95395759d6725bfa5778a66695f1d73 (patch)
tree850c42e4611decf0aea7479c89b78be2abde6d86 /src/game-server
parenta9ba502b2856b4125ffc99cafee429c00a7ea958 (diff)
downloadmanaserv-f598952da95395759d6725bfa5778a66695f1d73.tar.gz
manaserv-f598952da95395759d6725bfa5778a66695f1d73.tar.bz2
manaserv-f598952da95395759d6725bfa5778a66695f1d73.tar.xz
manaserv-f598952da95395759d6725bfa5778a66695f1d73.zip
Fixed NPC id bug. Changed time between server reconnection attempts.
Diffstat (limited to 'src/game-server')
-rw-r--r--src/game-server/main-game.cpp5
-rw-r--r--src/game-server/mapcomposite.cpp2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp
index 898bcb8d..c7105cc6 100644
--- a/src/game-server/main-game.cpp
+++ b/src/game-server/main-game.cpp
@@ -321,7 +321,10 @@ int main(int argc, char *argv[])
}
else
{
- accountHandler->start();
+ if (worldTime % 200 == 0)
+ {
+ accountHandler->start();
+ }
}
gameHandler->process();
// Update all active objects/beings
diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp
index eeb65a10..995f4431 100644
--- a/src/game-server/mapcomposite.cpp
+++ b/src/game-server/mapcomposite.cpp
@@ -361,7 +361,7 @@ void ObjectIterator::operator++()
}
ObjectBucket::ObjectBucket()
- : free(256), next_object(0)
+ : free(256), next_object(1)
{
for (unsigned i = 0; i < 256 / int_bitsize; ++i)
{