aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSkoland <Skoland>2017-02-18 08:28:31 +0100
committerSkoland <Skoland>2017-02-18 08:28:31 +0100
commit55803c520d0a60c59cb52bac47f547a8672eb285 (patch)
tree780aa9aefe23ddb2f5a04679570924cfc9980240
parent0cbb6e765f18f8c1fbc3b82959053e2a0c49307f (diff)
attempted fixing a bug where the first frame of a preanim would display after it has played
-rw-r--r--aocharmovie.cpp4
-rw-r--r--courtroom.cpp1
-rw-r--r--path_functions.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/aocharmovie.cpp b/aocharmovie.cpp
index 93d5d58a..a596e53e 100644
--- a/aocharmovie.cpp
+++ b/aocharmovie.cpp
@@ -157,12 +157,12 @@ void AOCharMovie::frame_change(int n_frame)
if (m_movie->frameCount() - 1 == n_frame && play_once)
{
preanim_timer->start(m_movie->nextFrameDelay());
- //done();
+ m_movie->stop();
}
}
void AOCharMovie::timer_done()
{
- qDebug() << "timer done called";
+
done();
}
diff --git a/courtroom.cpp b/courtroom.cpp
index 5d4e1338..64f13175 100644
--- a/courtroom.cpp
+++ b/courtroom.cpp
@@ -421,7 +421,6 @@ void Courtroom::set_widgets()
set_size_and_pos(ui_music_list, "music_list");
ui_music_list->setStyleSheet("QListWidget{background-color: rgba(0, 0, 0, 0);}");
- ui_music_list->setFont(pt_8);
set_size_and_pos(ui_ic_chat_message, "ic_chat_message");
ui_ic_chat_message->setStyleSheet("background-color: rgba(100, 100, 100, 255);");
diff --git a/path_functions.cpp b/path_functions.cpp
index a6c7b860..d76a6a03 100644
--- a/path_functions.cpp
+++ b/path_functions.cpp
@@ -11,6 +11,8 @@ QString AOApplication::get_base_path()
return "/media/omnitroid/Data/winshare/AO/client/base/";
#elif defined(OMNI_WIN_DEBUG)
return "E:/AO/client/base/";
+#elif defined(OMNI_WIN_DEBUG2)
+ return "F:/winshare/AO/client/base/";
#else
return (QDir::currentPath() + "/base/");
#endif