Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed the txt->sql converter only saving the very first character permanent variable.

Browse Source 
- Fixed the txt->sql converter saving account-wide variables as character-wide ones.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8917 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-10-02 15:04:14 +00:00
parent 55cf6d9d0f
commit 94f10d7d39
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog-Trunk.txt
View File

@ -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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/10/02 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 * Renamed nopenalty mapflag to noexppenalty. Using nopenalty will turn
on/off both noexppenalty and nozenypenalty now. [Skotlex] on/off both noexppenalty and nozenypenalty now. [Skotlex]
2006/10/01 2006/10/01

2
src/map/skill.c
View File

@ -6020,7 +6020,7 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int s
break; break;
case HP_BASILICA: case HP_BASILICA:
skill_clear_unitgroup(src); 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)); sc_start(src,type,100,skilllv,skill_get_time(skillid,skilllv));
flag|=1; flag|=1;
break; break;

4
src/txt-converter/char-converter.c
View File

@ -67,7 +67,7 @@ int convert_init(void){
reg.account_id = char_dat.status.account_id; reg.account_id = char_dat.status.account_id;
reg.char_id = char_dat.status.char_id; reg.char_id = char_dat.status.char_id;
reg.reg_num = char_dat.global_num; 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 inter_accreg_tosql(reg.account_id, reg.char_id, &reg, 3); //Type 3: Character regs
} else { } else {
ShowError("Error %d converting character line [%s] (at %s:%d).\n", ret, line, char_txt, lineno); 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)); memset (&reg, 0, sizeof(struct accreg));
if(inter_accreg_fromstr(line, &reg) == 0 && reg.account_id > 0) { if(inter_accreg_fromstr(line, &reg) == 0 && reg.account_id > 0) {
count++; 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{ }else{
ShowError("accreg reading: broken data [%s] at %s:%d\n", line, accreg_txt, lineno); ShowError("accreg reading: broken data [%s] at %s:%d\n", line, accreg_txt, lineno);
} }