replace "gender" with "blips" (#386)
Co-authored-by: Crystalwarrior <Varsash@Gmail.com>
This commit is contained in:
parent
5b09dd45d5
commit
883fa8547d
@ -403,8 +403,8 @@ public:
|
||||
// Returns the desk modifier for p_char's p_emote
|
||||
int get_desk_mod(QString p_char, int p_emote);
|
||||
|
||||
// Returns p_char's gender
|
||||
QString get_gender(QString p_char);
|
||||
// Returns p_char's blips (previously called their "gender")
|
||||
QString get_blips(QString p_char);
|
||||
|
||||
// ======
|
||||
// These are all casing-related settings.
|
||||
|
@ -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;
|
||||
|
@ -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))))
|
||||
|
Loading…
Reference in New Issue
Block a user