diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-30 07:07:51 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-30 07:07:51 +0000 |
| commit | d5815e3e829bc1303559f8649cf05bd257787cfe (patch) | |
| tree | 85c00ecada7e2785365011c48d2c51b14f2cae69 | |
| parent | d157481db8a77069628b6186b9a31ea6267854ee (diff) | |
| download | hercules-d5815e3e829bc1303559f8649cf05bd257787cfe.tar.gz hercules-d5815e3e829bc1303559f8649cf05bd257787cfe.tar.bz2 hercules-d5815e3e829bc1303559f8649cf05bd257787cfe.tar.xz hercules-d5815e3e829bc1303559f8649cf05bd257787cfe.zip | |
- pc_setoption no longer does view_data changes while disguised (as this breaks things)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11845 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index a73ad7cb9..90921645e 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 852d06e5e..2ccab3a5a 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_; |