From a050a1a8a1bb9e5a61a3b9ac60e1e688e98c4ea3 Mon Sep 17 00:00:00 2001 From: skotlex Date: Sun, 23 Dec 2007 11:06:58 +0000 Subject: - Fixed warning about unused variable - Made the kaahi heal timer function uncrashable. - Fixed pc move item to cart function checking against the wrong max index. - Fixed initialization of sd issue in map_addblock - Removed redundant reinitialization when parsing item pickup. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11968 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/map.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/map/map.c') diff --git a/src/map/map.c b/src/map/map.c index 6050d6ed4..c4a0847b6 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -359,14 +359,13 @@ int map_addblock_sub (struct block_list *bl, int flag) } else { if (bl->type == BL_PC && flag) { - struct map_session_data* sd; + struct map_session_data* sd = (struct map_session_data*)bl; if (!sd->state.auth) { ShowError("map_addblock: Attempted to add a non-authed player (%d:%d)!\n", sd->status.account_id, sd->status.char_id); return 1; } if (map[m].users++ == 0 && battle_config.dynamic_mobs) //Skotlex map_spawnmobs(m); - sd = (struct map_session_data*)bl; if (battle_config.pet_no_gvg && map_flag_gvg(m) && sd->pd) { //Return the pet to egg. [Skotlex] clif_displaymessage(sd->fd, "Pets are not allowed in Guild Wars."); -- cgit v1.2.3-70-g09d2