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

Fix an issue with AOCharmovie hanging on frame1 animations

Browse Source 
Fix an issue with the logger screwing up the server folder name string if character ' was used
This commit is contained in:
Crystalwarrior 2019-09-24 13:29:08 +03:00
parent fb6c5076aa
commit 9911aeb5e6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/aocharmovie.cpp
View File

@ -153,8 +153,12 @@ void AOCharMovie::play()
{ {
play_frame_effect(frame); play_frame_effect(frame);
if (max_frames <= 1) if (max_frames <= 1)
return; {
ticker->start(this->get_frame_delay(movie_delays[frame])); play_once = true;
ticker->start(60);
}
else
ticker->start(this->get_frame_delay(movie_delays[frame]));
} }
void AOCharMovie::play_pre(QString p_char, QString p_emote, int duration) void AOCharMovie::play_pre(QString p_char, QString p_emote, int duration)
@ -281,7 +285,7 @@ void AOCharMovie::move(int ax, int ay)
void AOCharMovie::movie_ticker() void AOCharMovie::movie_ticker()
{ {
++frame; ++frame;
if(frame == max_frames) if(frame >= max_frames)
{ {
if(play_once) if(play_once)
{ {

2
src/packet_distribution.cpp
View File

@ -288,7 +288,7 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
send_server_packet(f_packet); send_server_packet(f_packet);
//Remove any characters not accepted in folder names for the server_name here //Remove any characters not accepted in folder names for the server_name here
this->log_filename = QDateTime::currentDateTime().toUTC().toString("'logs/" + server_name.remove(QRegExp("[\\\\/:*?\"<>|]")) + "/'ddd MMMM yyyy hh.mm.ss t'.log'"); this->log_filename = QDateTime::currentDateTime().toUTC().toString("'logs/" + server_name.remove(QRegExp("[\\\\/:*?\"<>|\']")) + "/'ddd MMMM yyyy hh.mm.ss t'.log'");
this->write_to_file("Joined server " + server_name + " on address " + server_address +" on " + QDateTime::currentDateTime().toUTC().toString(), log_filename, true); this->write_to_file("Joined server " + server_name + " on address " + server_address +" on " + QDateTime::currentDateTime().toUTC().toString(), log_filename, true);
QCryptographicHash hash(QCryptographicHash::Algorithm::Sha256); QCryptographicHash hash(QCryptographicHash::Algorithm::Sha256);
hash.addData(server_address.toUtf8()); hash.addData(server_address.toUtf8());