Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Converted pet_data::petDB into a getter function (#2901)

Browse Source 
* Converted pet_data::petDB into a getter function
Fixed #2900
Thanks to @Lemongrass3110
This commit is contained in:
Jittapan Pluemsumran 2018-02-23 17:14:46 +07:00 committed by GitHub
parent c16b7b1795
commit 1e766a7b4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/map/clif.cpp
View File

@ -7902,20 +7902,23 @@ void clif_send_petstatus(struct map_session_data *sd)
void clif_pet_emotion(struct pet_data *pd,int param) void clif_pet_emotion(struct pet_data *pd,int param)
{ {
unsigned char buf[16]; unsigned char buf[16];
s_pet_db *pet_db_ptr;
nullpo_retv(pd); nullpo_retv(pd);
pet_db_ptr = pd->get_pet_db();
memset(buf,0,packet_len(0x1aa)); memset(buf,0,packet_len(0x1aa));
WBUFW(buf,0)=0x1aa; WBUFW(buf,0)=0x1aa;
WBUFL(buf,2)=pd->bl.id; WBUFL(buf,2)=pd->bl.id;
if(param >= 100 && pd->petDB->talk_convert_class) { if(param >= 100 && pet_db_ptr->talk_convert_class) {
if(pd->petDB->talk_convert_class < 0) if(pet_db_ptr->talk_convert_class < 0)
return; return;
else if(pd->petDB->talk_convert_class > 0) { else if(pet_db_ptr->talk_convert_class > 0) {
// replace mob_id component of talk/act data // replace mob_id component of talk/act data
param -= (pd->pet.class_ - 100)*100; param -= (pd->pet.class_ - 100)*100;
param += (pd->petDB->talk_convert_class - 100)*100; param += (pet_db_ptr->talk_convert_class - 100)*100;
} }
} }
WBUFL(buf,6)=param; WBUFL(buf,6)=param;

2
src/map/pc.cpp
View File

@ -7717,7 +7717,7 @@ int pc_dead(struct map_session_data *sd,struct block_list *src)
if(sd->status.pet_id > 0 && sd->pd) { if(sd->status.pet_id > 0 && sd->pd) {
struct pet_data *pd = sd->pd; struct pet_data *pd = sd->pd;
if( !map[sd->bl.m].flag.noexppenalty ) { if( !map[sd->bl.m].flag.noexppenalty ) {
pet_set_intimate(pd, pd->pet.intimate - pd->petDB->die); pet_set_intimate(pd, pd->pet.intimate - pd->get_pet_db()->die);
if( pd->pet.intimate < 0 ) if( pd->pet.intimate < 0 )
pd->pet.intimate = 0; pd->pet.intimate = 0;
clif_send_petdata(sd,sd->pd,1,pd->pet.intimate); clif_send_petdata(sd,sd->pd,1,pd->pet.intimate);

56
src/map/pet.cpp
View File

@ -167,11 +167,14 @@ int pet_attackskill(struct pet_data *pd, int target_id)
int pet_target_check(struct pet_data *pd,struct block_list *bl,int type) int pet_target_check(struct pet_data *pd,struct block_list *bl,int type)
{ {
int rate; int rate;
s_pet_db* pet_db_ptr;
nullpo_ret(pd); nullpo_ret(pd);
Assert((pd->master == 0) || (pd->master->pd == pd)); Assert((pd->master == 0) || (pd->master->pd == pd));
pet_db_ptr = pd->get_pet_db();
if(bl == NULL || bl->type != BL_MOB || bl->prev == NULL || if(bl == NULL || bl->type != BL_MOB || bl->prev == NULL ||
pd->pet.intimate < battle_config.pet_support_min_friendly || pd->pet.intimate < battle_config.pet_support_min_friendly ||
pd->pet.hungry < 1 || pd->pet.hungry < 1 ||
@ -191,21 +194,21 @@ int pet_target_check(struct pet_data *pd,struct block_list *bl,int type)
return 0; return 0;
if(!type) { if(!type) {
rate = pd->petDB->attack_rate; rate = pet_db_ptr->attack_rate;
rate = rate * pd->rate_fix / 1000; rate = rate * pd->rate_fix / 1000;
if(pd->petDB->attack_rate > 0 && rate <= 0) if(pet_db_ptr->attack_rate > 0 && rate <= 0)
rate = 1; rate = 1;
} else { } else {
rate = pd->petDB->defence_attack_rate; rate = pet_db_ptr->defence_attack_rate;
rate = rate * pd->rate_fix / 1000; rate = rate * pd->rate_fix / 1000;
if(pd->petDB->defence_attack_rate > 0 && rate <= 0) if(pet_db_ptr->defence_attack_rate > 0 && rate <= 0)
rate = 1; rate = 1;
} }
if(rnd()%10000 < rate) { if(rnd()%10000 < rate) {
if(pd->target_id == 0 || rnd()%10000 < pd->petDB->change_target_rate) if(pd->target_id == 0 || rnd()%10000 < pet_db_ptr->change_target_rate)
pd->target_id = bl->id; pd->target_id = bl->id;
} }
@ -249,6 +252,7 @@ static int pet_hungry(int tid, unsigned int tick, int id, intptr_t data)
{ {
struct map_session_data *sd; struct map_session_data *sd;
struct pet_data *pd; struct pet_data *pd;
s_pet_db *pet_db_ptr;
int interval; int interval;
sd = map_id2sd(id); sd = map_id2sd(id);
@ -260,6 +264,7 @@ static int pet_hungry(int tid, unsigned int tick, int id, intptr_t data)
return 1; return 1;
pd = sd->pd; pd = sd->pd;
pet_db_ptr = pd->get_pet_db();
if(pd->pet_hungry_timer != tid) { if(pd->pet_hungry_timer != tid) {
ShowError("pet_hungry_timer %d != %d\n",pd->pet_hungry_timer,tid); ShowError("pet_hungry_timer %d != %d\n",pd->pet_hungry_timer,tid);
@ -290,9 +295,9 @@ static int pet_hungry(int tid, unsigned int tick, int id, intptr_t data)
clif_send_petdata(sd,pd,2,pd->pet.hungry); clif_send_petdata(sd,pd,2,pd->pet.hungry);
if(battle_config.pet_hungry_delay_rate != 100) if(battle_config.pet_hungry_delay_rate != 100)
interval = (pd->petDB->hungry_delay*battle_config.pet_hungry_delay_rate)/100; interval = (pet_db_ptr->hungry_delay*battle_config.pet_hungry_delay_rate)/100;
else else
interval = pd->petDB->hungry_delay; interval = pet_db_ptr->hungry_delay;
if(interval <= 0) if(interval <= 0)
interval = 1; interval = 1;
@ -354,7 +359,7 @@ static int pet_performance(struct map_session_data *sd, struct pet_data *pd)
int val; int val;
if (pd->pet.intimate > 900) if (pd->pet.intimate > 900)
val = (pd->petDB->s_perfor > 0) ? 4 : 3; val = (pd->get_pet_db()->s_perfor > 0) ? 4 : 3;
else if(pd->pet.intimate > 750) //TODO: this is way too high else if(pd->pet.intimate > 750) //TODO: this is way too high
val = 2; val = 2;
else else
@ -380,7 +385,7 @@ static int pet_return_egg(struct map_session_data *sd, struct pet_data *pd)
pet_lootitem_drop(pd,sd); pet_lootitem_drop(pd,sd);
memset(&tmp_item,0,sizeof(tmp_item)); memset(&tmp_item,0,sizeof(tmp_item));
tmp_item.nameid = pd->petDB->EggID; tmp_item.nameid = pd->get_pet_db()->EggID;
tmp_item.identify = 1; tmp_item.identify = 1;
tmp_item.card[0] = CARD0_PET; tmp_item.card[0] = CARD0_PET;
tmp_item.card[1] = GetWord(pd->pet.pet_id,0); tmp_item.card[1] = GetWord(pd->pet.pet_id,0);
@ -450,7 +455,6 @@ bool pet_data_init(struct map_session_data *sd, struct s_pet *pet)
pd->bl.id = npc_get_new_npc_id(); pd->bl.id = npc_get_new_npc_id();
pd->master = sd; pd->master = sd;
pd->petDB = pet_db_ptr;
pd->db = mob_db(pet->class_); pd->db = mob_db(pet->class_);
memcpy(&pd->pet, pet, sizeof(struct s_pet)); memcpy(&pd->pet, pet, sizeof(struct s_pet));
status_set_viewdata(&pd->bl, pet->class_); status_set_viewdata(&pd->bl, pet->class_);
@ -473,7 +477,7 @@ bool pet_data_init(struct map_session_data *sd, struct s_pet *pet)
if( battle_config.pet_status_support ) if( battle_config.pet_status_support )
run_script(pet_db_ptr->pet_script,0,sd->bl.id,0); run_script(pet_db_ptr->pet_script,0,sd->bl.id,0);
if( pd->petDB ) { if( pd->get_pet_db() ) {
if( pet_db_ptr->pet_loyal_script ) if( pet_db_ptr->pet_loyal_script )
status_calc_pc(sd,SCO_NONE); status_calc_pc(sd,SCO_NONE);
@ -778,7 +782,7 @@ int pet_menu(struct map_session_data *sd,int menunum)
if(!sd->status.pet_id || sd->pd->pet.intimate <= 0 || sd->pd->pet.incubate) if(!sd->status.pet_id || sd->pd->pet.intimate <= 0 || sd->pd->pet.incubate)
return 1; return 1;
egg_id = itemdb_exists(sd->pd->petDB->EggID); egg_id = itemdb_exists(sd->pd->get_pet_db()->EggID);
if (egg_id) { if (egg_id) {
if ((egg_id->flag.trade_restriction&0x01) && !pc_inventoryblank(sd)) { if ((egg_id->flag.trade_restriction&0x01) && !pc_inventoryblank(sd)) {
@ -874,6 +878,7 @@ int pet_change_name_ack(struct map_session_data *sd, char* name, int flag)
int pet_equipitem(struct map_session_data *sd,int index) int pet_equipitem(struct map_session_data *sd,int index)
{ {
struct pet_data *pd; struct pet_data *pd;
s_pet_db *pet_db_ptr;
unsigned short nameid; unsigned short nameid;
nullpo_retr(1, sd); nullpo_retr(1, sd);
@ -883,9 +888,12 @@ int pet_equipitem(struct map_session_data *sd,int index)
if (!pd) if (!pd)
return 1; return 1;
if((pet_db_ptr = pd->get_pet_db()) == nullptr)
return 1;
nameid = sd->inventory.u.items_inventory[index].nameid; nameid = sd->inventory.u.items_inventory[index].nameid;
if(pd->petDB->AcceID == 0 || nameid != pd->petDB->AcceID || pd->pet.equip != 0) { if(pet_db_ptr->AcceID == 0 || nameid != pet_db_ptr->AcceID || pd->pet.equip != 0) {
clif_equipitemack(sd,0,0,ITEM_EQUIP_ACK_FAIL); clif_equipitemack(sd,0,0,ITEM_EQUIP_ACK_FAIL);
return 1; return 1;
} }
@ -971,9 +979,13 @@ static int pet_unequipitem(struct map_session_data *sd, struct pet_data *pd)
*/ */
static int pet_food(struct map_session_data *sd, struct pet_data *pd) static int pet_food(struct map_session_data *sd, struct pet_data *pd)
{ {
nullpo_retr(1, sd);
nullpo_retr(1, pd);
s_pet_db *pet_db_ptr = pd->get_pet_db();
int i,k; int i,k;
k = pd->petDB->FoodID; k = pet_db_ptr->FoodID;
i = pc_search_inventory(sd,k); i = pc_search_inventory(sd,k);
if( i < 0 ) { if( i < 0 ) {
@ -985,12 +997,12 @@ static int pet_food(struct map_session_data *sd, struct pet_data *pd)
pc_delitem(sd,i,1,0,0,LOG_TYPE_CONSUME); pc_delitem(sd,i,1,0,0,LOG_TYPE_CONSUME);
if( pd->pet.hungry > 90 ) if( pd->pet.hungry > 90 )
pet_set_intimate(pd, pd->pet.intimate - pd->petDB->r_full); pet_set_intimate(pd, pd->pet.intimate - pet_db_ptr->r_full);
else { else {
if( battle_config.pet_friendly_rate != 100 ) if( battle_config.pet_friendly_rate != 100 )
k = (pd->petDB->r_hungry * battle_config.pet_friendly_rate) / 100; k = (pet_db_ptr->r_hungry * battle_config.pet_friendly_rate) / 100;
else else
k = pd->petDB->r_hungry; k = pet_db_ptr->r_hungry;
if( pd->pet.hungry > 75 ) { if( pd->pet.hungry > 75 ) {
k = k >> 1; k = k >> 1;
@ -1009,16 +1021,16 @@ static int pet_food(struct map_session_data *sd, struct pet_data *pd)
pd->pet.intimate = 1000; pd->pet.intimate = 1000;
status_calc_pet(pd,SCO_NONE); status_calc_pet(pd,SCO_NONE);
pd->pet.hungry += pd->petDB->fullness; pd->pet.hungry += pet_db_ptr->fullness;
if( pd->pet.hungry > 100 ) if( pd->pet.hungry > 100 )
pd->pet.hungry = 100; pd->pet.hungry = 100;
log_feeding(sd, LOG_FEED_PET, pd->petDB->FoodID); log_feeding(sd, LOG_FEED_PET, pet_db_ptr->FoodID);
clif_send_petdata(sd,pd,2,pd->pet.hungry); clif_send_petdata(sd,pd,2,pd->pet.hungry);
clif_send_petdata(sd,pd,1,pd->pet.intimate); clif_send_petdata(sd,pd,1,pd->pet.intimate);
clif_pet_food(sd,pd->petDB->FoodID,1); clif_pet_food(sd, pet_db_ptr->FoodID,1);
return 0; return 0;
} }
@ -1136,11 +1148,11 @@ static int pet_ai_sub_hard(struct pet_data *pd, struct map_session_data *sd, uns
} }
// Return speed to normal. // Return speed to normal.
if (pd->status.speed != pd->petDB->speed) { if (pd->status.speed != pd->get_pet_db()->speed) {
if (pd->ud.walktimer != INVALID_TIMER) if (pd->ud.walktimer != INVALID_TIMER)
return 0; // Wait until the pet finishes walking back to master. return 0; // Wait until the pet finishes walking back to master.
pd->status.speed = pd->petDB->speed; pd->status.speed = pd->get_pet_db()->speed;
pd->ud.state.change_walk_target = pd->ud.state.speed_changed = 1; pd->ud.state.change_walk_target = pd->ud.state.speed_changed = 1;
} }

9
src/map/pet.hpp
View File

@ -98,6 +98,8 @@ struct pet_loot {
unsigned short max; unsigned short max;
}; };
struct s_pet_db *pet_db(uint16 pet_id);
struct pet_data { struct pet_data {
struct block_list bl; struct block_list bl;
struct unit_data ud; struct unit_data ud;
@ -105,7 +107,6 @@ struct pet_data {
struct s_pet pet; struct s_pet pet;
struct status_data status; struct status_data status;
struct mob_db *db; struct mob_db *db;
struct s_pet_db *petDB;
int pet_hungry_timer; int pet_hungry_timer;
int target_id; int target_id;
struct { struct {
@ -123,9 +124,11 @@ struct pet_data {
int masterteleport_timer; int masterteleport_timer;
struct map_session_data *master; struct map_session_data *master;
};
struct s_pet_db *pet_db(uint16 pet_id); s_pet_db* get_pet_db() {
return pet_db(this->pet.class_);
}
};
bool pet_create_egg(struct map_session_data *sd, unsigned short item_id); bool pet_create_egg(struct map_session_data *sd, unsigned short item_id);
int pet_hungry_val(struct pet_data *pd); int pet_hungry_val(struct pet_data *pd);

10
src/map/status.cpp
View File

@ -2881,7 +2881,7 @@ void status_calc_pet_(struct pet_data *pd, enum e_status_calc_opt opt)
memcpy(&pd->status, &pd->db->status, sizeof(struct status_data)); memcpy(&pd->status, &pd->db->status, sizeof(struct status_data));
pd->status.mode = MD_CANMOVE; // Pets discard all modes, except walking pd->status.mode = MD_CANMOVE; // Pets discard all modes, except walking
pd->status.class_ = CLASS_NORMAL; pd->status.class_ = CLASS_NORMAL;
pd->status.speed = pd->petDB->speed; pd->status.speed = pd->get_pet_db()->speed;
if(battle_config.pet_attack_support || battle_config.pet_damage_support) { if(battle_config.pet_attack_support || battle_config.pet_damage_support) {
// Attack support requires the pet to be able to attack // Attack support requires the pet to be able to attack
@ -3723,9 +3723,11 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
if( sd->pd ) { // Pet Bonus if( sd->pd ) { // Pet Bonus
struct pet_data *pd = sd->pd; struct pet_data *pd = sd->pd;
if( pd && pd->petDB && pd->petDB->pet_loyal_script && pd->pet.intimate >= battle_config.pet_equip_min_friendly ) s_pet_db *pet_db_ptr = pd->get_pet_db();
run_script(pd->petDB->pet_loyal_script,0,sd->bl.id,0);
if( pd && pd->pet.intimate > 0 && (!battle_config.pet_equip_required || pd->pet.equip > 0) && pd->state.skillbonus == 1 && pd->bonus ) if( pet_db_ptr != nullptr && pet_db_ptr->pet_loyal_script && pd->pet.intimate >= battle_config.pet_equip_min_friendly )
run_script(pd->get_pet_db()->pet_loyal_script,0,sd->bl.id,0);
if( pd->pet.intimate > 0 && (!battle_config.pet_equip_required || pd->pet.equip > 0) && pd->state.skillbonus == 1 && pd->bonus )
pc_bonus(sd,pd->bonus->type, pd->bonus->val); pc_bonus(sd,pd->bonus->type, pd->bonus->val);
} }