diff options
author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-29 16:46:19 +0000 |
---|---|---|
committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-29 16:46:19 +0000 |
commit | ec35f4b8bce178430219c484566a8dceea015221 (patch) | |
tree | 8ce50b81edebc57c308a00bccecbe066aa0fdcb0 /src/map/party.c | |
parent | 51079611e59264b02fdbb4beb0d3675cc64618e6 (diff) | |
download | hercules-ec35f4b8bce178430219c484566a8dceea015221.tar.gz hercules-ec35f4b8bce178430219c484566a8dceea015221.tar.bz2 hercules-ec35f4b8bce178430219c484566a8dceea015221.tar.xz hercules-ec35f4b8bce178430219c484566a8dceea015221.zip |
More C/C++ Conformance fixes
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1334 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/party.c')
-rw-r--r-- | src/map/party.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/party.c b/src/map/party.c index 5caff4be1..e33dc37cc 100644 --- a/src/map/party.c +++ b/src/map/party.c @@ -49,7 +49,7 @@ void do_init_party(void) // 検索 struct party *party_search(int party_id) { - return numdb_search(party_db,party_id); + return (struct party *) numdb_search(party_db,party_id); } int party_searchname_sub(void *key,void *data,va_list ap) { @@ -91,7 +91,7 @@ int party_created(int account_id,int fail,int party_id,char *name) if(fail==0){ struct party *p; sd->status.party_id=party_id; - if((p=numdb_search(party_db,party_id))!=NULL){ + if((p=(struct party *) numdb_search(party_db,party_id))!=NULL){ printf("party: id already exists!\n"); exit(1); } @@ -121,7 +121,7 @@ int party_check_member(struct party *p) nullpo_retr(0, p); for(i=0;i<fd_max;i++){ - if(session[i] && (sd=session[i]->session_data) && sd->state.auth){ + if(session[i] && (sd=(struct map_session_data *) session[i]->session_data) && sd->state.auth){ if(sd->status.party_id==p->party_id){ int j,f=1; for(j=0;j<MAX_PARTY;j++){ // パーティにデータがあるか確認 @@ -149,7 +149,7 @@ int party_recv_noinfo(int party_id) int i; struct map_session_data *sd; for(i=0;i<fd_max;i++){ - if(session[i] && (sd=session[i]->session_data) && sd->state.auth){ + if(session[i] && (sd=(struct map_session_data *) session[i]->session_data) && sd->state.auth){ if(sd->status.party_id==party_id) sd->status.party_id=0; } @@ -164,7 +164,7 @@ int party_recv_info(struct party *sp) nullpo_retr(0, sp); - if((p=numdb_search(party_db,sp->party_id))==NULL){ + if((p=(struct party *) numdb_search(party_db,sp->party_id))==NULL){ p=(struct party *)aCalloc(1,sizeof(struct party)); numdb_insert(party_db,sp->party_id,p); |