diff options
Diffstat (limited to 'src/map')
| -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);
}
|