1 files changed, 11 insertions, 12 deletions

diff --git a/src/aoemotepreview.cpp b/src/aoemotepreview.cpp
index e427cb89..a5a6a271 100644
--- a/src/aoemotepreview.cpp
+++ b/src/aoemotepreview.cpp
@@ -8,9 +8,8 @@ AOEmotePreview::AOEmotePreview(AOApplication *ao_app, QWidget *parent)
   setWindowFlag(Qt::WindowMinMaxButtonsHint, false);
 
   ui_viewport = new QWidget(this);
-  ui_vp_player_char = new CharLayer(ao_app, ui_viewport);
+  ui_vp_player_char = new kal::CharacterAnimationLayer(ao_app, ui_viewport);
   ui_vp_player_char->setObjectName("ui_vp_player_char");
-  ui_vp_player_char->masked = false;
   ui_size_label = new QLabel(this);
   ui_size_label->setObjectName("ui_size_label");
 }
@@ -19,21 +18,22 @@ void AOEmotePreview::updateViewportGeometry()
 {
   ui_viewport->resize(size());
 
-  ui_vp_player_char->move_and_center(0, 0);
-  ui_vp_player_char->combo_resize(ui_viewport->width(), ui_viewport->height());
+  ui_vp_player_char->move(0, 0);
+  ui_vp_player_char->resize(ui_viewport->width(), ui_viewport->height());
 
-  ui_size_label->setText(QString::number(width()) + "x" + QString::number(height()));
+  ui_size_label->setText(QString::number(ui_viewport->width()) + "x" + QString::number(ui_viewport->height()));
 }
 
-void AOEmotePreview::display(QString character, QString emote, bool flipped, int xOffset, int yOffset)
+void AOEmotePreview::display(QString character, QString emote, kal::CharacterAnimationLayer::EmoteType emoteType, bool flipped, int xOffset, int yOffset)
 {
   m_character = character;
   m_emote = emote;
-  ui_vp_player_char->stop();
-  ui_vp_player_char->set_flipped(flipped);
-  ui_vp_player_char->move_and_center(ui_viewport->width() * xOffset / 100, ui_viewport->height() * yOffset / 100);
-  ui_vp_player_char->load_image(emote, character, 0, false);
-  ui_vp_player_char->set_play_once(false);
+  ui_vp_player_char->stopPlayback();
+  ui_vp_player_char->move(ui_viewport->width() * xOffset / 100, ui_viewport->height() * yOffset / 100);
+  ui_vp_player_char->loadCharacterEmote(character, emote, emoteType);
+  ui_vp_player_char->setPlayOnce(false);
+  ui_vp_player_char->setFlipped(flipped);
+  ui_vp_player_char->startPlayback();
   setWindowTitle(character + ": " + emote);
 }
 
@@ -41,5 +41,4 @@ void AOEmotePreview::resizeEvent(QResizeEvent *event)
 {
   QWidget::resizeEvent(event);
   updateViewportGeometry();
-  ui_vp_player_char->load_image(m_emote, m_character, 0, false);
 }