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/common/defines.h | 12 ++++++++++++ src/common/manaserv_protocol.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src/common') diff --git a/src/common/defines.h b/src/common/defines.h index d572df1f..4ba77a1c 100644 --- a/src/common/defines.h +++ b/src/common/defines.h @@ -29,6 +29,18 @@ // World tick time in miliseconds. #define WORLD_TICK_MS 100 +// Files +#define DEFAULT_MAPSDB_FILE "maps.xml" +#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_MONSTERSDB_FILE "monsters.xml" +#define DEFAULT_STATUSDB_FILE "status-effects.xml" +#define DEFAULT_PERMISSION_FILE "permissions.xml" +#define DEFAULT_SPECIALSDB_FILE "specials.xml" +#define DEFAULT_EMOTESDB_FILE "emotes.xml" + /** * Exit value codes are thrown back at servers exit to reflect their exit state. */ diff --git a/src/common/manaserv_protocol.h b/src/common/manaserv_protocol.h index 1fc85ba6..835f2455 100644 --- a/src/common/manaserv_protocol.h +++ b/src/common/manaserv_protocol.h @@ -250,7 +250,7 @@ enum { PCMSG_KICK_USER = 0x0466, // W channel id, S name // Inter-server - GAMSG_REGISTER = 0x0500, // S address, W port, S password, D items db revision, { W map id }* + GAMSG_REGISTER = 0x0500, // S address, W port, S password, D items db revision AGMSG_REGISTER_RESPONSE = 0x0501, // W item version, W password response, { S globalvar_key, S globalvar_value } AGMSG_ACTIVE_MAP = 0x0502, // W map id, W Number of mapvar_key mapvar_value sent, { S mapvar_key, S mapvar_value }, W Number of map items, { D item Id, W amount, W posX, W posY } AGMSG_PLAYER_ENTER = 0x0510, // B*32 token, D id, S name, serialised character data -- cgit v1.2.3-70-g09d2