Skip to content

Commit 50204ec

Browse files
authored
[Bugfix] Fix slides not applying the X offset during slide position calculaiton (#1038)
* Make slides correctly respect X offset * Bump to RC4 cause I am cute like that
1 parent b7dd898 commit 50204ec

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

src/aoapplication.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void AOApplication::destruct_courtroom()
119119

120120
QString AOApplication::get_version_string()
121121
{
122-
return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." + QString::number(MINOR_VERSION) + " RC3";
122+
return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." + QString::number(MINOR_VERSION) + " RC4";
123123
}
124124

125125
QString AOApplication::find_image(QStringList p_list)

src/courtroom.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "courtroom.h"
22

3+
#include "datatypes.h"
34
#include "moderation_functions.h"
45
#include "options.h"
56

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

30093010
auto calculate_offset_and_setup_layer = [&, this](kal::CharacterAnimationLayer *layer, QPoint newPos, QString rawOffset) {
30103011
QPoint offset;
3011-
QStringList offset_data = rawOffset.split(",");
3012+
QStringList offset_data = rawOffset.split("&");
30123013
offset.setX(viewport_width * offset_data.at(0).toInt() * 0.01);
30133014
if (offset_data.size() > 1)
30143015
{
@@ -3019,7 +3020,7 @@ void Courtroom::do_transition(QString p_desk_mod, QString oldPosId, QString newP
30193020
layer->setPlayOnce(false);
30203021
layer->pausePlayback(true);
30213022
layer->startPlayback();
3022-
layer->move(newPos);
3023+
layer->move(newPos + offset);
30233024
layer->show();
30243025
};
30253026

0 commit comments

Comments
 (0)