diff options
Diffstat (limited to 'src/aolayer.cpp')
| -rw-r--r-- | src/aolayer.cpp | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/src/aolayer.cpp b/src/aolayer.cpp index efa0e447..f037b219 100644 --- a/src/aolayer.cpp +++ b/src/aolayer.cpp @@ -28,10 +28,6 @@ BackgroundLayer::BackgroundLayer(QWidget *p_parent, AOApplication *p_ao_app) : AOLayer(p_parent, p_ao_app) { } -ForegroundLayer::ForegroundLayer(QWidget *p_parent, AOApplication *p_ao_app) - : AOLayer(p_parent, p_ao_app) -{ -} CharLayer::CharLayer(QWidget *p_parent, AOApplication *p_ao_app) : AOLayer(p_parent, p_ao_app) { @@ -40,7 +36,7 @@ EffectLayer::EffectLayer(QWidget *p_parent, AOApplication *p_ao_app) : AOLayer(p_parent, p_ao_app) { } -InterjectionLayer::InterjectionLayer(QWidget *p_parent, AOApplication *p_ao_app) +SplashLayer::SplashLayer(QWidget *p_parent, AOApplication *p_ao_app) : AOLayer(p_parent, p_ao_app) { } @@ -48,7 +44,6 @@ InterfaceLayer::InterfaceLayer(QWidget *p_parent, AOApplication *p_ao_app) : AOLayer(p_parent, p_ao_app) { } - StickerLayer::StickerLayer(QWidget *p_parent, AOApplication *p_ao_app) : AOLayer(p_parent, p_ao_app) { @@ -135,27 +130,6 @@ void BackgroundLayer::load_image(QString p_filename) start_playback(ao_app->get_image_suffix(ao_app->get_background_path(p_filename))); } -void ForegroundLayer::load_image(QString p_filename, QString p_charname) -{ - play_once = false; - cull_image = false; - miscname = ao_app->get_char_shouts(p_charname); - qDebug() << "[ForegroundLayer] FG loaded: " << p_filename; - QList<QString> pathlist = { - ao_app->get_image_suffix(ao_app->get_character_path( - p_charname, p_filename)), // first check the character folder - ao_app->get_image_suffix(ao_app->get_theme_path( - "misc/" + miscname + "/" + - p_filename)), // then check our theme's misc directory - ao_app->get_image_suffix(ao_app->get_misc_path( - miscname, p_filename)), // then check our global misc folder - ao_app->get_image_suffix( - ao_app->get_theme_path(p_filename)), // then check the user's theme - ao_app->get_image_suffix(ao_app->get_default_theme_path( - p_filename))}; // and finally check the default theme - start_playback(find_image(pathlist)); -} - void CharLayer::load_image(QString p_filename, QString p_charname, int p_duration, bool p_is_preanim) { @@ -219,12 +193,9 @@ void CharLayer::load_image(QString p_filename, QString p_charname, this->start_playback(find_image(pathlist)); } -void InterjectionLayer::load_image(QString p_filename, QString p_charname, +void SplashLayer::load_image(QString p_filename, QString p_charname, QString p_miscname) { - continuous = false; - force_continuous = true; - play_once = true; transform_mode = ao_app->get_misc_scaling(p_miscname); QList<QString> pathlist = { ao_app->get_image_suffix(ao_app->get_character_path( @@ -269,7 +240,7 @@ void EffectLayer::load_image(QString p_filename, bool p_looping) void InterfaceLayer::load_image(QString p_filename, QString p_miscname) { - transform_mode = ao_app->get_misc_scaling(p_miscname); + stretch = true; QList<QString> pathlist = { ao_app->get_image_suffix(ao_app->get_theme_path( "misc/" + p_miscname + "/" + @@ -371,12 +342,9 @@ void AOLayer::start_playback(QString p_image) int l_delay = m_reader.nextImageDelay(); movie_frames.append(l_pixmap); movie_delays.append(l_delay); - // qDebug() << "appending delay of " << l_delay; } } last_path = p_image; - // qDebug() << "CONT: " << continuous << " MAX: " << max_frames - // << " LAST MAX: " << last_max_frames << " FRAME: " << frame; QPixmap f_pixmap = this->get_pixmap(m_reader.read()); int f_delay = m_reader.nextImageDelay(); |