diff options
-rw-r--r-- | src/char/int_pet.c | 4 | ||||
-rw-r--r-- | src/char_sql/int_pet.c | 4 | ||||
-rw-r--r-- | src/map/map.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/char/int_pet.c b/src/char/int_pet.c index a81acf3ed..0c029e445 100644 --- a/src/char/int_pet.c +++ b/src/char/int_pet.c @@ -333,8 +333,8 @@ int mapif_delete_pet(int fd,int pet_id) int mapif_parse_CreatePet(int fd)
{
RFIFOHEAD(fd);
- mapif_create_pet(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOW(fd,10),RFIFOW(fd,12),RFIFOW(fd,14),RFIFOW(fd,16),RFIFOL(fd,18),
- RFIFOL(fd,20),RFIFOB(fd,22),RFIFOB(fd,23),(char*)RFIFOP(fd,24));
+ mapif_create_pet(fd,RFIFOL(fd,2),RFIFOL(fd,6),RFIFOW(fd,10),RFIFOW(fd,12),RFIFOW(fd,14),RFIFOW(fd,16),RFIFOW(fd,18),
+ RFIFOW(fd,20),RFIFOB(fd,22),RFIFOB(fd,23),(char*)RFIFOP(fd,24));
return 0;
}
diff --git a/src/char_sql/int_pet.c b/src/char_sql/int_pet.c index cc0e9330e..e48347b82 100644 --- a/src/char_sql/int_pet.c +++ b/src/char_sql/int_pet.c @@ -317,8 +317,8 @@ int mapif_delete_pet(int fd, int pet_id){ }
int mapif_parse_CreatePet(int fd){
- mapif_create_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOW(fd, 10), RFIFOW(fd, 12), RFIFOW(fd, 14), RFIFOW(fd, 16), RFIFOL(fd, 18),
- RFIFOL(fd, 20), RFIFOB(fd, 22), RFIFOB(fd, 23), (char*)RFIFOP(fd, 24));
+ mapif_create_pet(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), RFIFOW(fd, 10), RFIFOW(fd, 12), RFIFOW(fd, 14), RFIFOW(fd, 16), RFIFOW(fd, 18),
+ RFIFOW(fd, 20), RFIFOB(fd, 22), RFIFOB(fd, 23), (char*)RFIFOP(fd, 24));
return 0;
}
diff --git a/src/map/map.c b/src/map/map.c index 06ddd7cb1..00df83fc0 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1765,7 +1765,7 @@ struct map_session_data** map_getallusers(int *users) { all_sd = aRealloc(all_sd, all_count*sizeof(struct map_session_data*));
}
*users = pc_db->getall(pc_db,(void**)all_sd,all_count,map_getallpc_sub);
- if (*users > all_count) //Which should be impossible...
+ if (*users > (signed int)all_count) //Which should be impossible...
*users = all_count;
return all_sd;
}
|