diff options
| author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-21 08:26:58 +0000 |
|---|---|---|
| committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-21 08:26:58 +0000 |
| commit | 4f68a6ef917b92df214a12dcef09cffdfa1e80ff (patch) | |
| tree | 98bf244c38b10dfbd244ad78e2c638270285d1e0 /src/map | |
| parent | 3726e00c073550558fa9b954e1fd2b854bc787e3 (diff) | |
| download | hercules-4f68a6ef917b92df214a12dcef09cffdfa1e80ff.tar.gz hercules-4f68a6ef917b92df214a12dcef09cffdfa1e80ff.tar.bz2 hercules-4f68a6ef917b92df214a12dcef09cffdfa1e80ff.tar.xz hercules-4f68a6ef917b92df214a12dcef09cffdfa1e80ff.zip | |
- Fixed emperium coordinates in Payon Holy Shadow (payg_cas03).
- Also enforce sd->emotionlasttime for pet emotions.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15901 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 7 | ||||
| -rw-r--r-- | src/map/clif.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index c19164d1a..c339407dc 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6177,6 +6177,13 @@ ACMD_FUNC(pettalk) ARR_FIND( 0, ARRAYLENGTH(emo), i, stricmp(message, emo[i]) == 0 ); if( i < ARRAYLENGTH(emo) ) { + if (sd->emotionlasttime + 1 >= time(NULL)) { // not more than 1 per second + sd->emotionlasttime = time(NULL); + clif_skill_fail(sd, 1, 0, 1); + return 0; + } + sd->emotionlasttime = time(NULL); + clif_emotion(&pd->bl, i); return 0; } diff --git a/src/map/clif.c b/src/map/clif.c index bfe78a58d..b969624df 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9611,12 +9611,12 @@ void clif_parse_Emotion(int fd, struct map_session_data *sd) return; } // fix flood of emotion icon (ro-proxy): flood only the hacker player - if (sd->emotionlasttime >= time(NULL)) { - sd->emotionlasttime = time(NULL) + 1; // not more than 1 per second (using /commands the client can spam it) + if (sd->emotionlasttime + 1 >= time(NULL)) { // not more than 1 per second + sd->emotionlasttime = time(NULL); clif_skill_fail(sd, 1, USESKILL_FAIL_LEVEL, 1); return; } - sd->emotionlasttime = time(NULL) + 1; // not more than 1 per second (using /commands the client can spam it) + sd->emotionlasttime = time(NULL); if(battle_config.client_reshuffle_dice && emoticon>=E_DICE1 && emoticon<=E_DICE6) {// re-roll dice |