1 files changed, 122 insertions, 128 deletions

diff --git a/src/char/int_quest.c b/src/char/int_quest.c
index 224205412..8ba6ef95a 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.c
@@ -21,164 +21,158 @@
 //Load entire questlog for a character
 int mapif_quests_fromsql(int char_id, struct quest questlog[])
 {
-	int i;
-	struct quest tmp_quest;
-	SqlStmt * stmt;
-
-	stmt = SqlStmt_Malloc(sql_handle);
-	if( stmt == NULL )
-	{
-		SqlStmt_ShowDebug(stmt);
-		return 0;
-	}
-
-	memset(&tmp_quest, 0, sizeof(struct quest));
-
-	if( SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT `quest_id`, `state`, `time`, `count1`, `count2`, `count3` FROM `%s` WHERE `char_id`=? LIMIT %d", quest_db, MAX_QUEST_DB)
-	||	SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
-	||	SQL_ERROR == SqlStmt_Execute(stmt)
-	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT,    &tmp_quest.quest_id, 0, NULL, NULL)
-	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_INT,    &tmp_quest.state, 0, NULL, NULL)
-	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_UINT,   &tmp_quest.time, 0, NULL, NULL)
-	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 3, SQLDT_INT,    &tmp_quest.count[0], 0, NULL, NULL)
-	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 4, SQLDT_INT,    &tmp_quest.count[1], 0, NULL, NULL)
-	||	SQL_ERROR == SqlStmt_BindColumn(stmt, 5, SQLDT_INT,    &tmp_quest.count[2], 0, NULL, NULL) )
-		SqlStmt_ShowDebug(stmt);
-
-	for( i = 0; i < MAX_QUEST_DB && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i )
-		memcpy(&questlog[i], &tmp_quest, sizeof(tmp_quest));
-
-	SqlStmt_Free(stmt);
-	return i;
+    int i;
+    struct quest tmp_quest;
+    SqlStmt *stmt;
+
+    stmt = SqlStmt_Malloc(sql_handle);
+    if (stmt == NULL) {
+        SqlStmt_ShowDebug(stmt);
+        return 0;
+    }
+
+    memset(&tmp_quest, 0, sizeof(struct quest));
+
+    if (SQL_ERROR == SqlStmt_Prepare(stmt, "SELECT `quest_id`, `state`, `time`, `count1`, `count2`, `count3` FROM `%s` WHERE `char_id`=? LIMIT %d", quest_db, MAX_QUEST_DB)
+        ||  SQL_ERROR == SqlStmt_BindParam(stmt, 0, SQLDT_INT, &char_id, 0)
+        ||  SQL_ERROR == SqlStmt_Execute(stmt)
+        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT,    &tmp_quest.quest_id, 0, NULL, NULL)
+        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_INT,    &tmp_quest.state, 0, NULL, NULL)
+        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_UINT,   &tmp_quest.time, 0, NULL, NULL)
+        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 3, SQLDT_INT,    &tmp_quest.count[0], 0, NULL, NULL)
+        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 4, SQLDT_INT,    &tmp_quest.count[1], 0, NULL, NULL)
+        ||  SQL_ERROR == SqlStmt_BindColumn(stmt, 5, SQLDT_INT,    &tmp_quest.count[2], 0, NULL, NULL))
+        SqlStmt_ShowDebug(stmt);
+
+    for (i = 0; i < MAX_QUEST_DB && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i)
+        memcpy(&questlog[i], &tmp_quest, sizeof(tmp_quest));
+
+    SqlStmt_Free(stmt);
+    return i;
 }
 
 //Delete a quest
 bool mapif_quest_delete(int char_id, int quest_id)
 {
-	if ( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `quest_id` = '%d' AND `char_id` = '%d'", quest_db, quest_id, char_id) )
-	{
-		Sql_ShowDebug(sql_handle);
-		return false;
-	}
+    if (SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `quest_id` = '%d' AND `char_id` = '%d'", quest_db, quest_id, char_id)) {
+        Sql_ShowDebug(sql_handle);
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 //Add a quest to a questlog
 bool mapif_quest_add(int char_id, struct quest qd)
 {
-	if ( SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`quest_id`, `char_id`, `state`, `time`, `count1`, `count2`, `count3`) VALUES ('%d', '%d', '%d','%d', '%d', '%d', '%d')", quest_db, qd.quest_id, char_id, qd.state, qd.time, qd.count[0], qd.count[1], qd.count[2]) ) 
-	{
-		Sql_ShowDebug(sql_handle);
-		return false;
-	}
+    if (SQL_ERROR == Sql_Query(sql_handle, "INSERT INTO `%s`(`quest_id`, `char_id`, `state`, `time`, `count1`, `count2`, `count3`) VALUES ('%d', '%d', '%d','%d', '%d', '%d', '%d')", quest_db, qd.quest_id, char_id, qd.state, qd.time, qd.count[0], qd.count[1], qd.count[2])) {
+        Sql_ShowDebug(sql_handle);
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 //Update a questlog
 bool mapif_quest_update(int char_id, struct quest qd)
 {
-	if ( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `state`='%d', `count1`='%d', `count2`='%d', `count3`='%d' WHERE `quest_id` = '%d' AND `char_id` = '%d'", quest_db, qd.state, qd.count[0], qd.count[1], qd.count[2], qd.quest_id, char_id) ) 
-	{
-		Sql_ShowDebug(sql_handle);
-		return false;
-	}
+    if (SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `state`='%d', `count1`='%d', `count2`='%d', `count3`='%d' WHERE `quest_id` = '%d' AND `char_id` = '%d'", quest_db, qd.state, qd.count[0], qd.count[1], qd.count[2], qd.quest_id, char_id)) {
+        Sql_ShowDebug(sql_handle);
+        return false;
+    }
 
-	return true;
+    return true;
 }
 
 //Save quests
 int mapif_parse_quest_save(int fd)
 {
-	int i, j, k, num2, num1 = (RFIFOW(fd,2)-8)/sizeof(struct quest);
-	int char_id = RFIFOL(fd,4);
-	struct quest qd1[MAX_QUEST_DB],qd2[MAX_QUEST_DB];
-	bool success = true;
-
-	memset(qd1, 0, sizeof(qd1));
-	memset(qd2, 0, sizeof(qd2));
-	if( num1 ) memcpy(&qd1, RFIFOP(fd,8), RFIFOW(fd,2)-8);
-	num2 = mapif_quests_fromsql(char_id, qd2);
-
-	for( i = 0; i < num1; i++ )
-	{
-		ARR_FIND( 0, num2, j, qd1[i].quest_id == qd2[j].quest_id );
-		if( j < num2 ) // Update existed quests
-		{	// Only states and counts are changable.
-			ARR_FIND( 0, MAX_QUEST_OBJECTIVES, k, qd1[i].count[k] != qd2[j].count[k] );
-			if( k != MAX_QUEST_OBJECTIVES || qd1[i].state != qd2[j].state )
-				success &= mapif_quest_update(char_id, qd1[i]);
-
-			if( j < (--num2) )
-			{
-				memmove(&qd2[j],&qd2[j+1],sizeof(struct quest)*(num2-j));
-				memset(&qd2[num2], 0, sizeof(struct quest));
-			}
-
-		}
-		else // Add new quests
-			success &= mapif_quest_add(char_id, qd1[i]);
-	}
-
-	for( i = 0; i < num2; i++ ) // Quests not in qd1 but in qd2 are to be erased.
-		success &= mapif_quest_delete(char_id, qd2[i].quest_id);
-
-	WFIFOHEAD(fd,7);
-	WFIFOW(fd,0) = 0x3861;
-	WFIFOL(fd,2) = char_id;
-	WFIFOB(fd,6) = success?1:0;
-	WFIFOSET(fd,7);
-
-	return 0;
+    int i, j, k, num2, num1 = (RFIFOW(fd,2)-8)/sizeof(struct quest);
+    int char_id = RFIFOL(fd,4);
+    struct quest qd1[MAX_QUEST_DB],qd2[MAX_QUEST_DB];
+    bool success = true;
+
+    memset(qd1, 0, sizeof(qd1));
+    memset(qd2, 0, sizeof(qd2));
+    if (num1) memcpy(&qd1, RFIFOP(fd,8), RFIFOW(fd,2)-8);
+    num2 = mapif_quests_fromsql(char_id, qd2);
+
+    for (i = 0; i < num1; i++) {
+        ARR_FIND(0, num2, j, qd1[i].quest_id == qd2[j].quest_id);
+        if (j < num2) { // Update existed quests
+            // Only states and counts are changable.
+            ARR_FIND(0, MAX_QUEST_OBJECTIVES, k, qd1[i].count[k] != qd2[j].count[k]);
+            if (k != MAX_QUEST_OBJECTIVES || qd1[i].state != qd2[j].state)
+                success &= mapif_quest_update(char_id, qd1[i]);
+
+            if (j < (--num2)) {
+                memmove(&qd2[j],&qd2[j+1],sizeof(struct quest)*(num2-j));
+                memset(&qd2[num2], 0, sizeof(struct quest));
+            }
+
+        } else // Add new quests
+            success &= mapif_quest_add(char_id, qd1[i]);
+    }
+
+    for (i = 0; i < num2; i++)  // Quests not in qd1 but in qd2 are to be erased.
+        success &= mapif_quest_delete(char_id, qd2[i].quest_id);
+
+    WFIFOHEAD(fd,7);
+    WFIFOW(fd,0) = 0x3861;
+    WFIFOL(fd,2) = char_id;
+    WFIFOB(fd,6) = success?1:0;
+    WFIFOSET(fd,7);
+
+    return 0;
 }
 
 //Send questlog to map server
 int mapif_parse_quest_load(int fd)
 {
-	int char_id = RFIFOL(fd,2);
-	struct quest tmp_questlog[MAX_QUEST_DB];
-	int num_quests, i, num_complete = 0;
-	int complete[MAX_QUEST_DB];
-
-	memset(tmp_questlog, 0, sizeof(tmp_questlog));
-	memset(complete, 0, sizeof(complete));
-
-	num_quests = mapif_quests_fromsql(char_id, tmp_questlog);
-
-	WFIFOHEAD(fd,num_quests*sizeof(struct quest)+8);
-	WFIFOW(fd,0) = 0x3860;
-	WFIFOW(fd,2) = num_quests*sizeof(struct quest)+8;
-	WFIFOL(fd,4) = char_id;
-
-	//Active and inactive quests
-	for( i = 0; i < num_quests; i++ )
-	{
-		if( tmp_questlog[i].state == Q_COMPLETE )
-		{
-			complete[num_complete++] = i;
-			continue;
-		}
-		memcpy(WFIFOP(fd,(i-num_complete)*sizeof(struct quest)+8), &tmp_questlog[i], sizeof(struct quest));
-	}
-
-	// Completed quests
-	for( i = num_quests - num_complete; i < num_quests; i++ )
-		memcpy(WFIFOP(fd,i*sizeof(struct quest)+8), &tmp_questlog[complete[i-num_quests+num_complete]], sizeof(struct quest));
-
-	WFIFOSET(fd,num_quests*sizeof(struct quest)+8);
-
-	return 0;
+    int char_id = RFIFOL(fd,2);
+    struct quest tmp_questlog[MAX_QUEST_DB];
+    int num_quests, i, num_complete = 0;
+    int complete[MAX_QUEST_DB];
+
+    memset(tmp_questlog, 0, sizeof(tmp_questlog));
+    memset(complete, 0, sizeof(complete));
+
+    num_quests = mapif_quests_fromsql(char_id, tmp_questlog);
+
+    WFIFOHEAD(fd,num_quests*sizeof(struct quest)+8);
+    WFIFOW(fd,0) = 0x3860;
+    WFIFOW(fd,2) = num_quests*sizeof(struct quest)+8;
+    WFIFOL(fd,4) = char_id;
+
+    //Active and inactive quests
+    for (i = 0; i < num_quests; i++) {
+        if (tmp_questlog[i].state == Q_COMPLETE) {
+            complete[num_complete++] = i;
+            continue;
+        }
+        memcpy(WFIFOP(fd,(i-num_complete)*sizeof(struct quest)+8), &tmp_questlog[i], sizeof(struct quest));
+    }
+
+    // Completed quests
+    for (i = num_quests - num_complete; i < num_quests; i++)
+        memcpy(WFIFOP(fd,i*sizeof(struct quest)+8), &tmp_questlog[complete[i-num_quests+num_complete]], sizeof(struct quest));
+
+    WFIFOSET(fd,num_quests*sizeof(struct quest)+8);
+
+    return 0;
 }
 
 int inter_quest_parse_frommap(int fd)
 {
-	switch(RFIFOW(fd,0))
-	{
-		case 0x3060: mapif_parse_quest_load(fd); break;
-		case 0x3061: mapif_parse_quest_save(fd); break;
-		default:
-			return 0;
-	}
-	return 1;
+    switch (RFIFOW(fd,0)) {
+        case 0x3060:
+            mapif_parse_quest_load(fd);
+            break;
+        case 0x3061:
+            mapif_parse_quest_save(fd);
+            break;
+        default:
+            return 0;
+    }
+    return 1;
 }