aboutsummaryrefslogtreecommitdiff
path: root/src/emotes.cpp
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2019-10-01 01:07:03 +0300
committerCrystalwarrior <varsash@gmail.com>2019-10-01 01:07:03 +0300
commit4f738bfe34695db745d251e9461823b8835de201 (patch)
tree4e7338b5102f2c1c0df12d3be5bc5d245ce83334 /src/emotes.cpp
parent9bf41a714b6a46559bba23ea4fa4e0ad432d6997 (diff)
Fix some read_file errors on effect loading
Make FM packet only fetch music, and new FA packet to fetch areas (this way you don't have to reload the entire music list just to get new areas) Fix a possible segfault with emote lists if emote list size is bad Hide casing button if server doesn't support casing Hide the remove buttons by default for iniswaps and sfx list so they're not clickable when they shouldn't be Prevent background from being displayed unless the server asked us to Fix some redundancy surrounding current_side Rework music list so list_music doesn't care about search bar and the hiding is actually done in the search function Implement text centering, rightening and justifying Fix text scrolling meme that happened with \n and skipped chars Fix the pos dropdown not actually caring if you selected jur and sea pos. Fix the pos dropdown sending like a million packets when scrolled through. Prevent characters from being incorrectly resized if a different-scaled character speaks Fix character select screen letting you choose characters that the server doesn't want us to be
Diffstat (limited to 'src/emotes.cpp')
-rw-r--r--src/emotes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emotes.cpp b/src/emotes.cpp
index 3e968241..58e85948 100644
--- a/src/emotes.cpp
+++ b/src/emotes.cpp
@@ -107,7 +107,7 @@ void Courtroom::set_emote_page()
if (current_emote_page > 0)
ui_emote_left->show();
- for (int n_emote = 0 ; n_emote < emotes_on_page ; ++n_emote)
+ for (int n_emote = 0 ; n_emote < emotes_on_page && n_emote < ui_emote_list.size(); ++n_emote)
{
int n_real_emote = n_emote + current_emote_page * max_emotes_on_page;
AOEmoteButton *f_emote = ui_emote_list.at(n_emote);