- Some cleaning of the pc_eventtimer and pc enqueue code, it should fix some memory leaks when the event counter does not matches with the actual number of queued timers during logout.

- Minor typos, corrections, etc.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9072 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 22 insertions, 27 deletions

diff --git a/src/map/log.c b/src/map/log.c
index bb061a062..556c7c414 100644
--- a/src/map/log.c
+++ b/src/map/log.c
@@ -212,7 +212,6 @@ int log_pick_mob(struct mob_data *md, const char *type, int nameid, int amount,
 	return 1; //Logged

 }

 

-

 int log_zeny(struct map_session_data *sd, char *type, struct map_session_data *src_sd, int amount)

 {

 //	FILE *logfp;

diff --git a/src/map/npc.c b/src/map/npc.c
index 89538052d..4e982b69d 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -182,8 +182,8 @@ int npc_event_dequeue(struct map_session_data *sd)
 			// 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!!

-

+			sd->eventtimer[ev]=add_timer(gettick()+100,pc_eventtimer,sd->bl.id,(int)name);//TODO: Someone wrote here "!!todo!!", but what the hell is missing?

+			sd->eventcount++;

 		}else

 			ShowWarning("npc_event_dequeue: event timer is full !\n");

 	}

diff --git a/src/map/pc.c b/src/map/pc.c
index 4a90929ea..c3e68a807 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -6139,19 +6139,16 @@ int pc_eventtimer(int tid,unsigned int tick,int id,int data)
 	if(sd==NULL)
 		return 0;
 
-	for(i=0;i < MAX_EVENTTIMER;i++){
-		if( sd->eventtimer[i]==tid ){
-			sd->eventtimer[i]=-1;
-			npc_event(sd,p,0);
-			break;
-		}
-	}
-	if (p) aFree(p);
-	if(i==MAX_EVENTTIMER) {
-		if(battle_config.error_log)
-			ShowError("pc_eventtimer: no such event timer\n");
-	}
+	for(i=0;i < MAX_EVENTTIMER && sd->eventtimer[i]!=tid; i++);
+
+	if(i < MAX_EVENTTIMER){
+		sd->eventtimer[i]=-1;
+		npc_event(sd,p,0);
+		sd->eventcount--;
+	} else if(battle_config.error_log)
+		ShowError("pc_eventtimer: no such event timer\n");
 
+	if (p) aFree(p);
 	return 0;
 }
 
@@ -6162,20 +6159,19 @@ int pc_eventtimer(int tid,unsigned int tick,int id,int data)
 int pc_addeventtimer(struct map_session_data *sd,int tick,const char *name)
 {
 	int i;
+	char *evname;
 
 	nullpo_retr(0, sd);
 
-	for(i=0;i<MAX_EVENTTIMER;i++)
-		if( sd->eventtimer[i]==-1 )
-			break;
-	if(i<MAX_EVENTTIMER){
-		char *evname = aStrdup(name);
-		//char *evname=(char *)aMallocA((strlen(name)+1)*sizeof(char));
-		//memcpy(evname,name,(strlen(name)+1));
-		sd->eventtimer[i]=add_timer(gettick()+tick,
-			pc_eventtimer,sd->bl.id,(int)evname);
-		sd->eventcount++;
-	}
+	for(i=0;i<MAX_EVENTTIMER && sd->eventtimer[i]!=-1;i++);
+	
+	if(i==MAX_EVENTTIMER)
+		return 0;
+
+	evname = aStrdup(name);
+	sd->eventtimer[i]=add_timer(gettick()+tick,
+		pc_eventtimer,sd->bl.id,(int)evname);
+	sd->eventcount++;
 
 	return 0;
 }
@@ -6246,9 +6242,9 @@ int pc_cleareventtimer(struct map_session_data *sd)
 			char *p = (char *)(get_timer(sd->eventtimer[i])->data);
 			delete_timer(sd->eventtimer[i],pc_eventtimer);
 			sd->eventtimer[i]=-1;
+			sd->eventcount--;
 			if (p) aFree(p);
 		}
-
 	return 0;
 }