summaryrefslogtreecommitdiff
path: root/src/tool/convert.c
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-20 21:21:54 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-20 21:21:54 +0000
commit75b20cb6be459e24ba77786ff3d6d0d0d4a1a224 (patch)
tree439bcff65e92a868492a8b4050cf336157d35dc7 /src/tool/convert.c
parent1a9e8d5552c9bf30a190e64795a42f2eba553119 (diff)
downloadhercules-75b20cb6be459e24ba77786ff3d6d0d0d4a1a224.tar.gz
hercules-75b20cb6be459e24ba77786ff3d6d0d0d4a1a224.tar.bz2
hercules-75b20cb6be459e24ba77786ff3d6d0d0d4a1a224.tar.xz
hercules-75b20cb6be459e24ba77786ff3d6d0d0d4a1a224.zip
Fixed a nasty bug from r11410 which let people create chars with already taken char names, and (in TXT's case) even cause a crash.
Closes bugreport:234. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11530 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/tool/convert.c')
-rw-r--r--src/tool/convert.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tool/convert.c b/src/tool/convert.c
index e9d82c362..863a282dc 100644
--- a/src/tool/convert.c
+++ b/src/tool/convert.c
@@ -49,7 +49,7 @@ struct mmo_charstatus {
char name[24];
unsigned char base_level,job_level;
- unsigned char str,agi,vit,int_,dex,luk,char_num,sex;
+ unsigned char str,agi,vit,int_,dex,luk,slot,sex;
struct point last_point,save_point,memo_point[3];
struct item inventory[MAX_INVENTORY],cart[MAX_CART];
@@ -64,7 +64,7 @@ int mmo_char_tostr(char *str,struct mmo_charstatus *p)
sprintf(str,"%d\t%d,%d\t%s\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d\t%d,%d,%d,%d,%d,%d\t%d,%d"
"\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d\t%d,%d,%d,%d,%d"
"\t%s,%d,%d\t%s,%d,%d",
- p->char_id,p->account_id,p->char_num,p->name, //
+ p->char_id,p->account_id,p->slot,p->name, //
p->class,p->base_level,p->job_level,
p->base_exp,p->job_exp,p->zeny,
p->hp,p->max_hp,p->sp,p->max_sp,
@@ -133,7 +133,7 @@ int mmo_char_fromstr(char *str,struct mmo_charstatus *p)
);
p->char_id=tmp_int[0];
p->account_id=tmp_int[1];
- p->char_num=tmp_int[2];
+ p->slot=tmp_int[2];
p->class=tmp_int[3];
p->base_level=tmp_int[4];
p->job_level=tmp_int[5];