summaryrefslogtreecommitdiff
path: root/src/char
diff options
context:
space:
mode:
Diffstat (limited to 'src/char')
-rw-r--r--src/char/char.c1
-rw-r--r--src/char/inter.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/char/char.c b/src/char/char.c
index 63b47cfcf..e58fc9eef 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -1278,6 +1278,7 @@ int mmo_char_fromsql(int char_id, struct mmo_charstatus* p, bool load_everything
StrBuf->Printf(&buf, ", `card%d`", j);
StrBuf->Printf(&buf, " FROM `%s` WHERE `char_id`=? LIMIT %d", cart_db, MAX_CART);
+ memset(&tmp_item, 0, sizeof(tmp_item));
if( SQL_ERROR == SQL->StmtPrepareStr(stmt, StrBuf->Value(&buf))
|| SQL_ERROR == SQL->StmtBindParam(stmt, 0, SQLDT_INT, &char_id, 0)
|| SQL_ERROR == SQL->StmtExecute(stmt)
diff --git a/src/char/inter.c b/src/char/inter.c
index b213f1608..771b51602 100644
--- a/src/char/inter.c
+++ b/src/char/inter.c
@@ -341,8 +341,11 @@ const char* job_name(int class_) {
case JOB_OBORO:
return msg_txt(653 - JOB_KAGEROU+class_);
- default:
+ case JOB_REBELLION:
return msg_txt(655);
+
+ default:
+ return msg_txt(656);
}
}