From dd20c7f6148cc8b8b627028e25e817cc1cab063b Mon Sep 17 00:00:00 2001 From: Erik Schilling Date: Fri, 2 Dec 2011 23:53:45 +0100 Subject: Added possibility to reserve maps If you set net_gameServerName you can now reserve maps in the maps.xml. There you have to add the servername - property to the tag. Then the map will only be activated by that server. Also changed the activate sequence that the account server now tells the game server what maps to activate (previously the server requested all maps and the account server said yes or no). TODO: Fix general inter server map switching. --- src/game-server/main-game.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'src/game-server/main-game.cpp') diff --git a/src/game-server/main-game.cpp b/src/game-server/main-game.cpp index f76189f9..2533a16b 100644 --- a/src/game-server/main-game.cpp +++ b/src/game-server/main-game.cpp @@ -20,6 +20,7 @@ */ #include "common/configuration.h" +#include "common/defines.h" #include "common/permissionmanager.h" #include "common/resourcemanager.h" #include "game-server/accountconnection.h" @@ -64,19 +65,8 @@ using utils::Logger; -// Default options that automake should be able to override. #define DEFAULT_LOG_FILE "manaserv-game.log" -#define DEFAULT_ITEMSDB_FILE "items.xml" -#define DEFAULT_EQUIPDB_FILE "equip.xml" -#define DEFAULT_SKILLSDB_FILE "skills.xml" -#define DEFAULT_ATTRIBUTEDB_FILE "attributes.xml" -#define DEFAULT_MAPSDB_FILE "maps.xml" -#define DEFAULT_MONSTERSDB_FILE "monsters.xml" -#define DEFAULT_STATUSDB_FILE "status-effects.xml" -#define DEFAULT_PERMISSION_FILE "permissions.xml" #define DEFAULT_MAIN_SCRIPT_FILE "scripts/main.lua" -#define DEFAULT_SPECIALSDB_FILE "specials.xml" -#define DEFAULT_EMOTESDB_FILE "emotes.xml" static int const WORLD_TICK_SKIP = 2; /** tolerance for lagging behind in world calculation) **/ -- cgit v1.2.3-70-g09d2