Merge branch 'master' into stable

4 files changed, 10 insertions, 7 deletions

diff --git a/utils/adlmidi-2/9x15.hpp b/utils/adlmidi-2/9x15.hpp
index e535d49..76e0660 100644
--- a/utils/adlmidi-2/9x15.hpp
+++ b/utils/adlmidi-2/9x15.hpp
@@ -160,8 +160,8 @@ struct font9x15: public UIfontBase
     virtual unsigned GetIndex(char32_t c) const { return ns_font9x15::unicode_to_bitmap_index[c]; }
 };
 
-static UIfontBase* Getfont9x15()
-{
-    static font9x15 f;
-    return &f;
-}
+//static UIfontBase* Getfont9x15()
+//{
+//    static font9x15 f;
+//    return &f;
+//}
diff --git a/utils/adlmidi-2/midiplay.cc b/utils/adlmidi-2/midiplay.cc
index b670083..74806eb 100644
--- a/utils/adlmidi-2/midiplay.cc
+++ b/utils/adlmidi-2/midiplay.cc
@@ -1593,6 +1593,7 @@ int main(int argc, char **argv)
         UI.Color(7);
         std::fflush(stderr);
         std::printf(
+            "\n\n"
             "Usage: adlmidi <midifilename> [ <options> ] [ <banknumber> [ <numcards> [ <numfourops>] ] ]\n"
             "       adlmidi <midifilename> -1   To enter instrument tester\n"
             " -p Enables adlib percussion instrument mode (use with CMF files)\n"
@@ -1758,7 +1759,7 @@ int main(int argc, char **argv)
 
     if(argc >= 3)
     {
-        if(is_number(argv[2]))
+        if(is_number(argv[2]) || !strcmp(argv[2], "-1"))
         {
             int bankno = std::atoi(argv[2]);
             if(bankno == -1)
diff --git a/utils/adlmidi-2/puzzlegame.cc b/utils/adlmidi-2/puzzlegame.cc
index e9d2b9b..f8fa57c 100644
--- a/utils/adlmidi-2/puzzlegame.cc
+++ b/utils/adlmidi-2/puzzlegame.cc
@@ -4,6 +4,8 @@
 #include "input.hpp"
 #include "puzzlegame.hpp"
 
+char ADLMIDI_PuzzleGame::peeked_input = 0;
+
 unsigned long ADLMIDI_PuzzleGame::TimerRead()
 {
     static std::chrono::time_point<std::chrono::system_clock> begin = std::chrono::system_clock::now();
diff --git a/utils/adlmidi-2/puzzlegame.hpp b/utils/adlmidi-2/puzzlegame.hpp
index 03ad921..a35f1cb 100755
--- a/utils/adlmidi-2/puzzlegame.hpp
+++ b/utils/adlmidi-2/puzzlegame.hpp
@@ -36,7 +36,7 @@ namespace ADLMIDI_PuzzleGame
     void Sound(unsigned/*freq*/, unsigned/*duration*/);
     void PutCell(int x, int y, unsigned cell);
     void ScreenPutString(const char* str, unsigned attr, unsigned column, unsigned row);
-    static char peeked_input = 0;
+    extern char peeked_input;
     bool kbhit();
     char getch();