fixes double indicators?

This commit is contained in:
Enric Gabriel
2020-07-11 02:57:36 -03:00
parent 40d7397379
commit eb93eb2c3e
7 changed files with 9 additions and 69 deletions
-1
View File
@@ -105,6 +105,5 @@
S.sharerDies(gibbed)
set_ssd_indicator(FALSE) //SKYRAT CHANGE - ssd indicator
set_typing_indicator(FALSE) //SKYRAT CHANGE
return TRUE
+9 -11
View File
@@ -20,13 +20,8 @@
if(GLOB.say_disabled) //This is here to try to identify lag problems
to_chat(usr, "<span class='danger'>Speech is currently admin-disabled.</span>")
return
//SKYRAT EDIT
set_typing_indicator(FALSE)
//END OF SKYRAT EDIT
if(message)
say(message)
//clear_typing_indicator() // clear it immediately! //SKYRAT EDIT
//say(message) //SKYRAT EDIT
clear_typing_indicator() // clear it immediately!
say(message)
/mob/verb/me_typing_indicator()
set name = "me_indicator"
@@ -50,10 +45,7 @@
return
message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN))
//SKYRAT EDIT
set_typing_indicator(FALSE)
//END OF SKYRAT EDIT
//clear_typing_indicator() // clear it immediately! //Skyrat edit
clear_typing_indicator() // clear it immediately!
usr.emote("me",1,message,TRUE)
@@ -65,6 +57,12 @@
else
return ..()
/proc/uncostumize_say(input, message_mode)
. = input
if(message_mode == MODE_CUSTOM_SAY)
var/customsayverb = findtext(input, "*")
return lowertext(copytext_char(input, 1, customsayverb))
/mob/proc/whisper_keybind()
var/message = input(src, "", "whisper") as text|null
if(!length(message))
@@ -1,8 +0,0 @@
/mob/key_down(_key, client/user)
if(user.prefs.toggles & ASYNCHRONOUS_SAY)
switch(_key)
if("T")
src.set_typing_indicator(TRUE)
if("M")
src.set_typing_indicator(TRUE)
return ..()
-4
View File
@@ -13,10 +13,6 @@
animate(I, alpha = 255, time = 5, easing = BOUNCE_EASING, pixel_y = 10)
QDEL_IN_CLIENT_TIME(I, time)
/mob/emote(act, m_type = null, message = null, intentional = FALSE)
. = ..()
set_typing_indicator(FALSE)
/datum/emote/living/peep
key = "peep"
key_third_person = "peeps like a bird"
@@ -1,3 +0,0 @@
/mob/Moved(atom/OldLoc, Dir, Forced = FALSE)
. = ..()
set_typing_indicator(FALSE)
@@ -1,39 +0,0 @@
/mob
var/hud_typing = FALSE //set when typing in an input window instead of chatline
var/typing
var/last_typed
var/last_typed_time
var/static/mutable_appearance/typing_indicator
/mob/proc/set_typing_indicator(var/state)
if(!typing_indicator)
typing_indicator = mutable_appearance('sandcode/icons/mob/typing_indicator.dmi', "default0", FLY_LAYER)
if(client && !stat)
if(state)
if(!typing)
add_overlay(typing_indicator)
typing = TRUE
else
if(typing)
cut_overlay(typing_indicator)
typing = FALSE
return state
/mob/proc/handle_typing_indicator()
if(!client)
return
var/temp = winget(client, "input", "text")
if (temp != last_typed)
last_typed = temp
last_typed_time = world.time
if(length(temp) > 5 && findtext(temp, "Say \"", 1, 7))
set_typing_indicator(TRUE)
return
if(length(temp) > 3 && findtext(temp, "Me ", 1, 5))
set_typing_indicator(TRUE)
return
if(!hud_typing)
set_typing_indicator(FALSE)
-3
View File
@@ -3519,13 +3519,10 @@
#include "sandcode\code\modules\crafting\recipes\recipes_misc.dm"
#include "sandcode\code\modules\hydroponics\grown\misc.dm"
#include "sandcode\code\modules\integrated_electronics\subtypes\output.dm"
#include "sandcode\code\modules\keybindings\bindings_mob.dm"
#include "sandcode\code\modules\language\language.dm"
#include "sandcode\code\modules\misc\misc.dm"
#include "sandcode\code\modules\mob\emote.dm"
#include "sandcode\code\modules\mob\mob_movement.dm"
#include "sandcode\code\modules\mob\say.dm"
#include "sandcode\code\modules\mob\typing_indicator.dm"
#include "sandcode\code\modules\mob\dead\observer\observer.dm"
#include "sandcode\code\modules\mob\living\emote.dm"
#include "sandcode\code\modules\mob\living\give.dm"