diff options
| -rw-r--r-- | Changelog-Trunk.txt | 3 | ||||
| -rw-r--r-- | src/map/mercenary.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index c7a0eb072..f31019387 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,9 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2006/11/22
+ * Fixed the homunc hungry timer being started when the homun data is
+ received from the char-server and the homunc is NOT 'active'. [Skotlex]
2006/11/21
* Fixed the Auto-Berserk giving you back defense when it triggers during
berserk's HP penalty. [Skotlex]
diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 34c7d9cd9..2beccb554 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -564,9 +564,7 @@ int merc_hom_alloc(struct map_session_data *sd, struct s_homunculus *hom) map_addiddb(&hd->bl);
status_calc_homunculus(hd,1);
- // Timers
hd->hungry_timer = -1;
- merc_hom_init_timers(hd);
return 0;
}
@@ -652,6 +650,7 @@ int merc_hom_recv_data(int account_id, struct s_homunculus *sh, int flag) clif_homskillinfoblock(sd);
clif_hominfo(sd,hd,0);
clif_send_homdata(sd,SP_ACK,0);
+ merc_hom_init_timers(hd);
}
return 1;
}
|