summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-02 15:04:14 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-02 15:04:14 +0000
commit8598458b25ca31eff015a001cd6381e305acf3d0 (patch)
tree6ba8ed9228da2a1111c9376c98e9d50c2757be7e /src
parentd90b2e20d916b9539060dcdb33d13bb41aa1bb89 (diff)
downloadhercules-8598458b25ca31eff015a001cd6381e305acf3d0.tar.gz
hercules-8598458b25ca31eff015a001cd6381e305acf3d0.tar.bz2
hercules-8598458b25ca31eff015a001cd6381e305acf3d0.tar.xz
hercules-8598458b25ca31eff015a001cd6381e305acf3d0.zip
- Fixed the txt->sql converter only saving the very first character permanent variable.
- Fixed the txt->sql converter saving account-wide variables as character-wide ones. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8917 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/skill.c2
-rw-r--r--src/txt-converter/char-converter.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index c8aeb689f..ee93dbc12 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -6020,7 +6020,7 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int s
break;
case HP_BASILICA:
skill_clear_unitgroup(src);
- if ((sg = skill_unitsetting(src,skillid,skilllv,x,y,0)))
+ if (skill_unitsetting(src,skillid,skilllv,x,y,0))
sc_start(src,type,100,skilllv,skill_get_time(skillid,skilllv));
flag|=1;
break;
diff --git a/src/txt-converter/char-converter.c b/src/txt-converter/char-converter.c
index 56f8cdbcd..4d435b4d1 100644
--- a/src/txt-converter/char-converter.c
+++ b/src/txt-converter/char-converter.c
@@ -67,7 +67,7 @@ int convert_init(void){
reg.account_id = char_dat.status.account_id;
reg.char_id = char_dat.status.char_id;
reg.reg_num = char_dat.global_num;
- memcpy(&reg.reg, &char_dat.global, sizeof(struct global_reg));
+ memcpy(&reg.reg, &char_dat.global, reg.reg_num*sizeof(struct global_reg));
inter_accreg_tosql(reg.account_id, reg.char_id, &reg, 3); //Type 3: Character regs
} else {
ShowError("Error %d converting character line [%s] (at %s:%d).\n", ret, line, char_txt, lineno);
@@ -87,7 +87,7 @@ int convert_init(void){
memset (&reg, 0, sizeof(struct accreg));
if(inter_accreg_fromstr(line, &reg) == 0 && reg.account_id > 0) {
count++;
- inter_accreg_tosql(reg.account_id, 0, &reg, 3); //Type 2: Account regs
+ inter_accreg_tosql(reg.account_id, 0, &reg, 2); //Type 2: Account regs
}else{
ShowError("accreg reading: broken data [%s] at %s:%d\n", line, accreg_txt, lineno);
}