Renamed pos_center to rect from Background/design.ini
This commit is contained in:
parent
29284c0b21
commit
eb024cb931
@ -1413,7 +1413,7 @@ void Courtroom::set_background(QString p_background, bool display)
|
|||||||
const QStringList overrides = {"def", "wit", "pro"};
|
const QStringList overrides = {"def", "wit", "pro"};
|
||||||
for (const QString &override_pos : overrides)
|
for (const QString &override_pos : overrides)
|
||||||
{
|
{
|
||||||
if (!ao_app->read_design_ini("court:" + override_pos + "/pos_center", ao_app->get_background_path("design.ini")).isEmpty())
|
if (!ao_app->read_design_ini("court:" + override_pos + "/rect", ao_app->get_background_path("design.ini")).isEmpty())
|
||||||
{
|
{
|
||||||
pos_list.append(override_pos);
|
pos_list.append(override_pos);
|
||||||
}
|
}
|
||||||
@ -3155,7 +3155,7 @@ void Courtroom::do_effect(QString fx_path, QString fx_sound, QString p_char, QSt
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
QString effect = ao_app->get_effect(fx_path, p_char, p_folder);
|
QString effect = ao_app->get_effect(fx_path, p_char, p_folder);
|
||||||
if (effect == "")
|
if (effect.isEmpty())
|
||||||
{
|
{
|
||||||
ui_vp_effect->stopPlayback();
|
ui_vp_effect->stopPlayback();
|
||||||
ui_vp_effect->hide();
|
ui_vp_effect->hide();
|
||||||
|
@ -100,7 +100,7 @@ QPair<QString, QRect> AOApplication::get_pos_path(const QString &pos, const bool
|
|||||||
QRect f_rect;
|
QRect f_rect;
|
||||||
if (f_pos_split.size() > 1)
|
if (f_pos_split.size() > 1)
|
||||||
{ // Subposition, get center info
|
{ // Subposition, get center info
|
||||||
QStringList arglist = read_design_ini(f_pos + "/pos_center", get_background_path("design.ini")).split(",");
|
QStringList arglist = read_design_ini(f_pos + "/rect", get_background_path("design.ini")).split(",");
|
||||||
if (arglist.size() == 4)
|
if (arglist.size() == 4)
|
||||||
{
|
{
|
||||||
f_rect = QRect(arglist[0].toInt(), arglist[1].toInt(), arglist[2].toInt(), arglist[3].toInt());
|
f_rect = QRect(arglist[0].toInt(), arglist[1].toInt(), arglist[2].toInt(), arglist[3].toInt());
|
||||||
|
Loading…
Reference in New Issue
Block a user