summaryrefslogtreecommitdiff
path: root/src/map/status.h
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-01-16 17:11:54 -0200
committershennetsind <ind@henn.et>2014-01-16 17:11:54 -0200
commit4874a3cf8b107457b703d0ece8d5102b08ef7702 (patch)
tree3755fe96388b6d922c5544281f27d1576aabfa43 /src/map/status.h
parent4a2794bbe3d4d1a0e9866b0a5d3459c75cd59ecb (diff)
parent56c54542b7e444010a6287a426680044c6756db6 (diff)
downloadhercules-4874a3cf8b107457b703d0ece8d5102b08ef7702.tar.gz
hercules-4874a3cf8b107457b703d0ece8d5102b08ef7702.tar.bz2
hercules-4874a3cf8b107457b703d0ece8d5102b08ef7702.tar.xz
hercules-4874a3cf8b107457b703d0ece8d5102b08ef7702.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/status.h')
-rw-r--r--src/map/status.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/map/status.h b/src/map/status.h
index 44cc3b0a1..f319b1506 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -697,6 +697,8 @@ typedef enum sc_type {
SC_SUPER_STAR,
SC_OKTOBERFEST,
+ SC_STRANGELIGHTS,
+ SC_DECORATION_OF_MUSIC,
SC_MAX, //Automatically updated max, used in for's to check we are within bounds.
} sc_type;
@@ -1458,6 +1460,7 @@ enum si_type {
SI_PACKING_ENVELOPE10 = 775,
SI_GLASTHEIM_TRANS = 776,
SI_HEAT_BARREL_AFTER = 778,
+ SI_DECORATION_OF_MUSIC = 779,
SI_MAX,
};
// JOINTBEAT stackable ailments