diff options
| author | in1tiate <32779090+in1tiate@users.noreply.github.com> | 2021-01-09 09:24:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-09 18:24:06 +0300 |
| commit | 883fa8547d2d650ab28fcc91169e1d0068760ac9 (patch) | |
| tree | 32f5feea53a33a6ead60eeaec0362a3a830b4f37 /src | |
| parent | 5b09dd45d5f9b3cdef7ceae11780fe1741569a33 (diff) | |
replace "gender" with "blips" (#386)
Co-authored-by: Crystalwarrior <Varsash@Gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/courtroom.cpp | 5 | ||||
| -rw-r--r-- | src/text_file_functions.cpp | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 0613bad4..be7dab10 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -2891,14 +2891,13 @@ void Courtroom::start_chat_ticking() current_display_speed = 3; chat_tick_timer->start(0); // Display the first char right away - QString f_gender = ao_app->get_gender(m_chatmessage[CHAR_NAME]); - last_misc = current_misc; current_misc = ao_app->get_char_shouts(m_chatmessage[CHAR_NAME]); if (last_misc != current_misc) gen_char_rgb_list(m_chatmessage[CHAR_NAME]); - blip_player->set_blips(f_gender); + QString f_blips = ao_app->get_blips(m_chatmessage[CHAR_NAME]); + blip_player->set_blips(f_blips); // means text is currently ticking text_state = 1; diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index eb0976a9..3524d87e 100644 --- a/src/text_file_functions.cpp +++ b/src/text_file_functions.cpp @@ -625,12 +625,15 @@ QString AOApplication::get_char_side(QString p_char) return f_result; } -QString AOApplication::get_gender(QString p_char) +QString AOApplication::get_blips(QString p_char) { - QString f_result = read_char_ini(p_char, "gender", "Options"); + QString f_result = read_char_ini(p_char, "blips", "Options"); - if (f_result == "") - f_result = "male"; + if (f_result == "") { + f_result = read_char_ini(p_char, "gender", "Options"); // not very PC, FanatSors + if (f_result == "") + f_result = "male"; + } if (!file_exists(get_sfx_suffix(get_sounds_path(f_result)))) { if (file_exists(get_sfx_suffix(get_sounds_path("../blips/" + f_result)))) |