Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made char movies a bit more consistent in terms of quality

Browse Source
This commit is contained in:
OmniTroid 2017-05-21 21:41:51 +02:00
parent 145dfa4f7d
commit 1e0531a3d3
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
aocharmovie.cpp
View File

@ -42,24 +42,20 @@ void AOCharMovie::play(QString p_char, QString p_emote, QString emote_prefix)
m_movie->stop(); m_movie->stop();
m_movie->setFileName(gif_path); m_movie->setFileName(gif_path);
if (m_flipped) QImageReader *reader = new QImageReader(gif_path);
{
QImageReader *reader = new QImageReader(gif_path);
flipped_movie.clear(); flipped_movie.clear();
QImage f_image = reader->read(); QImage f_image = reader->read();
while (!f_image.isNull()) while (!f_image.isNull())
{ {
if (m_flipped)
flipped_movie.append(f_image.mirrored(true, false)); flipped_movie.append(f_image.mirrored(true, false));
f_image = reader->read(); else
} flipped_movie.append(f_image);
f_image = reader->read();
}
delete reader; delete reader;
}
else
{
this->setMovie(m_movie);
}
this->show(); this->show();
m_movie->start(); m_movie->start();
@ -157,7 +153,7 @@ void AOCharMovie::combo_resize(int w, int h)
void AOCharMovie::frame_change(int n_frame) void AOCharMovie::frame_change(int n_frame)
{ {
if (m_flipped && flipped_movie.size() > n_frame) if (flipped_movie.size() > n_frame)
{ {
QPixmap f_pixmap = QPixmap::fromImage(flipped_movie.at(n_frame)); QPixmap f_pixmap = QPixmap::fromImage(flipped_movie.at(n_frame));

2
aomovie.cpp
View File

@ -10,8 +10,6 @@ AOMovie::AOMovie(QWidget *p_parent, AOApplication *p_ao_app) : QLabel(p_parent)
m_movie = new QMovie(); m_movie = new QMovie();
this->setMovie(m_movie);
connect(m_movie, SIGNAL(frameChanged(int)), this, SLOT(frame_change(int))); connect(m_movie, SIGNAL(frameChanged(int)), this, SLOT(frame_change(int)));
} }

2
courtroom.cpp
View File

@ -1631,7 +1631,7 @@ void Courtroom::on_pos_dropdown_changed(int p_index)
f_pos = ""; f_pos = "";
} }
if (f_pos == "" || ui_ooc_chat_name == "") if (f_pos == "" || ui_ooc_chat_name->text() == "")
return; return;
ao_app->send_server_packet(new AOPacket("CT#" + ui_ooc_chat_name->text() + "#/pos " + f_pos + "#%")); ao_app->send_server_packet(new AOPacket("CT#" + ui_ooc_chat_name->text() + "#/pos " + f_pos + "#%"));