diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-06 01:01:13 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-06 01:01:13 +0000 |
| commit | 1f3fb6e24ba2cf2a790f743ed55cd003ffae922f (patch) | |
| tree | e531e45f7be67c8c20430015fc978f6bdcde641f | |
| parent | 91fa13f861e8b73f048375a237a4a7cbf33e3370 (diff) | |
| download | hercules-1f3fb6e24ba2cf2a790f743ed55cd003ffae922f.tar.gz hercules-1f3fb6e24ba2cf2a790f743ed55cd003ffae922f.tar.bz2 hercules-1f3fb6e24ba2cf2a790f743ed55cd003ffae922f.tar.xz hercules-1f3fb6e24ba2cf2a790f743ed55cd003ffae922f.zip | |
- 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
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 7 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 339cfeda6..5d03b5d91 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.
2006/04/05
+ * Fixed undisguising not clearing the mob sprite for the disguised
+ character. [Skotlex]
* Fixed parsing of job_db1.txt due to the MAX_WEAPON_TYPE change. [Skotlex]
* TK ranking kicks can't be used on sucession now (can't use any of the
kick skills twice in a row without using a different one first). [Skotlex]
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);
diff --git a/src/map/status.c b/src/map/status.c index 0c6d6d6fb..dba67d0fb 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -5877,7 +5877,7 @@ int status_readdb(void) { }
if(j < MAX_WEAPON_TYPE + 5)
{ //Weapon #.MAX_WEAPON_TYPE is constantly not load. Fix to that: replace < with <= [blackhole89]
- ShowDebug("%s: Not enough columns at line %d\n", i, j);
+ ShowDebug("%s: Not enough columns at line %d\n", path, i);
continue;
}
if(atoi(split[0])>=MAX_PC_CLASS)
|