From a181f75908d065293685d5adc7c90726fa29c064 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 8 Nov 2014 20:27:47 +0300 Subject: Add most functions from int_quest.c to interfaces. --- src/char/char.c | 2 ++ src/char/int_quest.c | 49 +++++++++++++++++++++++++++++++++---------------- src/char/int_quest.h | 8 +++++++- src/char/inter.c | 2 +- src/char/mapif.c | 16 ++++++++++++++++ src/char/mapif.h | 9 +++++++++ 6 files changed, 68 insertions(+), 18 deletions(-) diff --git a/src/char/char.c b/src/char/char.c index 094003ec2..6f11768d2 100644 --- a/src/char/char.c +++ b/src/char/char.c @@ -24,6 +24,7 @@ #include "int_mercenary.h" #include "int_party.h" #include "int_pet.h" +#include "int_quest.h" #include "int_storage.h" #include "inter.h" #include "loginif.h" @@ -6015,6 +6016,7 @@ void char_load_defaults(void) inter_mercenary_defaults(); inter_party_defaults(); inter_pet_defaults(); + inter_quest_defaults(); } void char_defaults(void) diff --git a/src/char/int_quest.c b/src/char/int_quest.c index d82bf507b..978ee8f37 100644 --- a/src/char/int_quest.c +++ b/src/char/int_quest.c @@ -12,6 +12,7 @@ #include "char.h" #include "inter.h" +#include "mapif.h" #include "../common/db.h" #include "../common/malloc.h" #include "../common/mmo.h" @@ -21,6 +22,8 @@ #include "../common/strlib.h" #include "../common/timer.h" +struct inter_quest_interface inter_quest_s; + /** * Loads the entire questlog for a character. * @@ -29,7 +32,8 @@ * @return Array of found entries. It has *count entries, and it is care of the * caller to aFree() it afterwards. */ -struct quest *mapif_quests_fromsql(int char_id, int *count) { +struct quest *mapif_quests_fromsql(int char_id, int *count) +{ struct quest *questlog = NULL; struct quest tmp_quest; SqlStmt *stmt; @@ -106,7 +110,8 @@ struct quest *mapif_quests_fromsql(int char_id, int *count) { * @param quest_id Quest ID * @return false in case of errors, true otherwise */ -bool mapif_quest_delete(int char_id, int quest_id) { +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; @@ -122,7 +127,8 @@ bool mapif_quest_delete(int char_id, int quest_id) { * @param qd Quest data * @return false in case of errors, true otherwise */ -bool mapif_quest_add(int char_id, struct quest qd) { +bool mapif_quest_add(int char_id, struct quest qd) +{ StringBuf buf; int i; @@ -153,7 +159,8 @@ bool mapif_quest_add(int char_id, struct quest qd) { * @param qd Quest data * @return false in case of errors, true otherwise */ -bool mapif_quest_update(int char_id, struct quest qd) { +bool mapif_quest_update(int char_id, struct quest qd) +{ StringBuf buf; int i; @@ -190,7 +197,8 @@ void mapif_quest_save_ack(int fd, int char_id, bool success) * * @see inter_parse_frommap */ -int mapif_parse_quest_save(int fd) { +int mapif_parse_quest_save(int fd) +{ int i, j, k, old_n, new_n = (RFIFOW(fd,2)-8)/sizeof(struct quest); int char_id = RFIFOL(fd,4); struct quest *old_qd = NULL, *new_qd = NULL; @@ -199,7 +207,7 @@ int mapif_parse_quest_save(int fd) { if (new_n > 0) new_qd = (struct quest*)RFIFOP(fd,8); - old_qd = mapif_quests_fromsql(char_id, &old_n); + old_qd = mapif->quests_fromsql(char_id, &old_n); for (i = 0; i < new_n; i++) { ARR_FIND( 0, old_n, j, new_qd[i].quest_id == old_qd[j].quest_id ); @@ -209,7 +217,7 @@ int mapif_parse_quest_save(int fd) { // Only states and counts are changeable. ARR_FIND( 0, MAX_QUEST_OBJECTIVES, k, new_qd[i].count[k] != old_qd[j].count[k] ); if (k != MAX_QUEST_OBJECTIVES || new_qd[i].state != old_qd[j].state) - success &= mapif_quest_update(char_id, new_qd[i]); + success &= mapif->quest_update(char_id, new_qd[i]); if (j < (--old_n)) { // Compact array @@ -218,18 +226,18 @@ int mapif_parse_quest_save(int fd) { } } else { // Add new quests - success &= mapif_quest_add(char_id, new_qd[i]); + success &= mapif->quest_add(char_id, new_qd[i]); } } for (i = 0; i < old_n; i++) // Quests not in new_qd but in old_qd are to be erased. - success &= mapif_quest_delete(char_id, old_qd[i].quest_id); + success &= mapif->quest_delete(char_id, old_qd[i].quest_id); if (old_qd) aFree(old_qd); // Send ack - mapif_quest_save_ack(fd, char_id, success); + mapif->quest_save_ack(fd, char_id, success); return 0; } @@ -256,13 +264,14 @@ void mapif_send_quests(int fd, int char_id, struct quest *tmp_questlog, int num_ * * @see inter_parse_frommap */ -int mapif_parse_quest_load(int fd) { +int mapif_parse_quest_load(int fd) +{ int char_id = RFIFOL(fd,2); struct quest *tmp_questlog = NULL; int num_quests; - tmp_questlog = mapif_quests_fromsql(char_id, &num_quests); - mapif_send_quests(fd, char_id, tmp_questlog, num_quests); + tmp_questlog = mapif->quests_fromsql(char_id, &num_quests); + mapif->send_quests(fd, char_id, tmp_questlog, num_quests); if (tmp_questlog) aFree(tmp_questlog); @@ -275,12 +284,20 @@ int mapif_parse_quest_load(int fd) { * * @see inter_parse_frommap */ -int inter_quest_parse_frommap(int fd) { +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; + case 0x3060: mapif->parse_quest_load(fd); break; + case 0x3061: mapif->parse_quest_save(fd); break; default: return 0; } return 1; } + +void inter_quest_defaults(void) +{ + inter_quest = &inter_quest_s; + + inter_quest->parse_frommap = inter_quest_parse_frommap; +} diff --git a/src/char/int_quest.h b/src/char/int_quest.h index f0dd370ea..a66c34a75 100644 --- a/src/char/int_quest.h +++ b/src/char/int_quest.h @@ -4,7 +4,13 @@ #ifndef CHAR_QUEST_H #define CHAR_QUEST_H -int inter_quest_parse_frommap(int fd); +void inter_quest_defaults(void); + +struct inter_quest_interface { + int (*parse_frommap) (int fd); +}; + +struct inter_quest_interface *inter_quest; #endif /* CHAR_QUEST_H */ diff --git a/src/char/inter.c b/src/char/inter.c index 60c375bc1..db5dc822c 100644 --- a/src/char/inter.c +++ b/src/char/inter.c @@ -1462,7 +1462,7 @@ int inter_parse_frommap(int fd) || inter_elemental->parse_frommap(fd) || inter_mail->parse_frommap(fd) || inter_auction->parse_frommap(fd) - || inter_quest_parse_frommap(fd) + || inter_quest->parse_frommap(fd) ) break; else diff --git a/src/char/mapif.c b/src/char/mapif.c index 0a4d5a633..a50f10a38 100644 --- a/src/char/mapif.c +++ b/src/char/mapif.c @@ -155,6 +155,14 @@ int mapif_parse_CreatePet(int fd); int mapif_parse_LoadPet(int fd); int mapif_parse_SavePet(int fd); int mapif_parse_DeletePet(int fd); +struct quest *mapif_quests_fromsql(int char_id, int *count); +bool mapif_quest_delete(int char_id, int quest_id); +bool mapif_quest_add(int char_id, struct quest qd); +bool mapif_quest_update(int char_id, struct quest qd); +void mapif_quest_save_ack(int fd, int char_id, bool success); +int mapif_parse_quest_save(int fd); +void mapif_send_quests(int fd, int char_id, struct quest *tmp_questlog, int num_quests); +int mapif_parse_quest_load(int fd); void mapif_defaults(void) { mapif = &mapif_s; @@ -294,4 +302,12 @@ void mapif_defaults(void) { mapif->parse_LoadPet = mapif_parse_LoadPet; mapif->parse_SavePet = mapif_parse_SavePet; mapif->parse_DeletePet = mapif_parse_DeletePet; + mapif->quests_fromsql = mapif_quests_fromsql; + mapif->quest_delete = mapif_quest_delete; + mapif->quest_add = mapif_quest_add; + mapif->quest_update = mapif_quest_update; + mapif->quest_save_ack = mapif_quest_save_ack; + mapif->parse_quest_save = mapif_parse_quest_save; + mapif->send_quests = mapif_send_quests; + mapif->parse_quest_load = mapif_parse_quest_load; } diff --git a/src/char/mapif.h b/src/char/mapif.h index 8c4c8922e..b67d07611 100644 --- a/src/char/mapif.h +++ b/src/char/mapif.h @@ -11,6 +11,7 @@ struct s_elemental; struct s_homunculus; struct s_mercenary; struct s_pet; +struct quest; struct mail_message; /* mapif interface */ @@ -151,6 +152,14 @@ struct mapif_interface { int (*parse_LoadPet) (int fd); int (*parse_SavePet) (int fd); int (*parse_DeletePet) (int fd); + struct quest *(*quests_fromsql) (int char_id, int *count); + bool (*quest_delete) (int char_id, int quest_id); + bool (*quest_add) (int char_id, struct quest qd); + bool (*quest_update) (int char_id, struct quest qd); + void (*quest_save_ack) (int fd, int char_id, bool success); + int (*parse_quest_save) (int fd); + void (*send_quests) (int fd, int char_id, struct quest *tmp_questlog, int num_quests); + int (*parse_quest_load) (int fd); } mapif_s; struct mapif_interface *mapif; -- cgit v1.2.3-70-g09d2