diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-16 03:05:29 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-16 03:05:29 +0000 |
| commit | bc2b385a1898407fe5978b66c0f795b8235d52cd (patch) | |
| tree | aea92c868a2e9de37045cfae8627f723e1d50a4e /src/map/pet.c | |
| parent | 2152f7e6123dabf84f622a53ab43bb63003a2549 (diff) | |
| download | hercules-bc2b385a1898407fe5978b66c0f795b8235d52cd.tar.gz hercules-bc2b385a1898407fe5978b66c0f795b8235d52cd.tar.bz2 hercules-bc2b385a1898407fe5978b66c0f795b8235d52cd.tar.xz hercules-bc2b385a1898407fe5978b66c0f795b8235d52cd.zip | |
- Merged Adam's patch to let the char-server handle validation of pet-name-change requests through the allowed char letters config.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7192 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pet.c')
| -rw-r--r-- | src/map/pet.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index 091f733da..2c21b85b8 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -682,7 +682,7 @@ int pet_menu(struct map_session_data *sd,int menunum) return 0;
}
-int pet_change_name(struct map_session_data *sd,char *name)
+int pet_change_name(struct map_session_data *sd,char *name, int flag) //flag 0 = check name, 1 = good name
{
int i;
@@ -696,6 +696,9 @@ int pet_change_name(struct map_session_data *sd,char *name) return 1;
}
+ if (!flag)
+ return intif_rename_pet(sd, name);
+
pet_stop_walking(sd->pd,1);
memcpy(sd->pet.name, name, NAME_LENGTH-1);
|