From c8cbcbd5f6e9a8d190adfebaeda425e4c4490408 Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 15 Jul 2008 10:49:42 +0000
Subject: Removed the party_share_conflict() check.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12959 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/intif.c | 13 -------------
 src/map/intif.h |  1 -
 src/map/party.c |  9 ---------
 src/map/party.h |  1 -
 4 files changed, 24 deletions(-)

(limited to 'src/map')

diff --git a/src/map/intif.c b/src/map/intif.c
index 7b79fe452..896c30626 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -467,19 +467,6 @@ int intif_party_message(int party_id,int account_id,const char *mes,int len)
 	WFIFOSET(inter_fd,len+12);
 	return 0;
 }
-// パーティ競合チェック要求
-int intif_party_checkconflict(int party_id,int account_id,int char_id)
-{
-	if (CheckForCharServer())
-		return 0;
-	WFIFOHEAD(inter_fd,10 + NAME_LENGTH);
-	WFIFOW(inter_fd,0)=0x3028;
-	WFIFOL(inter_fd,2)=party_id;
-	WFIFOL(inter_fd,6)=account_id;
-	WFIFOL(inter_fd,10)=char_id;
-	WFIFOSET(inter_fd,14);
-	return 0;
-}
 
 int intif_party_leaderchange(int party_id,int account_id,int char_id)
 {
diff --git a/src/map/intif.h b/src/map/intif.h
index b4cc6792f..c32b09352 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -37,7 +37,6 @@ int intif_party_leave(int party_id,int account_id, int char_id);
 int intif_party_changemap(struct map_session_data *sd, int online);
 int intif_break_party(int party_id);
 int intif_party_message(int party_id, int account_id, const char *mes,int len);
-int intif_party_checkconflict(int party_id,int account_id,int char_id);
 int intif_party_leaderchange(int party_id,int account_id,int char_id);
 
 
diff --git a/src/map/party.c b/src/map/party.c
index 4a53d5038..28c5154e7 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -425,7 +425,6 @@ int party_member_added(int party_id,int account_id,int char_id, int flag)
 		p->data[i].sd = sd;
 	}
 
-	party_check_conflict(sd); //FIXME: is this neccessary?
 	clif_party_member_info(p,sd);
 	clif_party_option(p,sd,0x100);
 	clif_party_info(p,sd);
@@ -683,14 +682,6 @@ int party_recv_message(int party_id,int account_id,const char *mes,int len)
 	return 0;
 }
 
-int party_check_conflict(struct map_session_data *sd)
-{
-	nullpo_retr(0, sd);
-
-	intif_party_checkconflict(sd->status.party_id,sd->status.account_id,sd->status.char_id);
-	return 0;
-}
-
 int party_skill_check(struct map_session_data *sd, int party_id, int skillid, int skilllv)
 {
 	struct party_data *p;
diff --git a/src/map/party.h b/src/map/party.h
index e45b62c1e..65f585b10 100644
--- a/src/map/party.h
+++ b/src/map/party.h
@@ -59,7 +59,6 @@ void party_send_levelup(struct map_session_data *sd);
 int party_send_logout(struct map_session_data *sd);
 int party_send_message(struct map_session_data *sd,const char *mes,int len);
 int party_recv_message(int party_id,int account_id,const char *mes,int len);
-int party_check_conflict(struct map_session_data *sd);
 int party_skill_check(struct map_session_data *sd, int party_id, int skillid, int skilllv);
 int party_send_xy_clear(struct party_data *p);
 int party_exp_share(struct party_data *p,struct block_list *src,unsigned int base_exp,unsigned int job_exp,int zeny);
-- 
cgit v1.2.3-70-g09d2