Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revised npc_event_dequeue; added a check to party share & devel update [Shinomori]

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1175 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shinomori 2005-02-25 18:06:30 +00:00
parent a8d577e428
commit 98401cf0df
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/map/npc.c
View File

@ -135,17 +135,35 @@ int npc_event_dequeue(struct map_session_data *sd)
sd->npc_id=0; sd->npc_id=0;
if (sd->eventqueue[0][0]) { // キューのイベント処理 if (sd->eventqueue[0][0]) { // キューのイベント処理
char *name=(char *)aCallocA(50,sizeof(char)); size_t ev;
int i;
memcpy(name,sd->eventqueue[0],50); // find an empty place in eventtimer list
for(i=MAX_EVENTQUEUE-2;i>=0;i--) for(ev=0;ev<MAX_EVENTTIMER;ev++)
memcpy(sd->eventqueue[i],sd->eventqueue[i+1],50); if( sd->eventtimer[ev]==-1 )
add_timer(gettick()+100,npc_event_timer,sd->bl.id,(int)name); break;
if(ev<MAX_EVENTTIMER)
{ // generate and insert the timer
int i;
// copy the first event name
char *name=(char *)aMalloc(50*sizeof(char));
memcpy(name,sd->eventqueue[0],50);
// shift queued events down by one
for(i=1;i<MAX_EVENTQUEUE;i++)
memcpy(sd->eventqueue[i-1],sd->eventqueue[i],50);
// clear the last event
sd->eventqueue[MAX_EVENTQUEUE-1][0]=0;
// add the timer
sd->eventtimer[ev]=add_timer(gettick()+100,pc_eventtimer,sd->bl.id,(int)name);//!!todo!!
}else
ShowMessage("npc_event_dequeue: event timer is full !\n");
} }
return 0; return 0;
} }
int npc_delete(struct npc_data *nd) int npc_delete(struct npc_data *nd)
{ {
nullpo_retr(1, nd); nullpo_retr(1, nd);

5
src/map/party.c
View File

@ -587,12 +587,13 @@ int party_exp_share(struct party *p,int map,int base_exp,int job_exp,int zeny)
nullpo_retr(0, p); nullpo_retr(0, p);
for(i=c=0;i<MAX_PARTY;i++) for(i=c=0;i<MAX_PARTY;i++)
if((sd=p->member[i].sd)!=NULL && sd->bl.m==map) if((sd=p->member[i].sd)!=NULL && p->member[i].online && sd->bl.m==map && session[sd->fd] != NULL)
c++; c++;
if(c==0) if(c==0)
return 0; return 0;
for(i=0;i<MAX_PARTY;i++) for(i=0;i<MAX_PARTY;i++)
if((sd=p->member[i].sd)!=NULL && sd->bl.m==map && session[sd->fd] != NULL) { if((sd=p->member[i].sd)!=NULL && p->member[i].online && sd->bl.m==map && session[sd->fd] != NULL) {
if (/* pc_issit(sd) || */ sd->chatID || (sd->idletime < (tick_ - 120))) if (/* pc_issit(sd) || */ sd->chatID || (sd->idletime < (tick_ - 120)))
continue; continue;
#ifdef TWILIGHT #ifdef TWILIGHT

2
src/map/pc.h
View File

@ -199,6 +199,8 @@ int pc_delinvincibletimer(struct map_session_data *sd);
int pc_addspiritball(struct map_session_data *sd,int,int); int pc_addspiritball(struct map_session_data *sd,int,int);
int pc_delspiritball(struct map_session_data *sd,int,int); int pc_delspiritball(struct map_session_data *sd,int,int);
int pc_eventtimer(int tid,unsigned long tick,int id,int data); // for npc_dequeue
int do_init_pc(void); int do_init_pc(void);
enum {ADDITEM_EXIST,ADDITEM_NEW,ADDITEM_OVERAMOUNT}; enum {ADDITEM_EXIST,ADDITEM_NEW,ADDITEM_OVERAMOUNT};