summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-12-11 15:01:00 +0100
committerHaru <haru@dotalux.com>2013-12-11 15:03:52 +0100
commit68d6c8bc110bbecd39c47b0e00445b8b4b5eb278 (patch)
tree98804fe393e6559399e5ff0c86a73026c889a1f8 /src/map/status.c
parent27cf11151de917892b22794c1aa798620a484850 (diff)
downloadhercules-68d6c8bc110bbecd39c47b0e00445b8b4b5eb278.tar.gz
hercules-68d6c8bc110bbecd39c47b0e00445b8b4b5eb278.tar.bz2
hercules-68d6c8bc110bbecd39c47b0e00445b8b4b5eb278.tar.xz
hercules-68d6c8bc110bbecd39c47b0e00445b8b4b5eb278.zip
Corrected some local 'mapindex' variables shadowing the global one
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 7e16faeeb..ed29bacf9 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -7959,11 +7959,11 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
if (sd->mapindex != val2)
{
int pos = (bl->x&0xFFFF)|(bl->y<<16); /// Current Coordinates
- int mapindex = sd->mapindex; /// Current Map
+ int map_index = sd->mapindex; /// Current Map
//1. Place in Jail (val2 -> Jail Map, val3 -> x, val4 -> y
pc->setpos(sd,(unsigned short)val2,val3,val4, CLR_TELEPORT);
//2. Set restore point (val3 -> return map, val4 return coords
- val3 = mapindex;
+ val3 = map_index;
val4 = pos;
} else if (!val3 || val3 == sd->mapindex) { //Use save point.
val3 = sd->status.save_point.map;