summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2017-05-09 03:09:58 +0200
committerGitHub <noreply@github.com>2017-05-09 03:09:58 +0200
commit9695eacf9c8bcec0093735dd3dc913fea99213b9 (patch)
tree7bc08f6a8e69463f324efda3f6bef47100ff091b /src/common
parent9a8c572b4a53318a40d9fe23344666ab7a2a4210 (diff)
parent359cc8da6b98c9716e4695b471acbe4d45140be2 (diff)
downloadhercules-9695eacf9c8bcec0093735dd3dc913fea99213b9.tar.gz
hercules-9695eacf9c8bcec0093735dd3dc913fea99213b9.tar.bz2
hercules-9695eacf9c8bcec0093735dd3dc913fea99213b9.tar.xz
hercules-9695eacf9c8bcec0093735dd3dc913fea99213b9.zip
Merge pull request #1699 from Jedzkie/11-SummerCostume
Implemented Official Summer 2 Costume
Diffstat (limited to 'src/common')
-rw-r--r--src/common/mmo.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index b3069b27c..7bd5b7c06 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -436,6 +436,7 @@ enum {
OPTION_DRAGON5 = 0x04000000,
OPTION_HANBOK = 0x08000000,
OPTION_OKTOBERFEST = 0x10000000,
+ OPTION_SUMMER2 = 0x20000000,
#ifndef NEW_CARTS
OPTION_CART1 = 0x00000008,
OPTION_CART2 = 0x00000080,
@@ -447,7 +448,7 @@ enum {
#endif
// compound constants
OPTION_DRAGON = OPTION_DRAGON1|OPTION_DRAGON2|OPTION_DRAGON3|OPTION_DRAGON4|OPTION_DRAGON5,
- OPTION_COSTUME = OPTION_WEDDING|OPTION_XMAS|OPTION_SUMMER|OPTION_HANBOK|OPTION_OKTOBERFEST,
+ OPTION_COSTUME = OPTION_WEDDING | OPTION_XMAS | OPTION_SUMMER | OPTION_HANBOK | OPTION_OKTOBERFEST | OPTION_SUMMER2,
};
struct s_skill {