diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-23 11:06:58 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-23 11:06:58 +0000 |
| commit | a050a1a8a1bb9e5a61a3b9ac60e1e688e98c4ea3 (patch) | |
| tree | 93e52b49aaee75c70e52aa0400fe20814d38ec7a /src/map/map.c | |
| parent | 4161c99f71fbd824163356c642731f7599c291e2 (diff) | |
| download | hercules-a050a1a8a1bb9e5a61a3b9ac60e1e688e98c4ea3.tar.gz hercules-a050a1a8a1bb9e5a61a3b9ac60e1e688e98c4ea3.tar.bz2 hercules-a050a1a8a1bb9e5a61a3b9ac60e1e688e98c4ea3.tar.xz hercules-a050a1a8a1bb9e5a61a3b9ac60e1e688e98c4ea3.zip | |
- 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
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 3 |
1 files changed, 1 insertions, 2 deletions
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."); |