diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2009-01-11 14:32:23 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2009-01-11 14:32:23 +0000 |
| commit | e673e607dce91586ab1f09d01b571a9ae65e73c5 (patch) | |
| tree | a2e7b2a50c9d17da84adbaafc77c2ac0d7c01fb6 | |
| parent | 96e65f599a437dd15059f6ed533883c702917551 (diff) | |
| download | zcatch-e673e607dce91586ab1f09d01b571a9ae65e73c5.tar.gz zcatch-e673e607dce91586ab1f09d01b571a9ae65e73c5.zip | |
fixed so that emoticon 0 works
| -rw-r--r-- | src/game/client/components/emoticon.cpp | 2 | ||||
| -rw-r--r-- | src/game/server/hooks.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/game/client/components/emoticon.cpp b/src/game/client/components/emoticon.cpp index d76d6b22..3f2233c6 100644 --- a/src/game/client/components/emoticon.cpp +++ b/src/game/client/components/emoticon.cpp @@ -83,7 +83,7 @@ void EMOTICON::on_render() { if(!active) { - if(was_active && selected_emote) + if(was_active && selected_emote != -1) emote(selected_emote); was_active = false; return; diff --git a/src/game/server/hooks.cpp b/src/game/server/hooks.cpp index 194fa6e1..f4ef4686 100644 --- a/src/game/server/hooks.cpp +++ b/src/game/server/hooks.cpp @@ -353,7 +353,7 @@ void mods_message(int msgtype, int client_id) { NETMSG_CL_EMOTICON *msg = (NETMSG_CL_EMOTICON *)rawmsg; - if(config.sv_spamprotection && p->last_emote+time_freq()*5 > time_get()) + if(config.sv_spamprotection && p->last_emote+time_freq()*3 > time_get()) return; p->last_emote = time_get(); |