diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/aoblipplayer.cpp | 2 | ||||
| -rw-r--r-- | src/aocharmovie.cpp | 4 | ||||
| -rw-r--r-- | src/aooptionsdialog.cpp | 2 | ||||
| -rw-r--r-- | src/networkmanager.cpp | 4 | ||||
| -rw-r--r-- | src/packet_distribution.cpp | 10 |
6 files changed, 13 insertions, 10 deletions
@@ -4,6 +4,7 @@ *.dll *.so *.pro.autosave +*.pro.user base_override.h .DS_Store diff --git a/src/aoblipplayer.cpp b/src/aoblipplayer.cpp index 1c668ab4..9b548c33 100644 --- a/src/aoblipplayer.cpp +++ b/src/aoblipplayer.cpp @@ -70,7 +70,7 @@ void AOBlipPlayer::set_blips(QString p_sfx) void AOBlipPlayer::blip_tick() { - int f_cycle = m_cycle++; + m_cycle++; if (m_cycle == 5) m_cycle = 0; diff --git a/src/aocharmovie.cpp b/src/aocharmovie.cpp index 6aa6e35e..dfd53559 100644 --- a/src/aocharmovie.cpp +++ b/src/aocharmovie.cpp @@ -21,6 +21,7 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix) apng = false; QString original_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".gif"); QString alt_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".png"); + QString alt_path_still = ao_app->get_character_path(p_char, p_emote + ".png"); QString apng_path = ao_app->get_character_path(p_char, emote_prefix + p_emote + ".apng"); QString placeholder_path = ao_app->get_theme_path("placeholder.gif"); QString placeholder_default_path = ao_app->get_default_theme_path("placeholder.gif"); @@ -36,6 +37,8 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix) gif_path = original_path; else if (file_exists(alt_path)) gif_path = alt_path; + else if (file_exists(alt_path_still)) + gif_path = alt_path_still; else if (file_exists(placeholder_path)) gif_path = placeholder_path; else @@ -205,7 +208,6 @@ void AOCharMovie::play_pre(QString p_char, QString p_emote, int duration) m_movie->stop(); m_movie->setFileName(gif_path); m_movie->jumpToFrame(0); - int real_duration = 0; play_once = true; play(p_char, p_emote, ""); } diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp index 37d49573..3749b653 100644 --- a/src/aooptionsdialog.cpp +++ b/src/aooptionsdialog.cpp @@ -244,7 +244,6 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi ui_audio_device_combobox = new QComboBox(ui_audio_widget); // Let's fill out the combobox with the available audio devices. Or don't if there is no audio - int a = 0; if (needs_default_audiodev()) { @@ -253,6 +252,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi } #ifdef BASSAUDIO BASS_DEVICEINFO info; + int a = 0; for (a = 0; BASS_GetDeviceInfo(a, &info); a++) { ui_audio_device_combobox->addItem(info.name); diff --git a/src/networkmanager.cpp b/src/networkmanager.cpp index a9810d49..b029eabe 100644 --- a/src/networkmanager.cpp +++ b/src/networkmanager.cpp @@ -134,9 +134,9 @@ void NetworkManager::on_srv_lookup() for (const QDnsServiceRecord &record : srv_records) { -#ifdef DEBUG_NETWORK + #ifdef DEBUG_NETWORK qDebug() << "Connecting to " << record.target() << ":" << record.port(); -#endif + #endif ms_socket->connectToHost(record.target(), record.port()); QTime timer; timer.start(); diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp index d1c51bdf..5e17542d 100644 --- a/src/packet_distribution.cpp +++ b/src/packet_distribution.cpp @@ -564,11 +564,11 @@ void AOApplication::server_packet_received(AOPacket *p_packet) { if (courtroom_constructed) w_courtroom->reset_music_list(); - for (int n_element = 0 ; n_element < f_contents.size() ; ++n_element) - { - w_courtroom->append_music(f_contents.at(n_element)); - } - w_courtroom->list_music(); + for (int n_element = 0 ; n_element < f_contents.size() ; ++n_element) + { + w_courtroom->append_music(f_contents.at(n_element)); + } + w_courtroom->list_music(); } else if (header == "BN") { |