Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix zooms with no emote modifier defaulting to 1 (show desk) (#925)

Browse Source
This commit is contained in:
in1tiate 2023-11-21 04:41:15 -06:00 committed by GitHub
parent a417307399
commit e690e12ae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/courtroom.cpp
View File

@ -1830,6 +1830,8 @@ void Courtroom::on_chat_return_pressed()
QStringList packet_contents;
QString f_side;
// have to fetch this early for a workaround. i hate this system, but i am stuck with it for now
int f_emote_mod = ao_app->get_emote_mod(current_char, current_emote);
if (current_side == "")
f_side = ao_app->get_char_side(current_char);
@ -1846,14 +1848,15 @@ void Courtroom::on_chat_return_pressed()
else if (f_desk_mod == DESK_EMOTE_ONLY_EX || f_desk_mod == DESK_EMOTE_ONLY)
f_desk_mod = DESK_SHOW;
}
if (f_desk_mod == -1)
if (f_desk_mod == -1 && (f_emote_mod == 5 || f_emote_mod == 6)) // workaround for inis that broke after deprecating "chat"
f_desk_mod = DESK_HIDE;
else if (f_desk_mod == -1)
f_desk_mod = DESK_SHOW;
}
packet_contents.append(QString::number(f_desk_mod));
QString f_pre = ao_app->get_pre_emote(current_char, current_emote);
int f_emote_mod = ao_app->get_emote_mod(current_char, current_emote);
QString f_sfx = "1";
int f_sfx_delay = get_char_sfx_delay();