Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonedDiscord merged 1 commit into from
Nov 21, 2023
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/courtroom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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();

Expand Down