diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2017-12-09 23:35:37 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2017-12-09 23:35:37 +0300 |
| commit | ba588c3c54cda4aa0accb868f5a9825a0361fcf8 (patch) | |
| tree | a5c2a2ca35ab3a9b5bfc6c49c328261e951c4c3b /utils | |
| parent | 03ae1603df780d1f66862b7ea96c66a277452eb8 (diff) | |
| parent | 58dd9b34bff3110392a05e952885057433b60559 (diff) | |
| download | libADLMIDI-ba588c3c54cda4aa0accb868f5a9825a0361fcf8.tar.gz libADLMIDI-ba588c3c54cda4aa0accb868f5a9825a0361fcf8.tar.bz2 libADLMIDI-ba588c3c54cda4aa0accb868f5a9825a0361fcf8.zip | |
Merge branch 'master' into openwatcom-debug
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/adlmidi-2/9x15.hpp | 6 | ||||
| -rw-r--r-- | utils/adlmidi-2/input.cc | 4 | ||||
| -rw-r--r-- | utils/adlmidi-2/input.hpp | 2 | ||||
| -rw-r--r-- | utils/adlmidi-2/puzzlegame.cc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/utils/adlmidi-2/9x15.hpp b/utils/adlmidi-2/9x15.hpp index 0461a6f..9812951 100644 --- a/utils/adlmidi-2/9x15.hpp +++ b/utils/adlmidi-2/9x15.hpp @@ -131,17 +131,17 @@ static const unsigned char bitmap[3840] = { }; static const struct unicode_to_bitmap_index_generator { - static uint_least8_t Help(uint_least8_t index, bool InRecursion) + static uint_least8_t Help(uint8_t index, bool InRecursion) { return InRecursion ? (index & 0xFF) : Find(UnicodeToASCIIapproximation(index)&0xFF, true); } - static uint_least8_t Find(uint_least8_t index, bool InRecursion) + static uint_least8_t Find(uint8_t index, bool InRecursion) { return (index < 160) ? ((index < 127) ? index - 0 : Help(index,InRecursion)) - : ((index < 256) ? index - 33 : Help(index,InRecursion)) + : /*((index < 256) ?*/ index - 33 /*: Help(index,InRecursion))*/ ; } uint_least8_t operator[] (uint_least8_t index) const { return Find(index, false); } diff --git a/utils/adlmidi-2/input.cc b/utils/adlmidi-2/input.cc index 9d69469..bb276cb 100644 --- a/utils/adlmidi-2/input.cc +++ b/utils/adlmidi-2/input.cc @@ -5,7 +5,7 @@ xInput::xInput() #ifdef _WIN32 inhandle = GetStdHandle(STD_INPUT_HANDLE); #endif -#if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) +#if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) && !defined(__APPLE__) ioctl(0, TCGETA, &back); struct termio term = back; term.c_lflag &= ~(ICANON | ECHO); @@ -17,7 +17,7 @@ xInput::xInput() xInput::~xInput() { -#if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) +#if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) && !defined(__APPLE__) if(ioctl(0, TCSETA, &back) < 0) fcntl(0, F_SETFL, fcntl(0, F_GETFL) & ~ O_NONBLOCK); #endif diff --git a/utils/adlmidi-2/input.hpp b/utils/adlmidi-2/input.hpp index 59f7f8c..0cafd51 100644 --- a/utils/adlmidi-2/input.hpp +++ b/utils/adlmidi-2/input.hpp @@ -34,7 +34,7 @@ class xInput #ifdef _WIN32 void *inhandle; #endif - #if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) + #if (!defined(_WIN32) || defined(__CYGWIN__)) && !defined(__DJGPP__) && !defined(__APPLE__) struct termio back; #endif public: diff --git a/utils/adlmidi-2/puzzlegame.cc b/utils/adlmidi-2/puzzlegame.cc index 64c032a..07ceb94 100644 --- a/utils/adlmidi-2/puzzlegame.cc +++ b/utils/adlmidi-2/puzzlegame.cc @@ -92,7 +92,7 @@ bool ADLMIDI_PuzzleGame::TetrisArea::CascadeEmpty(int FirstY) "QUINTUPLE " " SEXTUPLE " " SEPTUPLE " - " OCTUPLE " + (n_full - 1) * 10; + " OCTUPLE " + ((n_full - 1) * 10); for(int y = FirstY; y < Height - 1; ++y) if(list_full & (1u << y)) DrawBlock(animx, y, label[(animx % 10)] + 0x100); |