From d736b2ef87d2b331f2e8fca9c42784d481778a94 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 22 Feb 2016 00:52:53 +0100 Subject: Split mapif->elemental_save() into two functions (save and create) Signed-off-by: Haru --- src/char/int_elemental.c | 69 ++++++++++++++++++++++++++++++++---------------- src/char/mapif.c | 4 ++- src/char/mapif.h | 3 ++- 3 files changed, 51 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/char/int_elemental.c b/src/char/int_elemental.c index 82208d3f5..8d868bc06 100644 --- a/src/char/int_elemental.c +++ b/src/char/int_elemental.c @@ -40,32 +40,54 @@ struct inter_elemental_interface inter_elemental_s; struct inter_elemental_interface *inter_elemental; -bool mapif_elemental_save(struct s_elemental* ele) { - bool flag = true; - +/** + * Creates a new elemental with the given data. + * + * @remark + * The elemental ID is expected to be 0, and will be filled with the newly + * assigned ID. + * + * @param[in,out] ele The new elemental's data. + * @retval false in case of errors. + */ +bool mapif_elemental_create(struct s_elemental *ele) +{ nullpo_retr(false, ele); - if( ele->elemental_id == 0 ) { // Create new DB entry - if( SQL_ERROR == SQL->Query(inter->sql_handle, + Assert_retr(false, ele->elemental_id == 0); + + if (SQL_ERROR == SQL->Query(inter->sql_handle, "INSERT INTO `%s` (`char_id`,`class`,`mode`,`hp`,`sp`,`max_hp`,`max_sp`,`atk1`,`atk2`,`matk`,`aspd`,`def`,`mdef`,`flee`,`hit`,`life_time`)" "VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d')", - elemental_db, ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->atk, ele->atk2, ele->matk, ele->amotion, ele->def, ele->mdef, ele->flee, ele->hit, ele->life_time) ) - { - Sql_ShowDebug(inter->sql_handle); - flag = false; - } - else - ele->elemental_id = (int)SQL->LastInsertId(inter->sql_handle); - } else if( SQL_ERROR == SQL->Query(inter->sql_handle, - "UPDATE `%s` SET `char_id` = '%d', `class` = '%d', `mode` = '%d', `hp` = '%d', `sp` = '%d'," - "`max_hp` = '%d', `max_sp` = '%d', `atk1` = '%d', `atk2` = '%d', `matk` = '%d', `aspd` = '%d', `def` = '%d'," - "`mdef` = '%d', `flee` = '%d', `hit` = '%d', `life_time` = '%d' WHERE `ele_id` = '%d'", - elemental_db, ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->atk, ele->atk2, - ele->matk, ele->amotion, ele->def, ele->mdef, ele->flee, ele->hit, ele->life_time, ele->elemental_id) ) - { // Update DB entry + elemental_db, ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->atk, + ele->atk2, ele->matk, ele->amotion, ele->def, ele->mdef, ele->flee, ele->hit, ele->life_time)) { + Sql_ShowDebug(inter->sql_handle); + return false; + } + ele->elemental_id = (int)SQL->LastInsertId(inter->sql_handle); + return true; +} + +/** + * Saves an existing elemental. + * + * @param ele The elemental's data. + * @retval false in case of errors. + */ +bool mapif_elemental_save(const struct s_elemental *ele) +{ + nullpo_retr(false, ele); + Assert_retr(false, ele->elemental_id > 0); + + if (SQL_ERROR == SQL->Query(inter->sql_handle, + "UPDATE `%s` SET `char_id` = '%d', `class` = '%d', `mode` = '%d', `hp` = '%d', `sp` = '%d'," + "`max_hp` = '%d', `max_sp` = '%d', `atk1` = '%d', `atk2` = '%d', `matk` = '%d', `aspd` = '%d', `def` = '%d'," + "`mdef` = '%d', `flee` = '%d', `hit` = '%d', `life_time` = '%d' WHERE `ele_id` = '%d'", + elemental_db, ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->atk, ele->atk2, + ele->matk, ele->amotion, ele->def, ele->mdef, ele->flee, ele->hit, ele->life_time, ele->elemental_id)) { Sql_ShowDebug(inter->sql_handle); - flag = false; + return false; } - return flag; + return true; } bool mapif_elemental_load(int ele_id, int char_id, struct s_elemental *ele) { @@ -133,8 +155,9 @@ void mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char flag) { WFIFOSET(fd,size); } -void mapif_parse_elemental_create(int fd, struct s_elemental* ele) { - bool result = mapif->elemental_save(ele); +void mapif_parse_elemental_create(int fd, struct s_elemental *ele) +{ + bool result = mapif->elemental_create(ele); mapif->elemental_send(fd, ele, result); } diff --git a/src/char/mapif.c b/src/char/mapif.c index 5ba687a77..4edcb6027 100644 --- a/src/char/mapif.c +++ b/src/char/mapif.c @@ -57,7 +57,8 @@ void mapif_auction_close(int fd, int char_id, unsigned char result); void mapif_parse_auction_close(int fd); void mapif_auction_bid(int fd, int char_id, int bid, unsigned char result); void mapif_parse_auction_bid(int fd); -bool mapif_elemental_save(struct s_elemental* ele); +bool mapif_elemental_create(struct s_elemental *ele); +bool mapif_elemental_save(const struct s_elemental *ele); bool mapif_elemental_load(int ele_id, int char_id, struct s_elemental *ele); bool mapif_elemental_delete(int ele_id); void mapif_elemental_send(int fd, struct s_elemental *ele, unsigned char flag); @@ -232,6 +233,7 @@ void mapif_defaults(void) { mapif->parse_auction_close = mapif_parse_auction_close; mapif->auction_bid = mapif_auction_bid; mapif->parse_auction_bid = mapif_parse_auction_bid; + mapif->elemental_create = mapif_elemental_create; mapif->elemental_save = mapif_elemental_save; mapif->elemental_load = mapif_elemental_load; mapif->elemental_delete = mapif_elemental_delete; diff --git a/src/char/mapif.h b/src/char/mapif.h index eb5d30b2c..e5767bf05 100644 --- a/src/char/mapif.h +++ b/src/char/mapif.h @@ -51,7 +51,8 @@ struct mapif_interface { void (*parse_auction_close) (int fd); void (*auction_bid) (int fd, int char_id, int bid, unsigned char result); void (*parse_auction_bid) (int fd); - bool (*elemental_save) (struct s_elemental* ele); + bool (*elemental_create) (struct s_elemental *ele); + bool (*elemental_save) (const struct s_elemental *ele); bool (*elemental_load) (int ele_id, int char_id, struct s_elemental *ele); bool (*elemental_delete) (int ele_id); void (*elemental_send) (int fd, struct s_elemental *ele, unsigned char flag); -- cgit v1.2.3-60-g2f50