diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-03 20:56:20 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-03 20:56:20 +0000 |
| commit | 50418d820226fbcdf7609fb619028e3b75a2fa9e (patch) | |
| tree | 9eb6702bf55b75bcd5b340a1494fd89a1d279ed9 /src/map/clif.c | |
| parent | a05f029a4d7ebcdc9915c994f589bbca6f072004 (diff) | |
| download | hercules-50418d820226fbcdf7609fb619028e3b75a2fa9e.tar.gz hercules-50418d820226fbcdf7609fb619028e3b75a2fa9e.tar.bz2 hercules-50418d820226fbcdf7609fb619028e3b75a2fa9e.tar.xz hercules-50418d820226fbcdf7609fb619028e3b75a2fa9e.zip | |
Moved extra junk from map_addblock/map_delblock to where it logically belongs (loadendack/unit_remove_map), removed flags and _sub macros
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12002 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 9f1625b7a..4d5533be8 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7724,6 +7724,9 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) pc_setinvincibletimer(sd,battle_config.pc_invincible_time); } + if (map[sd->bl.m].users++ == 0 && battle_config.dynamic_mobs) //Skotlex + map_spawnmobs(sd->bl.m); + map_addblock(&sd->bl); clif_spawn(&sd->bl); @@ -7768,6 +7771,13 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) // must use foreachinarea (CIRCULAR_AREA interferes with foreachinrange) map_foreachinarea(clif_getareachar, sd->bl.m, sd->bl.x-AREA_SIZE, sd->bl.y-AREA_SIZE, sd->bl.x+AREA_SIZE, sd->bl.y+AREA_SIZE, BL_ALL, sd); + //TODO: merge it with the code below + if (battle_config.pet_no_gvg && map_flag_gvg(sd->bl.m) && sd->pd) + { //Return the pet to egg. [Skotlex] + clif_displaymessage(sd->fd, "Pets are not allowed in Guild Wars."); + pet_menu(sd, 3); //Option 3 is return to egg. + } + // pet if(sd->pd) { map_addblock(&sd->pd->bl); |