diff options
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/map/skill.c | 2 | ||||
| -rw-r--r-- | src/txt-converter/char-converter.c | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index be78ef212..a101d6186 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,10 @@ 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/10/02
+ * Fixed the txt->sql converter only saving the very first character
+ permanent variable. [Skotlex]
+ * Fixed the txt->sql converter saving account-wide variables as
+ character-wide ones. [Skotlex]
* Renamed nopenalty mapflag to noexppenalty. Using nopenalty will turn
on/off both noexppenalty and nozenypenalty now. [Skotlex]
2006/10/01
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, &char_dat.global, sizeof(struct global_reg));
+ memcpy(®.reg, &char_dat.global, reg.reg_num*sizeof(struct global_reg));
inter_accreg_tosql(reg.account_id, reg.char_id, ®, 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 (®, 0, sizeof(struct accreg));
if(inter_accreg_fromstr(line, ®) == 0 && reg.account_id > 0) {
count++;
- inter_accreg_tosql(reg.account_id, 0, ®, 3); //Type 2: Account regs
+ inter_accreg_tosql(reg.account_id, 0, ®, 2); //Type 2: Account regs
}else{
ShowError("accreg reading: broken data [%s] at %s:%d\n", line, accreg_txt, lineno);
}
|