diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-02 02:05:20 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-02 02:05:20 +0000 |
| commit | 34a0a33b55454561c73188a7c2fade46288d8341 (patch) | |
| tree | 0d110612cb23e1d14b0ef5dc35b64bf1b15e8405 | |
| parent | cdffb7ceb30953ecec67e9e7faa6f3649da07634 (diff) | |
| download | hercules-34a0a33b55454561c73188a7c2fade46288d8341.tar.gz hercules-34a0a33b55454561c73188a7c2fade46288d8341.tar.bz2 hercules-34a0a33b55454561c73188a7c2fade46288d8341.tar.xz hercules-34a0a33b55454561c73188a7c2fade46288d8341.zip | |
- Fixed pc_disguise not allowing you to "redisguise".
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6442 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/pc.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 2c51fc950..b96386cf7 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ 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.
2006/05/01
+ * Fixed pc_disguise not allowing you to "redisguise". [Skotlex]
* Corrected a crash when sd is null in npc_event [Skotlex]
* After testing to make sure it works properly, I'm including
new battle conf options to limit MVP drops. [Reddozen]
diff --git a/src/map/pc.c b/src/map/pc.c index da385ffcb..b58c7d624 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -1092,7 +1092,7 @@ int pc_checkweighticon(struct map_session_data *sd) int pc_disguise(struct map_session_data *sd, int class_) {
if (!class_ && !sd->disguise)
return 0;
- if (class_ && (sd->disguise || pc_isriding(sd)))
+ if (class_ && (sd->disguise == class_ || pc_isriding(sd)))
return 0;
pc_stop_walking(sd, 0);
|