summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-01-18 19:30:11 -0200
committershennetsind <ind@henn.et>2014-01-18 19:30:11 -0200
commit14f84fc044754d22740905b7fa90022b4a04b0d8 (patch)
tree761e2d387fd0bc65ec02964516a15c8d3b85a22d /src/map/clif.c
parentcbde75bbe7c4a74506437f14b33dd94f8ad15b5a (diff)
downloadhercules-14f84fc044754d22740905b7fa90022b4a04b0d8.tar.gz
hercules-14f84fc044754d22740905b7fa90022b4a04b0d8.tar.bz2
hercules-14f84fc044754d22740905b7fa90022b4a04b0d8.tar.xz
hercules-14f84fc044754d22740905b7fa90022b4a04b0d8.zip
Socket interfaced
We designed this one with having as little changes required elsewhere in mind, thus the way most socket-related things are called has not changed. Plugins may now take a greater advantage of the socket features. Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index af328e7a7..975a5aa01 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9708,7 +9708,7 @@ void clif_parse_WalkToXY(int fd, struct map_session_data *sd)
//Set last idle time... [Skotlex]
if( battle_config.idletime_criteria & BCIDLE_WALK )
- sd->idletime = last_tick;
+ sd->idletime = sockt->last_tick;
unit->walktoxy(&sd->bl, x, y, 4);
}
@@ -9859,7 +9859,7 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data* sd)
}
if( battle_config.idletime_criteria & BCIDLE_CHAT )
- sd->idletime = last_tick;
+ sd->idletime = sockt->last_tick;
if( sd->gcbind ) {
clif->chsys_send(sd->gcbind,sd,message);
@@ -10024,7 +10024,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 = last_tick;
+ sd->idletime = sockt->last_tick;
if(battle_config.client_reshuffle_dice && emoticon>=E_DICE1 && emoticon<=E_DICE6) {// re-roll dice
emoticon = rnd()%6+E_DICE1;
@@ -10099,7 +10099,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 = last_tick;
+ sd->idletime = sockt->last_tick;
unit->attack(&sd->bl, target_id, action_type != 0);
break;
case 0x02: // sitdown
@@ -10124,7 +10124,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
break;
if( battle_config.idletime_criteria & BCIDLE_SIT )
- sd->idletime = last_tick;
+ sd->idletime = sockt->last_tick;
pc_setsit(sd);
skill->sit(sd,1);
@@ -10138,7 +10138,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
}
if( battle_config.idletime_criteria & BCIDLE_SIT )
- sd->idletime = last_tick;
+ sd->idletime = sockt->last_tick;
pc->setstand(sd);
skill->sit(sd,0);
@@ -10332,7 +10332,7 @@ void clif_parse_WisMessage(int fd, struct map_session_data* sd)
}
if( battle_config.idletime_criteria & BCIDLE_CHAT )
- sd->idletime = last_tick;
+ sd->idletime = sockt->last_tick;
// 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);
@@ -10552,7 +10552,7 @@ void clif_parse_DropItem(int fd, struct map_session_data *sd)
break;
if( battle_config.idletime_criteria & BCIDLE_DROPITEM )
- sd->idletime = last_tick;
+ sd->idletime = sockt->last_tick;
return;
}
@@ -10580,7 +10580,7 @@ void clif_parse_UseItem(int fd, struct map_session_data *sd)
//Whether the item is used or not is irrelevant, the char ain't idle. [Skotlex]
if( battle_config.idletime_criteria & BCIDLE_USEITEM )
- sd->idletime = last_tick;
+ sd->idletime = sockt->last_tick;
n = RFIFOW(fd,packet_db[RFIFOW(fd,0)].pos[0])-2;
if(n <0 || n >= MAX_INVENTORY)
@@ -10627,7 +10627,7 @@ void clif_parse_EquipItem(int fd,struct map_session_data *sd) {
}
if( battle_config.idletime_criteria & BCIDLE_USEITEM )
- sd->idletime = last_tick;
+ sd->idletime = sockt->last_tick;
//Client doesn't send the position for ammo.
if(sd->inventory_data[p->index]->type == IT_AMMO)
@@ -10747,7 +10747,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 = last_tick;
+ sd->idletime = sockt->last_tick;
pc->unequipitem(sd,index,1);
}
@@ -11297,7 +11297,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 = last_tick;
+ sd->idletime = sockt->last_tick;
if( sd->npc_id || sd->state.workinprogress&1 ){
#ifdef RENEWAL
@@ -11398,7 +11398,7 @@ void clif_parse_UseSkillToPosSub(int fd, struct map_session_data *sd, uint16 ski
//Whether skill fails or not is irrelevant, the char ain't idle. [Skotlex]
if( battle_config.idletime_criteria & BCIDLE_USESKILLTOPOS )
- sd->idletime = last_tick;
+ sd->idletime = sockt->last_tick;
if( skill->not_ok(skill_id, sd) )
return;
@@ -12154,7 +12154,7 @@ void clif_parse_PartyMessage(int fd, struct map_session_data* sd)
}
if( battle_config.idletime_criteria & BCIDLE_CHAT )
- sd->idletime = last_tick;
+ sd->idletime = sockt->last_tick;
party->send_message(sd, text, textlen);
}
@@ -13214,7 +13214,7 @@ void clif_parse_GuildMessage(int fd, struct map_session_data* sd)
}
if( battle_config.idletime_criteria & BCIDLE_CHAT )
- sd->idletime = last_tick;
+ sd->idletime = sockt->last_tick;
if( sd->bg_id )
bg->send_message(sd, text, textlen);
@@ -16203,7 +16203,7 @@ void clif_parse_BattleChat(int fd, struct map_session_data* sd)
}
if( battle_config.idletime_criteria & BCIDLE_CHAT )
- sd->idletime = last_tick;
+ sd->idletime = sockt->last_tick;
bg->send_message(sd, text, textlen);
}