From 950e3ebcdbbde96b090fa681ce88ecf4069f2f64 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Wed, 26 Feb 2014 15:00:22 -0300 Subject: Introducing #define npc constants As proposed by AnnieRuru in http://hercules.ws/board/topic/4320-getserverdef/ They're input directly by the server, Haru's idea! (Thank you). Also introducing the MAX_CHAT_USERS define as requested by AnnieRuru. Signed-off-by: shennetsind --- src/map/chat.h | 4 +++- src/map/script.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/map/chat.h b/src/map/chat.h index 71e5a11ec..b0c6cd905 100644 --- a/src/map/chat.h +++ b/src/map/chat.h @@ -10,6 +10,8 @@ struct map_session_data; struct chat_data; +#define MAX_CHAT_USERS 20 + struct chat_data { struct block_list bl; // data for this map object char title[CHATROOM_TITLE_SIZE]; // room title @@ -21,7 +23,7 @@ struct chat_data { uint32 zeny; // required zeny to join uint32 minLvl; // minimum base level to join uint32 maxLvl; // maximum base level allowed to join - struct map_session_data* usersd[20]; + struct map_session_data* usersd[MAX_CHAT_USERS]; struct block_list* owner; char npc_event[EVENT_NAME_LENGTH]; /* isn't this a waste? there is a enormous overhead, wouldn't something like skill_blockpc_start be better here? [Ind] */ diff --git a/src/map/script.c b/src/map/script.c index 6b31ee7b4..e355db828 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -19063,6 +19063,17 @@ void script_label_add(int key, int pos) { **/ void script_hardcoded_constants(void) { + /* server defines */ + script->set_constant("PACKETVER",PACKETVER,false); + script->set_constant("MAX_LEVEL",MAX_LEVEL,false); + script->set_constant("MAX_STORAGE",MAX_STORAGE,false); + script->set_constant("MAX_GUILD_STORAGE",MAX_GUILD_STORAGE,false); + script->set_constant("MAX_CART",MAX_INVENTORY,false); + script->set_constant("MAX_INVENTORY",MAX_INVENTORY,false); + script->set_constant("MAX_ZENY",MAX_ZENY,false); + script->set_constant("MAX_BG_MEMBERS",MAX_BG_MEMBERS,false); + script->set_constant("MAX_CHAT_USERS",MAX_CHAT_USERS,false); + /* status options */ script->set_constant("Option_Nothing",OPTION_NOTHING,false); script->set_constant("Option_Sight",OPTION_SIGHT,false); -- cgit v1.2.3-60-g2f50