diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-27 15:15:22 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-27 15:15:22 +0000 |
| commit | 09972deecb1aaf08bfa331ccc20830514913b234 (patch) | |
| tree | a8f257aa80e5fa95e26700427feb297a0f8acd6d /src | |
| parent | 6f919a083e4f31afd4ec7b8e1451afda32526aa2 (diff) | |
| download | hercules-09972deecb1aaf08bfa331ccc20830514913b234.tar.gz hercules-09972deecb1aaf08bfa331ccc20830514913b234.tar.bz2 hercules-09972deecb1aaf08bfa331ccc20830514913b234.tar.xz hercules-09972deecb1aaf08bfa331ccc20830514913b234.zip | |
- Small change in the pet_ai that should stop the "strange" catch-up behaviour of pets when you are much faster than them.
- Corrected the unequip script of the wedding dress/tuxedo (it should be Class, not bClass)
- Changebase script command will also refresh the weapon sprites (in case you changed into Wedding/Xmas class)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6317 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/pet.c | 5 | ||||
| -rw-r--r-- | src/map/script.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index aa2df5c7f..804193130 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -293,7 +293,7 @@ ACMD_FUNC(main); // LuzZza ACMD_FUNC(clone); // [Valaris]
ACMD_FUNC(tonpc); // LuzZza
-ACMD_FUNC(commands); // LuzZza
+ACMD_FUNC(commands); // [Skotlex]
/*==========================================
*AtCommandInfo atcommand_info[]構造体の定義
diff --git a/src/map/pet.c b/src/map/pet.c index d4db10d09..745bae5e2 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -964,8 +964,11 @@ static int pet_ai_sub_hard(struct pet_data *pd,unsigned int tick) }
//Return speed to normal.
- if (pd->speed != sd->petDB->speed)
+ if (pd->speed != sd->petDB->speed) {
+ if (pd->ud.walktimer != -1)
+ return 0; //Wait until the pet finishes walking back to master.
pd->speed = sd->petDB->speed;
+ }
if (pd->target_id) {
target= map_id2bl(pd->target_id);
diff --git a/src/map/script.c b/src/map/script.c index e5994c0e3..625f49b5f 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -6348,7 +6348,9 @@ int buildin_changebase(struct script_state *st) if(!sd->disguise && vclass != sd->vd.class_) {
status_set_viewdata(&sd->bl, vclass);
+ //Updated client view. Base, Weapon and Cloth Colors.
clif_changelook(&sd->bl,LOOK_BASE,sd->vd.class_);
+ clif_changelook(&sd->bl,LOOK_WEAPON,sd->status.weapon);
if (sd->vd.cloth_color)
clif_changelook(&sd->bl,LOOK_CLOTHES_COLOR,sd->vd.cloth_color);
}
|