diff options
| author | Streusel <advance_me@hotmail.de> | 2013-04-23 00:26:00 -0700 |
|---|---|---|
| committer | Streusel <advance_me@hotmail.de> | 2013-04-23 00:26:00 -0700 |
| commit | 8c3c4577bde31ccee677ea75649b89cfa5822240 (patch) | |
| tree | 6f1c3cf85deea0932b974d5a8943184966bff46a /src/common/mmo.h | |
| parent | 3a6517e14649805db47b332934f4cad972d00e95 (diff) | |
| parent | 038174e232c03519474f86e5738cecac34bbdee3 (diff) | |
| download | hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.gz hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.bz2 hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.tar.xz hercules-8c3c4577bde31ccee677ea75649b89cfa5822240.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Diffstat (limited to 'src/common/mmo.h')
| -rw-r--r-- | src/common/mmo.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h index 7d1928201..e19c8f94d 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -98,8 +98,9 @@ #define MAX_GUILDSKILL 15 // increased max guild skills because of new skills [Sara-chan] #define MAX_GUILDLEVEL 50 #define MAX_GUARDIANS 8 //Local max per castle. [Skotlex] -#define MAX_QUEST_DB 2350 //Max quests that the server will load +#define MAX_QUEST_DB 2400 //Max quests that the server will load #define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest +#define MAX_START_ITEMS 32 //Max number of items allowed to be given to a char whenever it's created. [mkbu95] // for produce #define MIN_ATTRIBUTE 0 @@ -219,6 +220,12 @@ enum e_skill_flag //... }; +enum e_mmo_charstatus_opt { + OPT_NONE = 0x0, + OPT_SHOW_EQUIP = 0x1, + OPT_ALLOW_PARTY = 0x2, +}; + struct s_skill { unsigned short id; unsigned char lv; @@ -378,7 +385,7 @@ struct mmo_charstatus { #ifdef HOTKEY_SAVING struct hotkey hotkeys[MAX_HOTKEYS]; #endif - bool show_equip; + bool show_equip, allow_party; unsigned short rename; unsigned short slotchange; |