aboutsummaryrefslogtreecommitdiff
path: root/utils/adlmidi-2
diff options
context:
space:
mode:
Diffstat (limited to 'utils/adlmidi-2')
-rw-r--r--utils/adlmidi-2/midiplay.cc3
-rw-r--r--utils/adlmidi-2/puzzlegame.cc8
2 files changed, 7 insertions, 4 deletions
diff --git a/utils/adlmidi-2/midiplay.cc b/utils/adlmidi-2/midiplay.cc
index 8fe1c8a..b5f43dc 100644
--- a/utils/adlmidi-2/midiplay.cc
+++ b/utils/adlmidi-2/midiplay.cc
@@ -1608,6 +1608,7 @@ int main(int argc, char **argv)
" -w [<filename>] Write WAV file rather than playing\n"
" -d [<filename>] Write video file using ffmpeg\n"
#ifndef HARDWARE_OPL3
+ " -fp Enables full-panning stereo support\n"
" --emu-nuked Uses Nuked OPL3 v 1.8 emulator\n"
" --emu-nuked7 Uses Nuked OPL3 v 1.7.4 emulator\n"
" --emu-dosbox Uses DosBox 0.74 OPL3 emulator\n"
@@ -1676,6 +1677,8 @@ int main(int argc, char **argv)
else if(!std::strcmp("-frb", argv[2]))
adl_setFullRangeBrightness(myDevice, 1);
#ifndef HARDWARE_OPL3
+ else if(!std::strcmp("-fp", argv[2]))
+ adl_setSoftPanEnabled(myDevice, 1);
else if(!std::strcmp("--emu-nuked", argv[2]))
emulator = ADLMIDI_EMU_NUKED;
else if(!std::strcmp("--emu-nuked7", argv[2]))
diff --git a/utils/adlmidi-2/puzzlegame.cc b/utils/adlmidi-2/puzzlegame.cc
index f8fa57c..e7b9890 100644
--- a/utils/adlmidi-2/puzzlegame.cc
+++ b/utils/adlmidi-2/puzzlegame.cc
@@ -90,7 +90,7 @@ bool ADLMIDI_PuzzleGame::TetrisArea::CascadeEmpty(int FirstY)
* FIXME: Improve weird code fragment disliked by CLang
* /////////BEGIN////////////
*/
- auto label =
+ auto label = &
" SINGLE "
" DOUBLE "
" TRIPLE "
@@ -100,7 +100,7 @@ bool ADLMIDI_PuzzleGame::TetrisArea::CascadeEmpty(int FirstY)
" SEXTUPLE "
" SEPTUPLE "
" OCTUPLE "
- + ((n_full - 1) * 10);
+ [(n_full - 1) * 10];
for(int y = FirstY; y < Height - 1; ++y)
{
if(list_full & (1u << y))
@@ -214,9 +214,9 @@ int ADLMIDI_PuzzleGame::TetrisAIengine::AI_Run(const decltype(Area)&in_area, con
for(unsigned rot2 = 0; rot2 < 4; ++rot2)
for(int x2 = -1; x2 <= 1; ++x2)
{
- positions1.push_back(std::move<position> ({int(rot), x, int(rot2), x2}));
+ positions1.push_back(position{int(rot), x, int(rot2), x2});
if(rot2 == rot && x2 == 0)
- positions2.push_back(std::move<position> ({int(rot), x, int(rot2), x2}));
+ positions2.push_back(position{int(rot), x, int(rot2), x2});
}
confident = false;