summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-11-12 00:53:03 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-11-12 00:53:03 +0000
commit0f715fc0dbaa5c2327a951d107e971f3d7ebd216 (patch)
tree6f0cdce95a1e86756e0c43ce32ddfce7e11fa34b /src/map
parentb1cc3f5ebc252e30b129b7570f207211129f08e4 (diff)
downloadhercules-0f715fc0dbaa5c2327a951d107e971f3d7ebd216.tar.gz
hercules-0f715fc0dbaa5c2327a951d107e971f3d7ebd216.tar.bz2
hercules-0f715fc0dbaa5c2327a951d107e971f3d7ebd216.tar.xz
hercules-0f715fc0dbaa5c2327a951d107e971f3d7ebd216.zip
Follow up r16916: enforced status recalc when intravision ends to ensure it is properly overridden.
Follow up r16914: removed unused var git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16917 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/atcommand.c2
-rw-r--r--src/map/status.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index e656d4eb1..25fc3182d 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2526,7 +2526,7 @@ ACMD_FUNC(skillpoint)
*------------------------------------------*/
ACMD_FUNC(zeny)
{
- int zeny, new_zeny;
+ int zeny;
nullpo_retr(-1, sd);
if (!message || !*message || (zeny = atoi(message)) == 0) {
diff --git a/src/map/status.c b/src/map/status.c
index 802a1c023..a7c14dcaf 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -9412,6 +9412,9 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
clif_status_load(bl, SI_KYOUGAKU, 0); // Avoid client crash
clif_status_load(bl, SI_ACTIVE_MONSTER_TRANSFORM, 0);
break;
+ case SC_INTRAVISION:
+ calc_flag = SCB_ALL;/* required for overlapping */
+ break;
}
opt_flag = 1;