- Fixed an error on the error-message when job_db1 doesn't has enough columns.

- Fixed undisguising not clearing the mob sprite for the disguised character.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5917 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 4 insertions, 3 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index bda44a6a9..93e0da84a 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -1095,15 +1095,16 @@ int pc_disguise(struct map_session_data *sd, int class_) {
 		return 0;

 	if (class_ && (sd->disguise || pc_isriding(sd)))

 		return 0;

-	

+

+	pc_stop_walking(sd, 0);

+	clif_clearchar(&sd->bl, 0);

+

 	if (!class_) {

 		sd->disguise = 0;

 		class_ = sd->status.class_;

 	} else

 		sd->disguise=class_;

 

-	pc_stop_walking(sd, 0);

-	clif_clearchar(&sd->bl, 0);

 	status_set_viewdata(&sd->bl, class_);

 	clif_changeoption(&sd->bl);

 	clif_spawn(&sd->bl);