diff options
| author | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-16 07:07:02 +0000 |
|---|---|---|
| committer | Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-16 07:07:02 +0000 |
| commit | e4bb98fd9afd36dcd42a4135a55ad8930e2acf01 (patch) | |
| tree | 8b5552dd23c5deb96e1d3580d1a18e46fb33d482 /src/map | |
| parent | fcf1a52c02ff9d5cf5d8af6388b9833345509ec3 (diff) | |
| download | hercules-e4bb98fd9afd36dcd42a4135a55ad8930e2acf01.tar.gz hercules-e4bb98fd9afd36dcd42a4135a55ad8930e2acf01.tar.bz2 hercules-e4bb98fd9afd36dcd42a4135a55ad8930e2acf01.tar.xz hercules-e4bb98fd9afd36dcd42a4135a55ad8930e2acf01.zip | |
* [Fixed]:
- intif_parse_RenamePetOk for not compatible with ANSI-C initialzation specification.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7199 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/intif.c | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/map/intif.c b/src/map/intif.c index 8cd66e364..fff356d5c 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -1366,8 +1366,8 @@ int intif_parse_DeletePetOk(int fd) int intif_parse_RenamePetOk(int fd)
{
+ struct map_session_data *sd = NULL;
RFIFOHEAD(fd);
- struct map_session_data *sd;
if((sd=map_id2sd(RFIFOL(fd,2)))==NULL ||
sd->status.char_id != RFIFOL(fd,6))
return 0;
diff --git a/src/map/npc.c b/src/map/npc.c index c5264974b..4af7bc36f 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1954,7 +1954,8 @@ static int npc_parse_script (char *w1,char *w2,char *w3,char *w4,char *first_lin }
if((dnd = npc_name2id(nd->exname))){
- ShowInfo("npc_parse_script: Overriding NPC '%s::%s' to '%s::%d'.. (Duplicated System Name - Lazy scripters >_>) \n",nd->name,nd->exname,nd->name,npc_script);
+ if(battle_config.etc_log)
+ ShowInfo("npc_parse_script: Overriding NPC '%s::%s' to '%s::%d'.. (Duplicated System Name - Lazy scripters >_>) \n",nd->name,nd->exname,nd->name,npc_script);
sprintf(nd->exname, "%d", npc_script);
}
|