diff options
| author | shennetsind <ind@henn.et> | 2014-01-16 17:11:54 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-01-16 17:11:54 -0200 |
| commit | 4874a3cf8b107457b703d0ece8d5102b08ef7702 (patch) | |
| tree | 3755fe96388b6d922c5544281f27d1576aabfa43 /src | |
| parent | 4a2794bbe3d4d1a0e9866b0a5d3459c75cd59ecb (diff) | |
| parent | 56c54542b7e444010a6287a426680044c6756db6 (diff) | |
| download | hercules-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')
| -rw-r--r-- | src/map/clif.c | 4 | ||||
| -rw-r--r-- | src/map/status.c | 8 | ||||
| -rw-r--r-- | src/map/status.h | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index b51651b90..d13cea145 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5492,10 +5492,10 @@ void clif_status_change_notick(struct block_list *bl,int type,int flag,int tick, nullpo_retv(bl); - if (!(status->type2relevant_bl_types(type)&bl->type)) // only send status changes that actually matter to the client + if (type == SI_BLANK) //It shows nothing on the client... return; - if (type == SI_BLANK) //It shows nothing on the client... + if (!(status->type2relevant_bl_types(type)&bl->type)) // only send status changes that actually matter to the client return; sd = BL_CAST(BL_PC, bl); diff --git a/src/map/status.c b/src/map/status.c index 1f7d81ccf..e89f8d331 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -96,7 +96,7 @@ int status_type2relevant_bl_types(int type) { if( type < 0 || type >= SI_MAX ) { ShowError("status_type2relevant_bl_types: Unsupported type %d\n", type); - return SI_BLANK; + return BL_NUL; } return status->RelevantBLTypes[type]; @@ -908,6 +908,8 @@ void initChangeTables(void) { status->IconChangeTable[SC_MONSTER_TRANSFORM] = SI_MONSTER_TRANSFORM; status->IconChangeTable[SC_MOONSTAR] = SI_MOONSTAR; status->IconChangeTable[SC_SUPER_STAR] = SI_SUPER_STAR; + status->IconChangeTable[SC_STRANGELIGHTS] = SI_STRANGELIGHTS; + status->IconChangeTable[SC_DECORATION_OF_MUSIC] = SI_DECORATION_OF_MUSIC; //Other SC which are not necessarily associated to skills. status->ChangeFlagTable[SC_ATTHASTE_POTION1] = SCB_ASPD; @@ -999,6 +1001,8 @@ void initChangeTables(void) { status->ChangeFlagTable[SC_MOONSTAR] |= SCB_NONE; status->ChangeFlagTable[SC_SUPER_STAR] |= SCB_NONE; + status->ChangeFlagTable[SC_STRANGELIGHTS] |= SCB_NONE; + status->ChangeFlagTable[SC_DECORATION_OF_MUSIC] |= SCB_NONE; /* status->DisplayType Table [Ind/Hercules] */ status->DisplayType[SC_ALL_RIDING] = true; @@ -1026,6 +1030,8 @@ void initChangeTables(void) { status->DisplayType[SC_MONSTER_TRANSFORM] = true; status->DisplayType[SC_MOONSTAR] = true; status->DisplayType[SC_SUPER_STAR] = true; + status->DisplayType[SC_STRANGELIGHTS] = true; + status->DisplayType[SC_DECORATION_OF_MUSIC] = true; #ifdef RENEWAL_EDP // renewal EDP increases your weapon atk 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 |