Merge branch 'master' into wip-translator

Wohlstand · Wohlstand · commit c5620ea95332 · 2025-02-18T01:41:52.000+03:00
diff --git a/Editor/common_features/graphicsworkspace.cpp b/Editor/common_features/graphicsworkspace.cpp
@@ -291,7 +291,7 @@ void GraphicsWorkspace::focusOutEvent(QFocusEvent *event)
 void GraphicsWorkspace::wheelEvent(QWheelEvent *event)
 {
     int modS = 128;
-    int modS_h = modS;
+    // int modS_h = modS;
     bool rtl = (qApp->layoutDirection() == Qt::RightToLeft);
 
     if(rtl)
@@ -300,7 +300,7 @@ void GraphicsWorkspace::wheelEvent(QWheelEvent *event)
     if((event->modifiers() & Qt::ShiftModifier) != 0)
     {
         modS *= 2;
-        modS_h *= 2;
+        // modS_h *= 2;
     }
 
     auto delta = event->angleDelta();
diff --git a/Editor/common_features/json_settings_widget.cpp b/Editor/common_features/json_settings_widget.cpp
@@ -803,7 +803,7 @@ QString JsonSettingsWidget::browseForFileValue(QWidget* target, LineEditType typ
             audioPath = music;
         });
 
-        QObject::connect(&muz, &MusicFileList::updateSongPlay, [this, &root, &audioPath]()->void
+        QObject::connect(&muz, &MusicFileList::updateSongPlay, [&root, &audioPath]()->void
         {
             if(MainWinConnect::pMainWin->getPlayMusicAction()->isChecked())
                 LvlMusPlay::previewCustomMusicAbs(root + audioPath);
@@ -819,12 +819,12 @@ QString JsonSettingsWidget::browseForFileValue(QWidget* target, LineEditType typ
             LvlMusPlay::setGain(gain);
         });
 
-        QObject::connect(&muz, &MusicFileList::playSoundFile, [this, &audioPath](const QString &file)->void
+        QObject::connect(&muz, &MusicFileList::playSoundFile, [](const QString &file)->void
         {
             PGE_SfxPlayer::playFile(file);
         });
 
-        QObject::connect(&muz, &MusicFileList::musicButtonClicked, [this, &root, &audioPath](bool st)->void
+        QObject::connect(&muz, &MusicFileList::musicButtonClicked, [&root, &audioPath](bool st)->void
         {
             MainWinConnect::pMainWin->getPlayMusicAction()->setChecked(st);
             if(st)
@@ -1236,7 +1236,7 @@ void JsonSettingsWidget::loadLayoutEntries(JsonSettingsWidget::SetupStack setupT
                 fileBoxL->addWidget(preview, 0);
 
                 QObject::connect(preview, static_cast<void(QPushButton::*)(bool)>(&QPushButton::clicked), this,
-                [id, it, lineType, root, lookAtEpisode, this](bool)
+                [id, it, lineType, root](bool)
                 {
                     QString file = it->text();
                     QString fileNA = file.split('|').first();
@@ -1380,7 +1380,7 @@ void JsonSettingsWidget::loadLayoutEntries(JsonSettingsWidget::SetupStack setupT
             if(button_preview)
             {
                 QObject::connect(button_preview, static_cast<void(QToolButton::*)(bool)>(&QToolButton::clicked), this,
-                [id, list, lineType, root, lookAtEpisode, this](bool)
+                [id, list, lineType, root](bool)
                 {
                     auto selected = list->selectedItems();
                     if(selected.isEmpty())
@@ -1492,7 +1492,7 @@ void JsonSettingsWidget::loadLayoutEntries(JsonSettingsWidget::SetupStack setupT
 
             // Opening an editor of item
             QObject::connect(list, &QListWidget::itemDoubleClicked, this,
-            [this, list, id, lineType, root, filters, target, dialogTitle, dialogDescription](QListWidgetItem* item)->void
+            [this, id, lineType, root, filters, target, dialogTitle, dialogDescription](QListWidgetItem* item)->void
             {
                 if(lineType == JSS_LineEdit_Text)
                     return;
diff --git a/Editor/editing/_dialogs/itemselectdialog.cpp b/Editor/editing/_dialogs/itemselectdialog.cpp
@@ -932,7 +932,7 @@ void ItemSelectDialog::on_Sel_DiaButtonBox_accepted()
             testMusicFile = music;
         });
 
-        QObject::connect(&musicList, &MusicFileList::updateSongPlay, [this, edit, &testMusicFile]()->void
+        QObject::connect(&musicList, &MusicFileList::updateSongPlay, [&testMusicFile]()->void
         {
             if(MainWinConnect::pMainWin->getPlayMusicAction()->isChecked())
                 LvlMusPlay::previewCustomMusic(MainWinConnect::pMainWin, testMusicFile);
@@ -949,7 +949,7 @@ void ItemSelectDialog::on_Sel_DiaButtonBox_accepted()
         });
 
 
-        QObject::connect(&musicList, &MusicFileList::musicButtonClicked, [this, &testMusicFile](bool st)->void
+        QObject::connect(&musicList, &MusicFileList::musicButtonClicked, [&testMusicFile](bool st)->void
         {
             MainWinConnect::pMainWin->getPlayMusicAction()->setChecked(st);
             if(st)
diff --git a/Editor/editing/_scenes/level/data_manager/lvl_custom_gfx.cpp b/Editor/editing/_scenes/level/data_manager/lvl_custom_gfx.cpp
@@ -27,7 +27,7 @@
 //Search and load custom User's files
 void LvlScene::loadUserData(QProgressDialog &progress)
 {
-    int i, total = 0;
+    int i; //, total = 0;
 
     //UserNPCs uNPC;
     QImage tempImg;
@@ -187,7 +187,7 @@ void LvlScene::loadUserData(QProgressDialog &progress)
             if(loaded2) bgU.second_image = uBG.second_image;
         }
 
-        total++;
+        // total++;
         qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
         if(progress.wasCanceled())
             /*progress.setValue(progress.value()+1);
diff --git a/Editor/main_window/dock/lvl_sctc_props.cpp b/Editor/main_window/dock/lvl_sctc_props.cpp
@@ -675,7 +675,7 @@ void LvlSectionProps::on_LVLPropsMusicCustomBrowse_clicked()
         musicPath = music;
     });
 
-    QObject::connect(&musicList, &MusicFileList::updateSongPlay, [this, edit, &musicPath]()->void
+    QObject::connect(&musicList, &MusicFileList::updateSongPlay, [this, &musicPath]()->void
     {
         if(mw()->getPlayMusicAction()->isChecked())
             LvlMusPlay::previewCustomMusic(mw(), musicPath);
@@ -770,7 +770,7 @@ void LvlSectionProps::on_musicSetup_clicked()
         musicPath = music;
     });
 
-    QObject::connect(&set, &CustomMusicSetup::updateSongPlay, [this,edit, &musicPath]()->void
+    QObject::connect(&set, &CustomMusicSetup::updateSongPlay, [this, &musicPath]()->void
     {
         if(mw()->getPlayMusicAction()->isChecked())
             LvlMusPlay::previewCustomMusic(mw(), musicPath);
diff --git a/Editor/main_window/dock/wld_item_toolbox.cpp b/Editor/main_window/dock/wld_item_toolbox.cpp
@@ -382,7 +382,7 @@ void WorldItemBox::MusicList_itemClicked(const QModelIndex &item)
                 customMusicFile = music;
             });
 
-            QObject::connect(&musicList, &MusicFileList::updateSongPlay, [this, edit, &customMusicFile]()->void
+            QObject::connect(&musicList, &MusicFileList::updateSongPlay, [this, &customMusicFile]()->void
             {
                 if(mw()->getPlayMusicAction()->isChecked())
                     LvlMusPlay::previewCustomMusic(mw(), customMusicFile);
diff --git a/Editor/main_window/dock/wld_musicbox_itemset.cpp b/Editor/main_window/dock/wld_musicbox_itemset.cpp
@@ -158,7 +158,7 @@ void WorldMusicBoxItemBox::MusicList_itemClicked(const QModelIndex &item)
                 customMusicFile = music;
             });
 
-            QObject::connect(&musicList, &MusicFileList::updateSongPlay, [this, edit, &customMusicFile]()->void
+            QObject::connect(&musicList, &MusicFileList::updateSongPlay, [this, &customMusicFile]()->void
             {
                 if(mw()->getPlayMusicAction()->isChecked())
                     LvlMusPlay::previewCustomMusic(mw(), customMusicFile);
diff --git a/Engine/scenes/level/player/lvl_player_warps_and_teleports.cpp b/Engine/scenes/level/player/lvl_player_warps_and_teleports.cpp
@@ -342,17 +342,22 @@ void LVL_Player::WarpTo(double x, double y, int warpType, int warpDirection, boo
         else
         {
             EventQueueEntry<LVL_Player >playSnd;
-            playSnd.makeCaller([this]()->void{PGE_Audio::playSoundByRole(obj_sound_role::WarpPipe);
-                                             }, 0);
+            playSnd.makeCaller([]()->void
+            {
+                PGE_Audio::playSoundByRole(obj_sound_role::WarpPipe);
+            }, 0);
             m_eventQueue.events.push_back(playSnd);
+
             double pStep = 1.5 / (1000.0 / m_scene->frameDelay());
+
             EventQueueEntry<LVL_Player >warpOut;
             warpOut.makeWaiterCond([this, pStep]()->bool
             {
                 m_warpPipeOffset -= pStep;
                 return m_warpPipeOffset <= 0.0f;
             }, false, 0);
             m_eventQueue.events.push_back(warpOut);
+
             EventQueueEntry<LVL_Player >endWarping;
             endWarping.makeCaller([this]()->void
             {
diff --git a/Engine/script/lua_engine.cpp b/Engine/script/lua_engine.cpp
@@ -119,7 +119,7 @@ void LuaEngine::init()
     //Add error reporter
     if(!m_errorReporterFunc)
     {
-        m_errorReporterFunc = [this](const std::string & errMsg, const std::string & stacktrace)
+        m_errorReporterFunc = [](const std::string & errMsg, const std::string & stacktrace)
         {
             pLogWarning("Lua-Error: ");
             pLogWarning("Error Message: %s", errMsg.c_str());
diff --git a/LazyFixTool/LazyFixTool.cpp b/LazyFixTool/LazyFixTool.cpp
@@ -372,7 +372,7 @@ int main(int argc, char *argv[])
         cmd.parse(argc, argv);
 
         setup.noMakeBackup      = switchNoBackups.getValue();
-        setup.walkSubDirs     = switchDigRecursive.getValue() | switchDigRecursiveDEP.getValue();
+        setup.walkSubDirs     = switchDigRecursive.getValue() || switchDigRecursiveDEP.getValue();
         //nopause         = switchNoPause.getValue();
 
         setup.pathOut     = outputDirectory.getValue();
diff --git a/MusicPlayer/MainWindow/snes_spc/SPC_DSP.h b/MusicPlayer/MainWindow/snes_spc/SPC_DSP.h
@@ -8,7 +8,8 @@
 
 extern "C" { typedef void (*dsp_copy_func_t)( unsigned char** io, void* state, size_t ); }
 
-class SPC_DSP {
+struct SPC_DSP
+{
 public:
 	typedef BOOST::uint8_t uint8_t;
 
diff --git a/PNG2GIFs/png2gifs.cpp b/PNG2GIFs/png2gifs.cpp
@@ -283,7 +283,7 @@ int main(int argc, char *argv[])
         cmd.parse(argc, argv);
 
         setup.removeSource      = switchRemove.getValue();
-        setup.walkSubDirs     = switchDigRecursive.getValue() | switchDigRecursiveDEP.getValue();
+        setup.walkSubDirs     = switchDigRecursive.getValue() || switchDigRecursiveDEP.getValue();
         //nopause         = switchNoPause.getValue();
 
         setup.pathOut     = outputDirectory.getValue();
diff --git a/PaletteFilter/PaletteFilter.cpp b/PaletteFilter/PaletteFilter.cpp
@@ -297,7 +297,7 @@ int main(int argc, char *argv[])
         cmd.parse(argc, argv);
 
         setup.noMakeBackup      = switchNoBackups.getValue();
-        setup.walkSubDirs     = switchDigRecursive.getValue() | switchDigRecursiveDEP.getValue();
+        setup.walkSubDirs     = switchDigRecursive.getValue() || switchDigRecursiveDEP.getValue();
         //nopause         = switchNoPause.getValue();
 
         setup.pathOut     = outputDirectory.getValue();
diff --git a/_Libs/AudioCodecs b/_Libs/AudioCodecs
@@ -1 +1 @@
-Subproject commit 749c8d97b2493bfef0518c07d68f147a8032ad48
+Subproject commit 4fc55189fc351f88e57992acc491d940372e1a38
diff --git a/_Libs/SDL_Mixer_X b/_Libs/SDL_Mixer_X
@@ -1 +1 @@
-Subproject commit 2f529aa5ad99924fa249598a23b5ebf1a943d121
+Subproject commit 472da67d1b0387408ba37c32eb870e89f16f0a93
diff --git a/_Libs/luabind b/_Libs/luabind
@@ -1 +1 @@
-Subproject commit d92602d3b08146ec8c012372e8d13c4564cd34ab
+Subproject commit aaf638c0baaae01464768f9863d4646e8bc4ac1c
diff --git a/_common/qt-modules/file_list_browser/musicfilelist.cpp b/_common/qt-modules/file_list_browser/musicfilelist.cpp
@@ -150,7 +150,7 @@ MusicFileList::MusicFileList(QString searchDirectory, QString curFile, QWidget *
         });
 
         QObject::connect(m_musicSetupButton, static_cast<void (QPushButton::*)(bool)>(&QPushButton::clicked),
-                         this, [this, &searchDirectory](bool)->void
+                         this, [this](bool)->void
         {
             CustomMusicSetup set(this);
             set.initLists();
@@ -181,7 +181,7 @@ MusicFileList::MusicFileList(QString searchDirectory, QString curFile, QWidget *
                 emit musicGainChanged(gain);
             });
 
-            QObject::connect(&set, &CustomMusicSetup::musicButtonClicked, this, [this, &musicPath](bool st)->void
+            QObject::connect(&set, &CustomMusicSetup::musicButtonClicked, this, [this](bool st)->void
             {
                 m_previewButton->setChecked(st);
                 emit m_previewButton->clicked(st);

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ void GraphicsWorkspace::focusOutEvent(QFocusEvent *event)`
`291`	`291`	`void GraphicsWorkspace::wheelEvent(QWheelEvent *event)`
`292`	`292`	`{`
`293`	`293`	`int modS = 128;`
`294`		`- int modS_h = modS;`
	`294`	`+ // int modS_h = modS;`
`295`	`295`	`bool rtl = (qApp->layoutDirection() == Qt::RightToLeft);`
`296`	`296`
`297`	`297`	`if(rtl)`
`@@ -300,7 +300,7 @@ void GraphicsWorkspace::wheelEvent(QWheelEvent *event)`
`300`	`300`	`if((event->modifiers() & Qt::ShiftModifier) != 0)`
`301`	`301`	`{`
`302`	`302`	`modS *= 2;`
`303`		`- modS_h *= 2;`
	`303`	`+ // modS_h *= 2;`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`auto delta = event->angleDelta();`
Original file line number	Diff line number	Diff line change
`@@ -932,7 +932,7 @@ void ItemSelectDialog::on_Sel_DiaButtonBox_accepted()`
`932`	`932`	`testMusicFile = music;`
`933`	`933`	`});`
`934`	`934`
`935`		`- QObject::connect(&musicList, &MusicFileList::updateSongPlay, [this, edit, &testMusicFile]()->void`
	`935`	`+ QObject::connect(&musicList, &MusicFileList::updateSongPlay, [&testMusicFile]()->void`
`936`	`936`	`{`
`937`	`937`	`if(MainWinConnect::pMainWin->getPlayMusicAction()->isChecked())`
`938`	`938`	`LvlMusPlay::previewCustomMusic(MainWinConnect::pMainWin, testMusicFile);`
`@@ -949,7 +949,7 @@ void ItemSelectDialog::on_Sel_DiaButtonBox_accepted()`
`949`	`949`	`});`
`950`	`950`
`951`	`951`
`952`		`- QObject::connect(&musicList, &MusicFileList::musicButtonClicked, [this, &testMusicFile](bool st)->void`
	`952`	`+ QObject::connect(&musicList, &MusicFileList::musicButtonClicked, [&testMusicFile](bool st)->void`
`953`	`953`	`{`
`954`	`954`	`MainWinConnect::pMainWin->getPlayMusicAction()->setChecked(st);`
`955`	`955`	`if(st)`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ void WorldItemBox::MusicList_itemClicked(const QModelIndex &item)`
`382`	`382`	`customMusicFile = music;`
`383`	`383`	`});`
`384`	`384`
`385`		`- QObject::connect(&musicList, &MusicFileList::updateSongPlay, [this, edit, &customMusicFile]()->void`
	`385`	`+ QObject::connect(&musicList, &MusicFileList::updateSongPlay, [this, &customMusicFile]()->void`
`386`	`386`	`{`
`387`	`387`	`if(mw()->getPlayMusicAction()->isChecked())`
`388`	`388`	`LvlMusPlay::previewCustomMusic(mw(), customMusicFile);`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ void WorldMusicBoxItemBox::MusicList_itemClicked(const QModelIndex &item)`
`158`	`158`	`customMusicFile = music;`
`159`	`159`	`});`
`160`	`160`
`161`		`- QObject::connect(&musicList, &MusicFileList::updateSongPlay, [this, edit, &customMusicFile]()->void`
	`161`	`+ QObject::connect(&musicList, &MusicFileList::updateSongPlay, [this, &customMusicFile]()->void`
`162`	`162`	`{`
`163`	`163`	`if(mw()->getPlayMusicAction()->isChecked())`
`164`	`164`	`LvlMusPlay::previewCustomMusic(mw(), customMusicFile);`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ void LuaEngine::init()`
`119`	`119`	`//Add error reporter`
`120`	`120`	`if(!m_errorReporterFunc)`
`121`	`121`	`{`
`122`		`- m_errorReporterFunc = [this](const std::string & errMsg, const std::string & stacktrace)`
	`122`	`+ m_errorReporterFunc = [](const std::string & errMsg, const std::string & stacktrace)`
`123`	`123`	`{`
`124`	`124`	`pLogWarning("Lua-Error: ");`
`125`	`125`	`pLogWarning("Error Message: %s", errMsg.c_str());`