diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/intif.c | 4 | ||||
| -rw-r--r-- | src/map/intif.h | 2 | ||||
| -rw-r--r-- | src/map/pet.c | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/map/intif.c b/src/map/intif.c index 75379f6c0..042896f4f 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -50,7 +50,7 @@ int CheckForCharServer(void) // pet int intif_create_pet(int account_id,int char_id,short pet_class,short pet_lv,short pet_egg_id, - short pet_equip,short intimate,short hungry,char rename_flag,char incuvate,char *pet_name) + short pet_equip,short intimate,short hungry,char rename_flag,char incubate,char *pet_name) { if (intif->CheckForCharServer()) return 0; @@ -65,7 +65,7 @@ int intif_create_pet(int account_id,int char_id,short pet_class,short pet_lv,sho WFIFOW(inter_fd,18) = intimate; WFIFOW(inter_fd,20) = hungry; WFIFOB(inter_fd,22) = rename_flag; - WFIFOB(inter_fd,23) = incuvate; + WFIFOB(inter_fd,23) = incubate; memcpy(WFIFOP(inter_fd,24),pet_name,NAME_LENGTH); WFIFOSET(inter_fd,24+NAME_LENGTH); diff --git a/src/map/intif.h b/src/map/intif.h index d0eeccc6d..42a38ad41 100644 --- a/src/map/intif.h +++ b/src/map/intif.h @@ -42,7 +42,7 @@ struct intif_interface { /* funcs */ int (*parse) (int fd); int (*create_pet)(int account_id, int char_id, short pet_type, short pet_lv, short pet_egg_id, - short pet_equip, short intimate, short hungry, char rename_flag, char incuvate, char *pet_name); + short pet_equip, short intimate, short hungry, char rename_flag, char incubate, char *pet_name); int (*broadcast) (const char* mes, size_t len, int type); int (*broadcast2) (const char* mes, size_t len, unsigned int fontColor, short fontType, short fontSize, short fontAlign, short fontY); int (*main_message) (struct map_session_data* sd, const char* message); diff --git a/src/map/pet.c b/src/map/pet.c index 6a458eae6..05bbfe7b3 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -303,7 +303,7 @@ int pet_return_egg(struct map_session_data *sd, struct pet_data *pd) clif->additem(sd,0,0,flag); map->addflooritem(&tmp_item,1,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0); } - pd->pet.incuvate = 1; + pd->pet.incubate = 1; unit->free(&pd->bl,CLR_OUTSIGHT); status_calc_pc(sd,SCO_NONE); @@ -327,8 +327,8 @@ int pet_data_init(struct map_session_data *sd, struct s_pet *petinfo) } if (sd->status.pet_id != petinfo->pet_id) { if (sd->status.pet_id) { - //Wrong pet?? Set incuvate to no and send it back for saving. - petinfo->incuvate = 1; + //Wrong pet?? Set incubate to no and send it back for saving. + petinfo->incubate = 1; intif->save_petdata(sd->status.account_id,petinfo); sd->status.pet_id = 0; return 1; @@ -392,12 +392,12 @@ int pet_birth_process(struct map_session_data *sd, struct s_pet *petinfo) Assert((sd->status.pet_id == 0 || sd->pd == 0) || sd->pd->msd == sd); - if(sd->status.pet_id && petinfo->incuvate == 1) { + if(sd->status.pet_id && petinfo->incubate == 1) { sd->status.pet_id = 0; return 1; } - petinfo->incuvate = 0; + petinfo->incubate = 0; petinfo->account_id = sd->status.account_id; petinfo->char_id = sd->status.char_id; sd->status.pet_id = petinfo->pet_id; @@ -433,7 +433,7 @@ int pet_recv_petdata(int account_id,struct s_pet *p,int flag) { sd->status.pet_id = 0; return 1; } - if(p->incuvate == 1) { + if(p->incubate == 1) { int i; //Delete egg from inventory. [Skotlex] for (i = 0; i < MAX_INVENTORY; i++) { @@ -596,7 +596,7 @@ int pet_menu(struct map_session_data *sd,int menunum) return 1; //You lost the pet already. - if(!sd->status.pet_id || sd->pd->pet.intimate <= 0 || sd->pd->pet.incuvate) + if(!sd->status.pet_id || sd->pd->pet.intimate <= 0 || sd->pd->pet.incubate) return 1; egg_id = itemdb->exists(sd->pd->petDB->EggID); |