Skip to content

Commit

Permalink
[Bugfix] Fix slides not applying the X offset during slide position c…
Browse files Browse the repository at this point in the history
…alculaiton (#1038)

* Make slides correctly respect X offset

* Bump to RC4 cause I am cute like that
  • Loading branch information
Salanto authored Aug 24, 2024
1 parent b7dd898 commit 50204ec
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/aoapplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void AOApplication::destruct_courtroom()

QString AOApplication::get_version_string()
{
return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." + QString::number(MINOR_VERSION) + " RC3";
return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." + QString::number(MINOR_VERSION) + " RC4";
}

QString AOApplication::find_image(QStringList p_list)
Expand Down
5 changes: 3 additions & 2 deletions src/courtroom.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "courtroom.h"

#include "datatypes.h"
#include "moderation_functions.h"
#include "options.h"

Expand Down Expand Up @@ -3008,7 +3009,7 @@ void Courtroom::do_transition(QString p_desk_mod, QString oldPosId, QString newP

auto calculate_offset_and_setup_layer = [&, this](kal::CharacterAnimationLayer *layer, QPoint newPos, QString rawOffset) {
QPoint offset;
QStringList offset_data = rawOffset.split(",");
QStringList offset_data = rawOffset.split("&");
offset.setX(viewport_width * offset_data.at(0).toInt() * 0.01);
if (offset_data.size() > 1)
{
Expand All @@ -3019,7 +3020,7 @@ void Courtroom::do_transition(QString p_desk_mod, QString oldPosId, QString newP
layer->setPlayOnce(false);
layer->pausePlayback(true);
layer->startPlayback();
layer->move(newPos);
layer->move(newPos + offset);
layer->show();
};

Expand Down

0 comments on commit 50204ec

Please sign in to comment.