From e4bb98fd9afd36dcd42a4135a55ad8930e2acf01 Mon Sep 17 00:00:00 2001
From: Lance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 16 Jun 2006 07:07:02 +0000
Subject: * [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
---
 src/map/intif.c | 2 +-
 src/map/npc.c   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

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);
 	}
 
-- 
cgit v1.2.3-70-g09d2