summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-06 01:01:13 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-06 01:01:13 +0000
commit1f3fb6e24ba2cf2a790f743ed55cd003ffae922f (patch)
treee531e45f7be67c8c20430015fc978f6bdcde641f /src
parent91fa13f861e8b73f048375a237a4a7cbf33e3370 (diff)
downloadhercules-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
Diffstat (limited to 'src')
-rw-r--r--src/map/pc.c7
-rw-r--r--src/map/status.c2
2 files changed, 5 insertions, 4 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);
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)