From 132da258d7cb272527902827f13e1841525cbd97 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 30 Nov 2007 07:07:51 +0000
Subject: [PATCH] - pc_setoption no longer does view_data changes while
 disguised (as this breaks things)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11845 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-Trunk.txt | 2 ++
 src/map/pc.c        | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a73ad7cb9c..90921645e2 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ 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/11/29
+	* pc_setoption no longer does view_data changes while disguised (as this
+	  breaks things) [Skotlex]
 	* Random cleanup/documentation.
 	* Made common/Makefile get the svn version from the src directory, not src/common.
 	* Added a warning message to the install and uninstall targets.
diff --git a/src/map/pc.c b/src/map/pc.c
index 852d06e5e0..2ccab3a5a1 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5823,6 +5823,9 @@ int pc_setoption(struct map_session_data *sd,int type)
 	else if (!(type&OPTION_SUMMER) && p_type&OPTION_SUMMER)
 		new_look = -1;
 
+	if (sd->disguise)
+		return 0; //Disguises break sprite changes
+
 	if (new_look < 0) { //Restore normal look.
 		status_set_viewdata(&sd->bl, sd->status.class_);
 		new_look = sd->vd.class_;