summaryrefslogtreecommitdiff
path: root/src/game-server
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2008-04-16 16:01:28 +0000
committerDavid Athay <ko2fan@gmail.com>2008-04-16 16:01:28 +0000
commit401033859448e3706312192c9b6a85cf93b84a44 (patch)
tree067dd87ac4c97e9e9fc63b9fd0efc60644322791 /src/game-server
parent206191086403006db4472d849e9bcf3eaf7f15d0 (diff)
downloadmanaserv-401033859448e3706312192c9b6a85cf93b84a44.tar.gz
manaserv-401033859448e3706312192c9b6a85cf93b84a44.tar.bz2
manaserv-401033859448e3706312192c9b6a85cf93b84a44.tar.xz
manaserv-401033859448e3706312192c9b6a85cf93b84a44.zip
Added handling creating and leaving
parties. Fixed up some of the private channel stuff that remained.
Diffstat (limited to 'src/game-server')
-rw-r--r--src/game-server/gamehandler.cpp4
-rw-r--r--src/game-server/main-game.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/game-server/gamehandler.cpp b/src/game-server/gamehandler.cpp
index f9fcf5ec..07bf9ad1 100644
--- a/src/game-server/gamehandler.cpp
+++ b/src/game-server/gamehandler.cpp
@@ -135,11 +135,11 @@ static Character *findCharacterNear(Object *p, int id)
MapComposite *map = p->getMap();
Point const &ppos = p->getPosition();
// TODO: use a less arbitrary value.
- for (CharacterIterator i(map->getAroundPointIterator(ppos, 48)); i; ++i)
+ for (CharacterIterator i(map->getAroundPointIterator(ppos, 64)); i; ++i)
{
Character *o = *i;
if (o->getPublicID() != id) continue;
- return ppos.inRangeOf(o->getPosition(), 48) ? o : NULL;
+ return ppos.inRangeOf(o->getPosition(), 64) ? o : NULL;
}
return NULL;
}
diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp
index 5d6c0690..39727384 100644
--- a/src/game-server/main-game.cpp
+++ b/src/game-server/main-game.cpp
@@ -54,7 +54,7 @@
#define DEFAULT_MAPSDB_FILE "maps.xml"
#define DEFAULT_MONSTERSDB_FILE "monsters.xml"
-utils::Timer worldTimer(100, false); /**< Timer for world tics set to 100 ms */
+utils::Timer worldTimer(150, false); /**< Timer for world tics set to 100 ms */
int worldTime = 0; /**< Current world time in 100ms ticks */
bool running = true; /**< Determines if server keeps running */
@@ -262,7 +262,7 @@ int main(int argc, char *argv[])
#ifdef PACKAGE_VERSION
LOG_INFO("The Mana World Game Server v" << PACKAGE_VERSION);
#endif
-
+
// Parse command line options
parseOptions(argc, argv);