summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/char_sql/char.c2
-rw-r--r--src/char_sql/int_homun.c3
3 files changed, 5 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7a48082c0..6540641a4 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -8,6 +8,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
itemdb loockup and a first step to remove map_session_data->inventory_data).
* Fixed a typo in the configure script that replaced CFLAGS with CPPFLAGS
when -Wno-pointer-sign is supported by the compiler. [FlavioJS]
+ * Fixed a typo in the status-change saving code (wrong variable used)
+ * Fixed a case of bad sql code conversion breaking homun skill loading
* Corrected skill Charge Attack as described in bugreport:67 [ultramage]
- cast time is between 100% and 300% (+ infinite waiting fixed)
- damage is also between 100% and 300% (doesn't increase past range 9)
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index e13744754..b493028b8 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -2733,7 +2733,7 @@ int parse_frommap(int fd)
for( i = 0; i < count; ++i )
{
memcpy (&data, RFIFOP(fd, 14+i*sizeof(struct status_change_data)), sizeof(struct status_change_data));
- if( count > 0 )
+ if( i > 0 )
StringBuf_AppendStr(&buf, ", ");
StringBuf_Printf(&buf, "('%d','%d','%hu','%d','%d','%d','%d','%d')", aid, cid,
data.type, data.tick, data.val1, data.val2, data.val3, data.val4);
diff --git a/src/char_sql/int_homun.c b/src/char_sql/int_homun.c
index 5c0c81f05..bc38e07be 100644
--- a/src/char_sql/int_homun.c
+++ b/src/char_sql/int_homun.c
@@ -199,7 +199,8 @@ int mapif_load_homunculus(int fd)
i = atoi(data);
if( i < HM_SKILLBASE || i >= HM_SKILLBASE + MAX_HOMUNSKILL )
continue;// invalid guild skill
- homun_pt->hskill[i].id = (unsigned short)i;
+ i = i - HM_SKILLBASE - 1;
+ homun_pt->hskill[i].id = (unsigned short)atoi(data);
// lv
Sql_GetData(sql_handle, 1, &data, NULL);
homun_pt->hskill[i].lv = (unsigned short)atoi(data);