diff options
| author | Dastgir <dastgirpojee@rocketmail.com> | 2015-10-26 21:38:41 +0530 |
|---|---|---|
| committer | Dastgir <dastgirpojee@rocketmail.com> | 2015-10-26 21:38:41 +0530 |
| commit | 0363a6a6ebe2178e9f7f4181b0d54c128467e713 (patch) | |
| tree | 0ed99a6e0f9558ef9f3a41089a3ca4d7fc8eb992 /src/map/status.c | |
| parent | 6420b06df1eff8b6408b327fc73e2c53b7b96780 (diff) | |
| parent | adf5e1462631f6e82cdf4c6b56313b19939a0d3a (diff) | |
| download | hercules-0363a6a6ebe2178e9f7f4181b0d54c128467e713.tar.gz hercules-0363a6a6ebe2178e9f7f4181b0d54c128467e713.tar.bz2 hercules-0363a6a6ebe2178e9f7f4181b0d54c128467e713.tar.xz hercules-0363a6a6ebe2178e9f7f4181b0d54c128467e713.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/status.c')
| -rw-r--r-- | src/map/status.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/map/status.c b/src/map/status.c index 7a7a4f415..1a07f74dc 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -918,6 +918,8 @@ void initChangeTables(void) { status->dbs->IconChangeTable[SC_SUPER_STAR] = SI_SUPER_STAR; status->dbs->IconChangeTable[SC_STRANGELIGHTS] = SI_STRANGELIGHTS; status->dbs->IconChangeTable[SC_DECORATION_OF_MUSIC] = SI_DECORATION_OF_MUSIC; + status->dbs->IconChangeTable[SC_LJOSALFAR] = SI_LJOSALFAR; + status->dbs->IconChangeTable[SC_MERMAID_LONGING] = SI_MERMAID_LONGING; //Other SC which are not necessarily associated to skills. status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION1] = SCB_ASPD; @@ -1024,6 +1026,8 @@ void initChangeTables(void) { status->dbs->ChangeFlagTable[SC_SUPER_STAR] |= SCB_NONE; status->dbs->ChangeFlagTable[SC_STRANGELIGHTS] |= SCB_NONE; status->dbs->ChangeFlagTable[SC_DECORATION_OF_MUSIC] |= SCB_NONE; + status->dbs->ChangeFlagTable[SC_LJOSALFAR] |= SCB_NONE; + status->dbs->ChangeFlagTable[SC_MERMAID_LONGING] |= SCB_NONE; /* status->dbs->DisplayType Table [Ind/Hercules] */ status->dbs->DisplayType[SC_ALL_RIDING] = true; @@ -1052,6 +1056,8 @@ void initChangeTables(void) { status->dbs->DisplayType[SC_SUPER_STAR] = true; status->dbs->DisplayType[SC_STRANGELIGHTS] = true; status->dbs->DisplayType[SC_DECORATION_OF_MUSIC] = true; + status->dbs->DisplayType[SC_LJOSALFAR] = true; + status->dbs->DisplayType[SC_MERMAID_LONGING] = true; if( !battle_config.display_hallucination ) //Disable Hallucination. status->dbs->IconChangeTable[SC_ILLUSION] = SI_BLANK; |