From 683dbd2fad6c911b279e87f03ec8a6d0a17a435d Mon Sep 17 00:00:00 2001 From: shennetsind Date: Wed, 4 Jan 2012 02:29:06 +0000 Subject: Pets & Homun renaming with empty name fix, bugreport:3032 Also: - Fixed client crash when sending weapon + dragon/mado/newmount - Fixed 2011-11-16 charinfo_size bug on char selection screen git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15377 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/homunculus.c | 5 ++++- src/map/pet.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src/map') diff --git a/src/map/homunculus.c b/src/map/homunculus.c index 50b7c2c7a..f5d3dbcd5 100644 --- a/src/map/homunculus.c +++ b/src/map/homunculus.c @@ -555,7 +555,10 @@ int merc_hom_change_name_ack(struct map_session_data *sd, char* name, int flag) { struct homun_data *hd = sd->hd; if (!merc_is_hom_active(hd)) return 0; - if (!flag) { + + normalize_name(name," ");//bugreport:3032 + + if ( !flag || !strlen(name) ) { clif_displaymessage(sd->fd, msg_txt(280)); // You cannot use this name return 0; } diff --git a/src/map/pet.c b/src/map/pet.c index ef4750310..fb5ba4699 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -630,7 +630,10 @@ int pet_change_name_ack(struct map_session_data *sd, char* name, int flag) { struct pet_data *pd = sd->pd; if (!pd) return 0; - if (!flag) { + + normalize_name(name," ");//bugreport:3032 + + if ( !flag || !strlen(name) ) { clif_displaymessage(sd->fd, msg_txt(280)); // You cannot use this name for your pet. clif_send_petstatus(sd); //Send status so client knows oet name change got rejected. return 0; -- cgit v1.2.3-70-g09d2