summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-06 17:57:45 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-06 17:57:45 +0000
commit0f79342a3fe4ce80a37f6792d4154fa97c8560b0 (patch)
tree0d6da814c330c0f6aeed1fab845b95a4413c148c /src
parent5ca6022c40792a839c62f370c2671d802811f383 (diff)
downloadhercules-0f79342a3fe4ce80a37f6792d4154fa97c8560b0.tar.gz
hercules-0f79342a3fe4ce80a37f6792d4154fa97c8560b0.tar.bz2
hercules-0f79342a3fe4ce80a37f6792d4154fa97c8560b0.tar.xz
hercules-0f79342a3fe4ce80a37f6792d4154fa97c8560b0.zip
- Cleaned up homunc attack request parsing. Homunculus no longer goes into auto-attack (ctrl+click) mode since the client does every attack request individually.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9805 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c9
-rw-r--r--src/map/mob.c4
2 files changed, 4 insertions, 9 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 9ba4f3959..12603bdf7 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11706,19 +11706,12 @@ void clif_parse_HomMoveTo(int fd,struct map_session_data *sd) { //[orn]
}
void clif_parse_HomAttack(int fd,struct map_session_data *sd) { //[orn]
- struct block_list *target;
RFIFOHEAD(fd);
- nullpo_retv(sd);
if(!merc_is_hom_active(sd->hd))
return;
- if ((target = map_id2bl(RFIFOL(fd,6))) == NULL || status_isdead(target))
- return;
-
- merc_stop_walking(sd->hd, 1);
- merc_stop_attack(sd->hd);
- unit_attack(&sd->hd->bl,RFIFOL(fd,6),1) ;
+ unit_attack(&sd->hd->bl,RFIFOL(fd,6),0) ;
}
void clif_parse_HomMenu(int fd, struct map_session_data *sd) { //[orn]
diff --git a/src/map/mob.c b/src/map/mob.c
index 2d8c2591b..9078454e9 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2075,7 +2075,9 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
clif_mvp_exp(mvp_sd,mexp);
pc_gainexp(mvp_sd, &md->bl, mexp,0);
log_mvp[1] = mexp;
- if(!map[m].flag.nomvploot && !(type&1))
+ if(map[m].flag.nomvploot || type&1)
+ ; //No drops.
+ else
for(j=0;j<3;j++){
i = rand() % 3;