diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-12 02:46:00 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-12 02:46:00 +0000 |
| commit | 97353c7d82e3537982d2687f3b16a6c92e25b33b (patch) | |
| tree | 8d34baabf1b1b7e0bf1b23440eca6eb9195a7d49 | |
| parent | b60b70a43e012bc261f745a7ffd05c5cb43c2f27 (diff) | |
| download | hercules-97353c7d82e3537982d2687f3b16a6c92e25b33b.tar.gz hercules-97353c7d82e3537982d2687f3b16a6c92e25b33b.tar.bz2 hercules-97353c7d82e3537982d2687f3b16a6c92e25b33b.tar.xz hercules-97353c7d82e3537982d2687f3b16a6c92e25b33b.zip | |
- Fixed the inverted behavior of display_skill_fail, caused by r9823
- Commented out some duplicit homunculus speed calc code
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9852 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/clif.c | 5 | ||||
| -rw-r--r-- | src/map/pc.c | 2 | ||||
| -rw-r--r-- | src/map/status.c | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 6ea48a3a1..854d5ad44 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/02/11 + * Fixed the inverted behavior of display_skill_fail, caused by r9823 * Fixed @loadnpc not updating the script_event[] array 2007/02/10 * Fixed clif_party_message using an incorrect buffer length [ultramage] diff --git a/src/map/clif.c b/src/map/clif.c index 13758e6fe..4b642f84c 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -8213,11 +8213,10 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) clif_hominfo(sd,sd->hd,0); //for some reason, at least older clients want this sent twice clif_send_homdata(sd,0,0); clif_homskillinfoblock(sd); - //Homunc mimic their master's speed on each map change. [Skotlex] if (battle_config.hom_setting&0x8) - status_calc_bl(&sd->hd->bl, SCB_SPEED); + status_calc_bl(&sd->hd->bl, SCB_SPEED); //Homunc mimic their master's speed on each map change if (!(battle_config.hom_setting&0x2)) - skill_unit_move(&sd->hd->bl,gettick(),1); + skill_unit_move(&sd->hd->bl,gettick(),1); // apply land skills immediately } if(sd->state.connect_new) { diff --git a/src/map/pc.c b/src/map/pc.c index 3fba85898..4e9c93dc9 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -613,7 +613,7 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t if (battle_config.disp_zeny) sd->state.showzeny = 1; - if (!(battle_config.display_skill_fail&2)) + if (battle_config.display_skill_fail&2) sd->state.showdelay = 1; // Request all registries. diff --git a/src/map/status.c b/src/map/status.c index 14ee57e0d..3a5afa2ee 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -2413,11 +2413,12 @@ int status_calc_homunculus(struct homun_data *hd, int first) status->aspd_rate = 1000; + /* //this calc is useless since status_calc_bl(SCB_ALL) does it already skill = (1000 -4*status->agi -status->dex) *hd->homunculusDB->baseASPD/1000; status->amotion = cap_value(skill,battle_config.max_aspd,2000); - status->adelay = status->amotion; //It seems adelay = amotion for Homunculus. + status->adelay = status->amotion; //It seems adelay = amotion for Homunculus.*/ status_calc_misc(&hd->bl, status, hom->level); status_calc_bl(&hd->bl, SCB_ALL); //Status related changes. |