From 08864b129bb4babc65d0f52538c50ecced1f226e Mon Sep 17 00:00:00 2001
From: Vicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 18 Apr 2006 03:52:18 +0000
Subject: cleaned the invisible fix a bit.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6148 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/clif.c | 25 ++++++++++++++-----------
 src/map/clif.h |  1 +
 2 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'src/map')

diff --git a/src/map/clif.c b/src/map/clif.c
index 1d2674ebb..506e31e76 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1712,7 +1712,11 @@ int clif_scriptclose(struct map_session_data *sd, int npcid) {
 	return 0;
 }
 
-void send_fake_npc(struct map_session_data *sd, int npcid){
+/*==========================================
+ *
+ *------------------------------------------
+ */
+void clif_sendfakenpc(struct map_session_data *sd, int npcid) {
 	int fd = sd->fd;
 	memset(WFIFOP(fd,0), 0, packet_len_table[0x78]);
 	WFIFOW(fd,0)=0x78;
@@ -1737,11 +1741,10 @@ int clif_scriptmenu(struct map_session_data *sd, int npcid, char *mes) {
 
 	nullpo_retr(0, sd);
 
-	fd=sd->fd;
-
 	if(map_id2bl(npcid)->m < 0)
-		send_fake_npc(sd, npcid);
+		clif_sendfakenpc(sd, npcid);
 
+	fd=sd->fd;
 	WFIFOW(fd,0)=0xb7;
 	WFIFOW(fd,2)=slen;
 	WFIFOL(fd,4)=npcid;
@@ -1759,11 +1762,11 @@ int clif_scriptinput(struct map_session_data *sd, int npcid) {
 	int fd;
 
 	nullpo_retr(0, sd);
-	fd=sd->fd;
-
+	
 	if(map_id2bl(npcid)->m < 0)
-		send_fake_npc(sd, npcid);
+		clif_sendfakenpc(sd, npcid);
 	
+	fd=sd->fd;
 	WFIFOHEAD(fd, packet_len_table[0x142]);
 	WFIFOW(fd,0)=0x142;
 	WFIFOL(fd,2)=npcid;
@@ -1780,11 +1783,11 @@ int clif_scriptinputstr(struct map_session_data *sd, int npcid) {
 	int fd;
 
 	nullpo_retr(0, sd);
-	fd=sd->fd;
-
-	if(map_id2bl(npcid)->m < 0)
-		send_fake_npc(sd, npcid);
 	
+	if(map_id2bl(npcid)->m < 0)
+		clif_sendfakenpc(sd, npcid);
+
+	fd=sd->fd;
 	WFIFOHEAD(fd, packet_len_table[0x1d4]);
 	WFIFOW(fd,0)=0x1d4;
 	WFIFOL(fd,2)=npcid;
diff --git a/src/map/clif.h b/src/map/clif.h
index 252a707f8..386703910 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -65,6 +65,7 @@ int clif_selllist(struct map_session_data*);	//self
 int clif_scriptmes(struct map_session_data*,int,char*);	//self
 int clif_scriptnext(struct map_session_data*,int);	//self
 int clif_scriptclose(struct map_session_data*,int);	//self
+void clif_sendfakenpc(struct map_session_data *sd, int npcid);	//self
 int clif_scriptmenu(struct map_session_data*,int,char*);	//self
 int clif_scriptinput(struct map_session_data*,int);	//self
 int clif_scriptinputstr(struct map_session_data *sd,int npcid);	// self
-- 
cgit v1.2.3-70-g09d2