Merge pull request #910 from dastgir/idle

Added a function to update idle time

5 files changed, 28 insertions, 36 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index de71819de..61ac124ca 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -9866,8 +9866,7 @@ bool atcommand_exec(const int fd, struct map_session_data *sd, const char *messa
 		sprintf(atcmd_msg, "%s", message);
 	}
 
-	if( battle_config.idletime_criteria & BCIDLE_ATCOMMAND )
-		sd->idletime = sockt->last_tick;
+	pc->update_idle_time(sd, BCIDLE_ATCOMMAND);
 
 	//Clearing these to be used once more.
 	memset(command, '\0', sizeof(command));
diff --git a/src/map/clif.c b/src/map/clif.c
index 621f0b44a..f79b15171 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9544,8 +9544,7 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd)
 	RFIFOPOS(fd, packet_db[RFIFOW(fd,0)].pos[0], &x, &y, NULL);
 
 	//Set last idle time... [Skotlex]
-	if( battle_config.idletime_criteria & BCIDLE_WALK )
-		sd->idletime = sockt->last_tick;
+	pc->update_idle_time(sd, BCIDLE_WALK);
 
 	unit->walktoxy(&sd->bl, x, y, 4);
 }
@@ -9698,8 +9697,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data* sd)
 		}
 	}
 
-	if( battle_config.idletime_criteria & BCIDLE_CHAT )
-		sd->idletime = sockt->last_tick;
+	pc->update_idle_time(sd, BCIDLE_CHAT);
 
 	if( sd->gcbind ) {
 		channel->send(sd->gcbind,sd,message);
@@ -9865,8 +9863,7 @@ void clif_parse_Emotion(int fd, struct map_session_data *sd)
 		}
 		sd->emotionlasttime = time(NULL);
 
-		if( battle_config.idletime_criteria & BCIDLE_EMOTION )
-			sd->idletime = sockt->last_tick;
+		pc->update_idle_time(sd, BCIDLE_EMOTION);
 
 		if(battle_config.client_reshuffle_dice && emoticon>=E_DICE1 && emoticon<=E_DICE6) {// re-roll dice
 			emoticon = rnd()%6+E_DICE1;
@@ -9947,8 +9944,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
 			}
 
 			pc->delinvincibletimer(sd);
-			if( battle_config.idletime_criteria & BCIDLE_ATTACK )
-				sd->idletime = sockt->last_tick;
+			pc->update_idle_time(sd, BCIDLE_ATTACK);
 			unit->attack(&sd->bl, target_id, action_type != 0);
 		break;
 		case 0x02: // sitdown
@@ -9973,8 +9969,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
 			)) //No sitting during these states either.
 				break;
 
-			if( battle_config.idletime_criteria & BCIDLE_SIT )
-				sd->idletime = sockt->last_tick;
+			pc->update_idle_time(sd, BCIDLE_SIT);
 
 			pc_setsit(sd);
 			skill->sit(sd,1);
@@ -9987,8 +9982,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
 				return;
 			}
 
-			if( battle_config.idletime_criteria & BCIDLE_SIT )
-				sd->idletime = sockt->last_tick;
+			pc->update_idle_time(sd, BCIDLE_SIT);
 
 			pc->setstand(sd);
 			skill->sit(sd,0);
@@ -10073,8 +10067,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
 		sd->cantalk_tick = timer->gettick() + battle_config.min_chat_delay;
 	}
 
-	if( battle_config.idletime_criteria & BCIDLE_CHAT )
-		sd->idletime = sockt->last_tick;
+	pc->update_idle_time(sd, BCIDLE_CHAT);
 
 	// Chat logging type 'W' / Whisper
 	logs->chat(LOG_CHAT_WHISPER, 0, sd->status.char_id, sd->status.account_id, mapindex_id2name(sd->mapindex), sd->bl.x, sd->bl.y, target, message);
@@ -10269,8 +10262,7 @@ void clif_parse_DropItem(int fd, struct map_session_data *sd)
 		if (!pc->dropitem(sd, item_index, item_amount))
 			break;
 
-		if( battle_config.idletime_criteria & BCIDLE_DROPITEM )
-			sd->idletime = sockt->last_tick;
+		pc->update_idle_time(sd, BCIDLE_DROPITEM);
 
 		return;
 	}
@@ -10297,8 +10289,7 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd)
 		return;
 
 	//Whether the item is used or not is irrelevant, the char ain't idle. [Skotlex]
-	if( battle_config.idletime_criteria & BCIDLE_USEITEM )
-		sd->idletime = sockt->last_tick;
+	pc->update_idle_time(sd, BCIDLE_USEITEM);
 	n = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0])-2;
 
 	if (n < 0 || n >= MAX_INVENTORY)
@@ -10344,8 +10335,7 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd) {
 		return;
 	}
 
-	if( battle_config.idletime_criteria & BCIDLE_USEITEM )
-		sd->idletime = sockt->last_tick;
+	pc->update_idle_time(sd, BCIDLE_USEITEM);
 
 	//Client doesn't send the position for ammo.
 	if(sd->inventory_data[p->index]->type == IT_AMMO)
@@ -10376,8 +10366,7 @@ void clif_parse_UnequipItem(int fd,struct map_session_data *sd)
 
 	index = RFIFOW(fd,2)-2;
 
-	if( battle_config.idletime_criteria & BCIDLE_USEITEM )
-		sd->idletime = sockt->last_tick;
+	pc->update_idle_time(sd, BCIDLE_USEITEM);
 
 	pc->unequipitem(sd,index, PCUNEQUIPITEM_RECALC);
 }
@@ -10953,8 +10942,7 @@ void clif_parse_UseSkillToId(int fd, struct map_session_data *sd)
 	}
 
 	// Whether skill fails or not is irrelevant, the char ain't idle. [Skotlex]
-	if( battle_config.idletime_criteria & BCIDLE_USESKILLTOID )
-		sd->idletime = sockt->last_tick;
+	pc->update_idle_time(sd, BCIDLE_USESKILLTOID);
 
 	if( sd->npc_id || sd->state.workinprogress&1 ){
 #ifdef RENEWAL
@@ -11061,8 +11049,7 @@ void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uint16 ski
 #endif
 
 	//Whether skill fails or not is irrelevant, the char ain't idle. [Skotlex]
-	if( battle_config.idletime_criteria & BCIDLE_USESKILLTOPOS )
-		sd->idletime = sockt->last_tick;
+	pc->update_idle_time(sd, BCIDLE_USESKILLTOPOS);
 
 	if( skill->not_ok(skill_id, sd) )
 		return;
@@ -11822,8 +11809,7 @@ void clif_parse_PartyMessage(int fd, struct map_session_data* sd)
 		sd->cantalk_tick = timer->gettick() + battle_config.min_chat_delay;
 	}
 
-	if( battle_config.idletime_criteria & BCIDLE_CHAT )
-		sd->idletime = sockt->last_tick;
+	pc->update_idle_time(sd, BCIDLE_CHAT);
 
 	party->send_message(sd, text, textlen);
 }
@@ -12927,8 +12913,7 @@ void clif_parse_GuildMessage(int fd, struct map_session_data* sd)
 		sd->cantalk_tick = timer->gettick() + battle_config.min_chat_delay;
 	}
 
-	if( battle_config.idletime_criteria & BCIDLE_CHAT )
-		sd->idletime = sockt->last_tick;
+	pc->update_idle_time(sd, BCIDLE_CHAT);
 
 	if( sd->bg_id )
 		bg->send_message(sd, text, textlen);
@@ -16024,8 +16009,7 @@ void clif_parse_BattleChat(int fd, struct map_session_data* sd)
 		sd->cantalk_tick = timer->gettick() + battle_config.min_chat_delay;
 	}
 
-	if( battle_config.idletime_criteria & BCIDLE_CHAT )
-		sd->idletime = sockt->last_tick;
+	pc->update_idle_time(sd, BCIDLE_CHAT);
 
 	bg->send_message(sd, text, textlen);
 }
diff --git a/src/map/pc.c b/src/map/pc.c
index 43adf331b..b0a8ca62f 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -11426,6 +11426,13 @@ int pc_autotrade_final(DBKey key, DBData *data, va_list ap) {
 	return 0;
 }
 
+void pc_update_idle_time(struct map_session_data* sd, enum e_battle_config_idletime type)
+{
+	nullpo_retv(sd);
+	if (battle_config.idletime_criteria&type)
+		sd->idletime = sockt->last_tick;
+}
+
 //Checks if the given class value corresponds to a player class. [Skotlex]
 //JOB_NOVICE isn't checked for class_ is supposed to be unsigned
 bool pc_db_checkid(unsigned int class_)
@@ -11802,4 +11809,5 @@ void pc_defaults(void) {
 	pc->autotrade_final = pc_autotrade_final;
 
 	pc->check_job_name = pc_check_job_name;
+	pc->update_idle_time = pc_update_idle_time;
 }
diff --git a/src/map/pc.h b/src/map/pc.h
index 62571f12a..ef9983371 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -1066,6 +1066,7 @@ END_ZEROED_BLOCK; /* End */
 	int (*autotrade_final) (DBKey key, DBData *data, va_list ap);
 
 	int (*check_job_name) (const char *name);
+	void (*update_idle_time) (struct map_session_data* sd, enum e_battle_config_idletime type);
 };
 
 #ifdef HERCULES_CORE
diff --git a/src/map/unit.c b/src/map/unit.c
index 3046db9e1..7f53966e2 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -2169,8 +2169,8 @@ int unit_attack_timer_sub(struct block_list* src, int tid, int64 tick) {
 
 	if(ud->state.attack_continue) {
 		unit->setdir(src, map->calc_dir(src, target->x, target->y));
-		if( src->type == BL_PC && battle_config.idletime_criteria & BCIDLE_ATTACK )
-			((TBL_PC*)src)->idletime = sockt->last_tick;
+		if( src->type == BL_PC )
+			pc->update_idle_time(sd, BCIDLE_ATTACK);
 		ud->attacktimer = timer->add(ud->attackabletime,unit->attack_timer,src->id,0);
 	}