[Scummvm-git-logs] scummvm master -> 92cae5cdfcea616f69795151fa6e8e6da55f3757
bluegr
noreply at scummvm.org
Fri Dec 22 17:22:58 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
92cae5cdfc DEVTOOLS: Fix create_lure and create_titanic not compiling in Visual Studio
Commit: 92cae5cdfcea616f69795151fa6e8e6da55f3757
https://github.com/scummvm/scummvm/commit/92cae5cdfcea616f69795151fa6e8e6da55f3757
Author: elasota (1137273+elasota at users.noreply.github.com)
Date: 2023-12-22T19:22:55+02:00
Commit Message:
DEVTOOLS: Fix create_lure and create_titanic not compiling in Visual Studio
Changed paths:
devtools/create_lure/create_lure_dat.cpp
devtools/create_project/msbuild.cpp
diff --git a/devtools/create_lure/create_lure_dat.cpp b/devtools/create_lure/create_lure_dat.cpp
index 8e198dfe1c6..096711ba771 100644
--- a/devtools/create_lure/create_lure_dat.cpp
+++ b/devtools/create_lure/create_lure_dat.cpp
@@ -30,10 +30,15 @@
#pragma GCC diagnostic ignored "-Wnarrowing"
#endif
+#ifdef _MSC_VER
+#pragma warning(disable:4838) // Narrowing conversion
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "create_lure_dat.h"
+#include "common/ptr.h"
using namespace Common;
@@ -871,13 +876,13 @@ void read_anim_data(byte *&data, uint16 &totalSize) {
if (includeAnim[ctr]) {
// Loop to get movement records
- uint16 *inDirs[4] = {&inRec.leftOffset, &inRec.rightOffset,
+ UnalignedPtr<uint16> inDirs[4] = {&inRec.leftOffset, &inRec.rightOffset,
&inRec.upOffset, &inRec.downOffset};
- uint16 *outDirs[4] = {&rec->leftOffset, &rec->rightOffset,
+ UnalignedPtr<uint16> outDirs[4] = {&rec->leftOffset, &rec->rightOffset,
&rec->upOffset, &rec->downOffset};
for (dirCtr=0; dirCtr<4; ++dirCtr) {
- offset = READ_LE_UINT16(inDirs[dirCtr]);
+ offset = FROM_LE_16(inDirs[dirCtr].load());
if (offset == 0) {
startOffset = 0;
@@ -902,7 +907,7 @@ void read_anim_data(byte *&data, uint16 &totalSize) {
moveOffset += 2;
}
- WRITE_LE_UINT16(outDirs[dirCtr], startOffset);
+ outDirs[dirCtr].store(TO_LE_16(startOffset));
}
}
}
@@ -1463,27 +1468,27 @@ const DecoderEntry englishDecoders[] = {
{"110010", 'g'}, {"110011", '\0'}, {"110100", 'w'}, {"110101", 'c'},
{"110110", 'f'}, {"1101110", '.'}, {"1101111", 'm'}, {"111000", 'p'},
{"111001", 'b'}, {"1110100", ','}, {"1110101", 'k'}, {"1110110", '\''},
- {"11101110", 'I'}, {"11101111", 'v'}, {"1111000", '!'}, {"1111001", '\xb4'},
- {"11110100", 'T'}, {"11110101", '\xb5'}, {"11110110", '?'}, {"111101110", '\xb2'},
- {"111101111", '\xb3'}, {"11111000", 'W'}, {"111110010", 'H'}, {"111110011", 'A'},
- {"111110100", '\xb1'}, {"111110101", 'S'}, {"111110110", 'Y'}, {"1111101110", 'G'},
+ {"11101110", 'I'}, {"11101111", 'v'}, {"1111000", '!'}, {"1111001", 0xb4},
+ {"11110100", 'T'}, {"11110101", 0xb5}, {"11110110", '?'}, {"111101110", 0xb2},
+ {"111101111", 0xb3}, {"11111000", 'W'}, {"111110010", 'H'}, {"111110011", 'A'},
+ {"111110100", 0xb1}, {"111110101", 'S'}, {"111110110", 'Y'}, {"1111101110", 'G'},
{"11111011110", 'M'}, {"11111011111", 'N'}, {"111111000", 'O'}, {"1111110010", 'E'},
{"1111110011", 'L'}, {"1111110100", '-'}, {"1111110101", 'R'}, {"1111110110", 'B'},
- {"11111101110", 'D'}, {"11111101111", '\xa6'}, {"1111111000", 'C'},
- {"11111110010", 'x'}, {"11111110011", 'j'}, {"1111111010", '\xac'},
- {"11111110110", '\xa3'}, {"111111101110", 'P'}, {"111111101111", 'U'},
- {"11111111000", 'q'}, {"11111111001", '\xad'}, {"111111110100", 'F'},
- {"111111110101", '1'}, {"111111110110", '\xaf'}, {"1111111101110", ';'},
- {"1111111101111", 'z'}, {"111111111000", '\xa5'}, {"1111111110010", '2'},
- {"1111111110011", '\xb0'}, {"111111111010", 'K'}, {"1111111110110", '%'},
- {"11111111101110", '\xa2'}, {"11111111101111", '5'}, {"1111111111000", ':'},
+ {"11111101110", 'D'}, {"11111101111", 0xa6}, {"1111111000", 'C'},
+ {"11111110010", 'x'}, {"11111110011", 'j'}, {"1111111010", 0xac},
+ {"11111110110", 0xa3}, {"111111101110", 'P'}, {"111111101111", 'U'},
+ {"11111111000", 'q'}, {"11111111001", 0xad}, {"111111110100", 'F'},
+ {"111111110101", '1'}, {"111111110110", 0xaf}, {"1111111101110", ';'},
+ {"1111111101111", 'z'}, {"111111111000", 0xa5}, {"1111111110010", '2'},
+ {"1111111110011", 0xb0}, {"111111111010", 'K'}, {"1111111110110", '%'},
+ {"11111111101110", 0xa2}, {"11111111101111", '5'}, {"1111111111000", ':'},
{"1111111111001", 'J'}, {"1111111111010", 'V'}, {"11111111110110", '6'},
- {"11111111110111", '3'}, {"1111111111100", '\xab'}, {"11111111111010", '\xae'},
+ {"11111111110111", '3'}, {"1111111111100", 0xab}, {"11111111111010", 0xae},
{"111111111110110", '0'}, {"111111111110111", '4'}, {"11111111111100", '7'},
{"111111111111010", '9'}, {"111111111111011", '"'}, {"111111111111100", '8'},
- {"111111111111101", '\xa7'}, {"1111111111111100", '/'}, {"1111111111111101", 'Q'},
- {"11111111111111100", '\xa8'}, {"11111111111111101", '('}, {"111111111111111100", ')'},
- {"111111111111111101", '\x99'}, {"11111111111111111", '\xa9'},
+ {"111111111111101", 0xa7}, {"1111111111111100", '/'}, {"1111111111111101", 'Q'},
+ {"11111111111111100", 0xa8}, {"11111111111111101", '('}, {"111111111111111100", ')'},
+ {"111111111111111101", 0x99}, {"11111111111111111", 0xa9},
{nullptr, '\0'}
};
@@ -1495,198 +1500,198 @@ const DecoderEntry konamiDecoders[] = {
{ "11000", 'u' }, { "110010", 'w' }, { "1100110", 'c' },
{ "1100111", 'f' }, { "110100", '.' }, { "110101", 'y' },
{ "110110", 'p' }, { "1101110", 'b' }, { "1101111", ',' },
- { "111000", '\xA1' }, { "1110010", 'k' }, { "1110011", '\'' },
- { "1110100", 'I' }, { "1110101", 'v' }, { "1110110", '\xA4' },
- { "11101110", '!' }, { "11101111", '\xB0' }, { "1111000", '\xB8' },
- { "11110010", '?' }, { "111100110", '\xA2' }, { "111100111", '\xAA' },
+ { "111000", 0xA1 }, { "1110010", 'k' }, { "1110011", '\'' },
+ { "1110100", 'I' }, { "1110101", 'v' }, { "1110110", 0xA4 },
+ { "11101110", '!' }, { "11101111", 0xB0 }, { "1111000", 0xB8 },
+ { "11110010", '?' }, { "111100110", 0xA2 }, { "111100111", 0xAA },
{ "11110100", 'W' }, { "111101010", 'A' }, { "111101011", 'H' },
- { "111101100", 'T' }, { "111101101", '\xF2' }, { "111101110", '\xA3' },
- { "1111011110", 'G' }, { "11110111110", 'S' }, { "11110111111", '\xC5' },
+ { "111101100", 'T' }, { "111101101", 0xF2 }, { "111101110", 0xA3 },
+ { "1111011110", 'G' }, { "11110111110", 'S' }, { "11110111111", 0xC5 },
{ "111110000", 'Y' }, { "111110001", 'M' }, { "111110010", 'N' },
{ "1111100110", 'O' }, { "1111100111", 'L' }, { "111110100", 'E' },
- { "1111101010", '-' }, { "11111010110", '\xEF' }, { "11111010111", 'R' },
- { "1111101100", 'B' }, { "1111101101", 'D' }, { "1111101110", '\xC8' },
- { "11111011110", 'C' }, { "11111011111", 'x' }, { "1111110000", '\xA7' },
- { "1111110001", '\xE6' }, { "1111110010", 'j' }, { "11111100110", '\xAF' },
- { "11111100111", '\xBE' }, { "1111110100", '\xE0' }, { "11111101010", '\xC7' },
- { "11111101011", '\xB1' }, { "1111110110", '\xC9' }, { "11111101110", '\x50' },
- { "111111011110", 'U' }, { "111111011111", '\xBD' }, { "1111111000", 'q' },
- { "11111110010", '\xBC' }, { "111111100110", '\xDC' }, { "111111100111", '\xE9' },
- { "11111110100", 'F' }, { "111111101010", 'z' }, { "111111101011", '\xDB' },
- { "11111110110", '\xA0' }, { "111111101110", '\xC2' }, { "1111111011110", '\xC4' },
- { "1111111011111", '1' }, { "11111111000", '\xCD' }, { "111111110010", '\xBA' },
- { "1111111100110", '\xEE' }, { "1111111100111", ';' }, { "111111110100", '2' },
- { "1111111101010", '\xD9' }, { "1111111101011", 'K' }, { "1111111101100", '\xC3' },
- { "1111111101101", '%' }, { "1111111101110", '5' }, { "1111111101111", '\xE8' },
+ { "1111101010", '-' }, { "11111010110", 0xEF }, { "11111010111", 'R' },
+ { "1111101100", 'B' }, { "1111101101", 'D' }, { "1111101110", 0xC8 },
+ { "11111011110", 'C' }, { "11111011111", 'x' }, { "1111110000", 0xA7 },
+ { "1111110001", 0xE6 }, { "1111110010", 'j' }, { "11111100110", 0xAF },
+ { "11111100111", 0xBE }, { "1111110100", 0xE0 }, { "11111101010", 0xC7 },
+ { "11111101011", 0xB1 }, { "1111110110", 0xC9 }, { "11111101110", 0x50 },
+ { "111111011110", 'U' }, { "111111011111", 0xBD }, { "1111111000", 'q' },
+ { "11111110010", 0xBC }, { "111111100110", 0xDC }, { "111111100111", 0xE9 },
+ { "11111110100", 'F' }, { "111111101010", 'z' }, { "111111101011", 0xDB },
+ { "11111110110", 0xA0 }, { "111111101110", 0xC2 }, { "1111111011110", 0xC4 },
+ { "1111111011111", '1' }, { "11111111000", 0xCD }, { "111111110010", 0xBA },
+ { "1111111100110", 0xEE }, { "1111111100111", ';' }, { "111111110100", '2' },
+ { "1111111101010", 0xD9 }, { "1111111101011", 'K' }, { "1111111101100", 0xC3 },
+ { "1111111101101", '%' }, { "1111111101110", '5' }, { "1111111101111", 0xE8 },
{ "111111111000", '6' }, { "1111111110010", ':' }, { "1111111110011", 'J' },
- { "1111111110100", 'V' }, { "1111111110101", '\xA6' }, { "1111111110110", '\xB7' },
- { "11111111101110", '\xD0' }, { "11111111101111", '\xAE' }, { "1111111111000", '\xE3' },
- { "1111111111001", '3' }, { "1111111111010", '\xC0' }, { "11111111110110", '0' },
+ { "1111111110100", 'V' }, { "1111111110101", 0xA6 }, { "1111111110110", 0xB7 },
+ { "11111111101110", 0xD0 }, { "11111111101111", 0xAE }, { "1111111111000", 0xE3 },
+ { "1111111111001", '3' }, { "1111111111010", 0xC0 }, { "11111111110110", '0' },
{ "111111111101110", '4' }, { "111111111101111", '9' }, { "11111111111000", '7' },
- { "11111111111001", '8' }, { "11111111111010", '\xD8' }, { "111111111110110", '\xE4' },
- { "111111111110111", '\xED' }, { "111111111111000", '\xAC' }, { "111111111111001", '"' },
- { "111111111111010", '/' }, { "111111111111011", '\xD5' }, { "111111111111100", '\xEA' },
- { "111111111111101", '\xEB' }, { "1111111111111100", 'Q' }, { "1111111111111101", '\xA5' },
- { "11111111111111100", '\x99' }, { "111111111111111010", '(' }, { "111111111111111011", ')' },
- { "111111111111111100", '\xB2' }, { "111111111111111101", '\xDA' },
- { "11111111111111111", '\xEC' },
+ { "11111111111001", '8' }, { "11111111111010", 0xD8 }, { "111111111110110", 0xE4 },
+ { "111111111110111", 0xED }, { "111111111111000", 0xAC }, { "111111111111001", '"' },
+ { "111111111111010", '/' }, { "111111111111011", 0xD5 }, { "111111111111100", 0xEA },
+ { "111111111111101", 0xEB }, { "1111111111111100", 'Q' }, { "1111111111111101", 0xA5 },
+ { "11111111111111100", 0x99 }, { "111111111111111010", '(' }, { "111111111111111011", ')' },
+ { "111111111111111100", 0xB2 }, { "111111111111111101", 0xDA },
+ { "11111111111111111", 0xEC },
{ nullptr, '\0' }
};
const DecoderEntry italianDecoders[] = {
- {"00", ' '}, {"010", (char) 0x69}, {"0110", (char) 0x6F}, {"01110", (char) 0x61}, {"01111", (char) 0x65},
- {"1000", (char) 0x72}, {"1001", (char) 0x6E}, {"1010", (char) 0x74}, {"10110", (char) 0x73}, {"101110", (char) 0x6C},
- {"101111", (char) 0x63}, {"11000", (char) 0x75}, {"110010", (char) 0x70}, {"110011", (char) 0x64}, {"110100", 0},
- {"110101", (char) 0x6D}, {"110110", (char) 0x67}, {"1101110", (char) 0x2E}, {"1101111", (char) 0x76},
- {"111000", (char) 0x68}, {"1110010", (char) 0x2C}, {"1110011", (char) 0x62}, {"1110100", (char) 0x66},
- {"1110101", (char) 0x21}, {"1110110", (char) 0xB5}, {"11101110", (char) 0xB1}, {"111011110", (char) 0xB3},
- {"111011111", (char) 0x7A}, {"1111000", (char) 0xB4}, {"11110010", (char) 0x27}, {"111100110", (char) 0x4E},
- {"111100111", (char) 0x4C}, {"11110100", (char) 0x3F}, {"111101010", (char) 0x85}, {"111101011", (char) 0x53},
- {"11110110", (char) 0x43}, {"111101110", (char) 0x4D}, {"1111011110", (char) 0xAC}, {"1111011111", (char) 0x49},
- {"11111000", (char) 0x45}, {"111110010", (char) 0x41}, {"1111100110", (char) 0x54}, {"1111100111", (char) 0xB2},
- {"111110100", (char) 0x71}, {"111110101", (char) 0x4F}, {"111110110", (char) 0x47}, {"1111101110", (char) 0xAB},
- {"11111011110", (char) 0x50}, {"11111011111", (char) 0x44}, {"111111000", (char) 0x81},
- {"1111110010", (char) 0x55}, {"11111100110", (char) 0xAE}, {"11111100111", (char) 0x52},
- {"1111110100", (char) 0xA6}, {"1111110101", (char) 0x56}, {"1111110110", (char) 0xA8},
- {"11111101110", (char) 0x42}, {"111111011110", (char) 0x51}, {"111111011111", (char) 0xB0},
- {"1111111000", (char) 0x95}, {"11111110010", (char) 0x48}, {"11111110011", (char) 0x2D},
- {"11111110100", (char) 0xA9}, {"11111110101", (char) 0x8A}, {"11111110110", (char) 0xA3},
- {"111111101110", (char) 0x46}, {"111111101111", (char) 0xA7}, {"11111111000", (char) 0x8D},
- {"11111111001", (char) 0x77}, {"11111111010", (char) 0x79}, {"111111110110", (char) 0x7F},
- {"1111111101110", (char) 0x6B}, {"1111111101111", (char) 0x31}, {"111111111000", (char) 0x3B},
- {"111111111001", (char) 0xA5}, {"111111111010", (char) 0x57}, {"1111111110110", (char) 0x32},
- {"11111111101110", (char) 0xAF}, {"11111111101111", (char) 0x35}, {"1111111111000", (char) 0xA2},
- {"1111111111001", (char) 0xAD}, {"1111111111010", (char) 0x25}, {"11111111110110", (char) 0x36},
- {"11111111110111", (char) 0x3A}, {"1111111111100", (char) 0x5A}, {"11111111111010", (char) 0x33},
- {"11111111111011", (char) 0x30}, {"11111111111100", (char) 0x34}, {"111111111111010", (char) 0x39},
- {"111111111111011", (char) 0x37}, {"111111111111100", (char) 0x38}, {"111111111111101", (char) 0x2F},
- {"1111111111111100", (char) 0x4B}, {"1111111111111101", (char) 0x22}, {"111111111111111000", (char) 0x09},
- {"111111111111111001", (char) 0x28}, {"11111111111111101", (char) 0x29}, {"111111111111111100", (char) 0x4A},
- {"111111111111111101", (char) 0x59}, {"11111111111111111", (char) 0x78},
+ {"00", ' '}, {"010", 0x69}, {"0110", 0x6F}, {"01110", 0x61}, {"01111", 0x65},
+ {"1000", 0x72}, {"1001", 0x6E}, {"1010", 0x74}, {"10110", 0x73}, {"101110", 0x6C},
+ {"101111", 0x63}, {"11000", 0x75}, {"110010", 0x70}, {"110011", 0x64}, {"110100", 0},
+ {"110101", 0x6D}, {"110110", 0x67}, {"1101110", 0x2E}, {"1101111", 0x76},
+ {"111000", 0x68}, {"1110010", 0x2C}, {"1110011", 0x62}, {"1110100", 0x66},
+ {"1110101", 0x21}, {"1110110", 0xB5}, {"11101110", 0xB1}, {"111011110", 0xB3},
+ {"111011111", 0x7A}, {"1111000", 0xB4}, {"11110010", 0x27}, {"111100110", 0x4E},
+ {"111100111", 0x4C}, {"11110100", 0x3F}, {"111101010", 0x85}, {"111101011", 0x53},
+ {"11110110", 0x43}, {"111101110", 0x4D}, {"1111011110", 0xAC}, {"1111011111", 0x49},
+ {"11111000", 0x45}, {"111110010", 0x41}, {"1111100110", 0x54}, {"1111100111", 0xB2},
+ {"111110100", 0x71}, {"111110101", 0x4F}, {"111110110", 0x47}, {"1111101110", 0xAB},
+ {"11111011110", 0x50}, {"11111011111", 0x44}, {"111111000", 0x81},
+ {"1111110010", 0x55}, {"11111100110", 0xAE}, {"11111100111", 0x52},
+ {"1111110100", 0xA6}, {"1111110101", 0x56}, {"1111110110", 0xA8},
+ {"11111101110", 0x42}, {"111111011110", 0x51}, {"111111011111", 0xB0},
+ {"1111111000", 0x95}, {"11111110010", 0x48}, {"11111110011", 0x2D},
+ {"11111110100", 0xA9}, {"11111110101", 0x8A}, {"11111110110", 0xA3},
+ {"111111101110", 0x46}, {"111111101111", 0xA7}, {"11111111000", 0x8D},
+ {"11111111001", 0x77}, {"11111111010", 0x79}, {"111111110110", 0x7F},
+ {"1111111101110", 0x6B}, {"1111111101111", 0x31}, {"111111111000", 0x3B},
+ {"111111111001", 0xA5}, {"111111111010", 0x57}, {"1111111110110", 0x32},
+ {"11111111101110", 0xAF}, {"11111111101111", 0x35}, {"1111111111000", 0xA2},
+ {"1111111111001", 0xAD}, {"1111111111010", 0x25}, {"11111111110110", 0x36},
+ {"11111111110111", 0x3A}, {"1111111111100", 0x5A}, {"11111111111010", 0x33},
+ {"11111111111011", 0x30}, {"11111111111100", 0x34}, {"111111111111010", 0x39},
+ {"111111111111011", 0x37}, {"111111111111100", 0x38}, {"111111111111101", 0x2F},
+ {"1111111111111100", 0x4B}, {"1111111111111101", 0x22}, {"111111111111111000", 0x09},
+ {"111111111111111001", 0x28}, {"11111111111111101", 0x29}, {"111111111111111100", 0x4A},
+ {"111111111111111101", 0x59}, {"11111111111111111", 0x78},
{nullptr, '\0'}
};
const DecoderEntry frenchDecoders[] = {
- {"00", (char) 0x20}, {"0100", (char) 0x65}, {"0101", (char) 0x73}, {"0110", (char) 0x61}, {"01110", (char) 0x69},
- {"011110", (char) 0x6E}, {"011111", (char) 0x72}, {"1000", (char) 0x6F}, {"10010", (char) 0x74},
- {"100110", (char) 0x75}, {"100111", (char) 0x70}, {"10100", (char) 0x6C}, {"10101", (char) 0x6D},
- {"101100", (char) 0x63}, {"101101", (char) 0x76}, {"101110", (char) 0x00}, {"1011110", (char) 0x2E},
- {"1011111", (char) 0x7F}, {"110000", (char) 0xAA}, {"110001", (char) 0x27}, {"110010", (char) 0x64},
- {"1100110", (char) 0xB8}, {"1100111", (char) 0x2C}, {"110100", (char) 0x62}, {"1101010", (char) 0x68},
- {"11010110", (char) 0x66}, {"11010111", (char) 0xBE}, {"1101100", (char) 0x21}, {"1101101", (char) 0xB0},
- {"1101110", (char) 0x67}, {"11011110", (char) 0xF2}, {"11011111", (char) 0xC5}, {"1110000", (char) 0xC0},
- {"11100010", (char) 0x6A}, {"11100011", (char) 0xA5}, {"1110010", (char) 0xB1}, {"11100110", (char) 0x4C},
- {"111001110", (char) 0x2D}, {"111001111", (char) 0x4A}, {"1110100", (char) 0xBD}, {"11101010", (char) 0x3F},
- {"111010110", (char) 0x71}, {"111010111", (char) 0xB5}, {"11101100", (char) 0x81}, {"111011010", (char) 0x43},
- {"111011011", (char) 0x45}, {"11101110", (char) 0x85}, {"111011110", (char) 0xC4}, {"1110111110", (char) 0x4D},
- {"1110111111", (char) 0x79}, {"11110000", (char) 0xBC}, {"111100010", (char) 0xBA}, {"111100011", (char) 0xAF},
- {"11110010", (char) 0x83}, {"111100110", (char) 0x53}, {"1111001110", (char) 0x56}, {"1111001111", (char) 0xA7},
- {"11110100", (char) 0xA6}, {"111101010", (char) 0xB2}, {"1111010110", (char) 0xB7}, {"1111010111", (char) 0xD9},
- {"111101100", (char) 0x41}, {"111101101", (char) 0xA3}, {"111101110", (char) 0x4E}, {"1111011110", (char) 0xB4},
- {"11110111110", (char) 0x54}, {"11110111111", (char) 0x49}, {"111110000", (char) 0x4F}, {"111110001", (char) 0xBF},
- {"111110010", (char) 0x47}, {"1111100110", (char) 0x50}, {"11111001110", (char) 0x7A}, {"11111001111", (char) 0x52},
- {"111110100", (char) 0x44}, {"1111101010", (char) 0x55}, {"1111101011", (char) 0x51}, {"1111101100", (char) 0xE0},
- {"1111101101", (char) 0xAC}, {"1111101110", (char) 0x78}, {"11111011110", (char) 0xC8}, {"11111011111", (char) 0x42},
- {"1111110000", (char) 0xEE}, {"1111110001", (char) 0xC2}, {"1111110010", (char) 0x82}, {"11111100110", (char) 0x87},
- {"11111100111", (char) 0x77}, {"1111110100", (char) 0xC7}, {"11111101010", (char) 0xEF}, {"11111101011", (char) 0x80},
- {"1111110110", (char) 0xE4}, {"11111101110", (char) 0x89}, {"111111011110", (char) 0xE8}, {"111111011111", (char) 0xA9},
- {"11111110000", (char) 0x46}, {"11111110001", (char) 0x48}, {"11111110010", (char) 0xDC},
- {"111111100110", (char) 0xAE}, {"111111100111", (char) 0x88}, {"11111110100", (char) 0x6B},
- {"111111101010", (char) 0x7E}, {"111111101011", (char) 0x31}, {"11111110110", (char) 0xC3},
- {"111111101110", (char) 0xD8}, {"1111111011110", (char) 0x3B}, {"1111111011111", (char) 0xBB},
- {"11111111000", (char) 0xCD}, {"111111110010", (char) 0x8A}, {"1111111100110", (char) 0xB3},
- {"1111111100111", (char) 0x32}, {"111111110100", (char) 0xC1}, {"111111110101", (char) 0xD0},
- {"111111110110", (char) 0x57}, {"1111111101110", (char) 0xB6}, {"1111111101111", (char) 0x25},
- {"111111111000", (char) 0xA1}, {"1111111110010", (char) 0xDF}, {"1111111110011", (char) 0xEA},
- {"111111111010", (char) 0x35}, {"1111111110110", (char) 0x3A}, {"11111111101110", (char) 0x36},
- {"11111111101111", (char) 0x33}, {"1111111111000", (char) 0x39}, {"1111111111001", (char) 0xDB},
- {"1111111111010", (char) 0xE6}, {"11111111110110", (char) 0x30}, {"111111111101110", (char) 0x22},
- {"111111111101111", (char) 0x34}, {"11111111111000", (char) 0xE3}, {"11111111111001", (char) 0x37},
- {"11111111111010", (char) 0x38}, {"111111111110110", (char) 0xD7}, {"111111111110111", (char) 0xCC},
- {"11111111111100", (char) 0xD5}, {"111111111111010", (char) 0xE5}, {"1111111111110110", (char) 0x2F},
- {"1111111111110111", (char) 0x4B}, {"111111111111100", (char) 0xE9}, {"1111111111111010", (char) 0x59},
- {"1111111111111011", (char) 0x28}, {"1111111111111100", (char) 0x29}, {"1111111111111101", (char) 0x5A},
- {"11111111111111100", (char) 0x86}, {"11111111111111101", (char) 0x58}, {"11111111111111110", (char) 0x84},
- {"11111111111111111", (char) 0xA2},
+ {"00", 0x20}, {"0100", 0x65}, {"0101", 0x73}, {"0110", 0x61}, {"01110", 0x69},
+ {"011110", 0x6E}, {"011111", 0x72}, {"1000", 0x6F}, {"10010", 0x74},
+ {"100110", 0x75}, {"100111", 0x70}, {"10100", 0x6C}, {"10101", 0x6D},
+ {"101100", 0x63}, {"101101", 0x76}, {"101110", 0x00}, {"1011110", 0x2E},
+ {"1011111", 0x7F}, {"110000", 0xAA}, {"110001", 0x27}, {"110010", 0x64},
+ {"1100110", 0xB8}, {"1100111", 0x2C}, {"110100", 0x62}, {"1101010", 0x68},
+ {"11010110", 0x66}, {"11010111", 0xBE}, {"1101100", 0x21}, {"1101101", 0xB0},
+ {"1101110", 0x67}, {"11011110", 0xF2}, {"11011111", 0xC5}, {"1110000", 0xC0},
+ {"11100010", 0x6A}, {"11100011", 0xA5}, {"1110010", 0xB1}, {"11100110", 0x4C},
+ {"111001110", 0x2D}, {"111001111", 0x4A}, {"1110100", 0xBD}, {"11101010", 0x3F},
+ {"111010110", 0x71}, {"111010111", 0xB5}, {"11101100", 0x81}, {"111011010", 0x43},
+ {"111011011", 0x45}, {"11101110", 0x85}, {"111011110", 0xC4}, {"1110111110", 0x4D},
+ {"1110111111", 0x79}, {"11110000", 0xBC}, {"111100010", 0xBA}, {"111100011", 0xAF},
+ {"11110010", 0x83}, {"111100110", 0x53}, {"1111001110", 0x56}, {"1111001111", 0xA7},
+ {"11110100", 0xA6}, {"111101010", 0xB2}, {"1111010110", 0xB7}, {"1111010111", 0xD9},
+ {"111101100", 0x41}, {"111101101", 0xA3}, {"111101110", 0x4E}, {"1111011110", 0xB4},
+ {"11110111110", 0x54}, {"11110111111", 0x49}, {"111110000", 0x4F}, {"111110001", 0xBF},
+ {"111110010", 0x47}, {"1111100110", 0x50}, {"11111001110", 0x7A}, {"11111001111", 0x52},
+ {"111110100", 0x44}, {"1111101010", 0x55}, {"1111101011", 0x51}, {"1111101100", 0xE0},
+ {"1111101101", 0xAC}, {"1111101110", 0x78}, {"11111011110", 0xC8}, {"11111011111", 0x42},
+ {"1111110000", 0xEE}, {"1111110001", 0xC2}, {"1111110010", 0x82}, {"11111100110", 0x87},
+ {"11111100111", 0x77}, {"1111110100", 0xC7}, {"11111101010", 0xEF}, {"11111101011", 0x80},
+ {"1111110110", 0xE4}, {"11111101110", 0x89}, {"111111011110", 0xE8}, {"111111011111", 0xA9},
+ {"11111110000", 0x46}, {"11111110001", 0x48}, {"11111110010", 0xDC},
+ {"111111100110", 0xAE}, {"111111100111", 0x88}, {"11111110100", 0x6B},
+ {"111111101010", 0x7E}, {"111111101011", 0x31}, {"11111110110", 0xC3},
+ {"111111101110", 0xD8}, {"1111111011110", 0x3B}, {"1111111011111", 0xBB},
+ {"11111111000", 0xCD}, {"111111110010", 0x8A}, {"1111111100110", 0xB3},
+ {"1111111100111", 0x32}, {"111111110100", 0xC1}, {"111111110101", 0xD0},
+ {"111111110110", 0x57}, {"1111111101110", 0xB6}, {"1111111101111", 0x25},
+ {"111111111000", 0xA1}, {"1111111110010", 0xDF}, {"1111111110011", 0xEA},
+ {"111111111010", 0x35}, {"1111111110110", 0x3A}, {"11111111101110", 0x36},
+ {"11111111101111", 0x33}, {"1111111111000", 0x39}, {"1111111111001", 0xDB},
+ {"1111111111010", 0xE6}, {"11111111110110", 0x30}, {"111111111101110", 0x22},
+ {"111111111101111", 0x34}, {"11111111111000", 0xE3}, {"11111111111001", 0x37},
+ {"11111111111010", 0x38}, {"111111111110110", 0xD7}, {"111111111110111", 0xCC},
+ {"11111111111100", 0xD5}, {"111111111111010", 0xE5}, {"1111111111110110", 0x2F},
+ {"1111111111110111", 0x4B}, {"111111111111100", 0xE9}, {"1111111111111010", 0x59},
+ {"1111111111111011", 0x28}, {"1111111111111100", 0x29}, {"1111111111111101", 0x5A},
+ {"11111111111111100", 0x86}, {"11111111111111101", 0x58}, {"11111111111111110", 0x84},
+ {"11111111111111111", 0xA2},
{nullptr, '\0'}
};
const DecoderEntry germanDecoders[] = {
- {"000", (char) 0x20}, {"001", (char) 0x65}, {"0100", (char) 0x6E}, {"0101", (char) 0x61}, {"0110", (char) 0x72},
- {"01110", (char) 0x69}, {"011110", (char) 0x74}, {"011111", (char) 0x73}, {"10000", (char) 0x68},
- {"10001", (char) 0x6C}, {"10010", (char) 0x75}, {"100110", (char) 0x6D}, {"100111", (char) 0xB0},
- {"10100", (char) 0x67}, {"101010", (char) 0x00}, {"101011", (char) 0x62}, {"101100", (char) 0x63},
- {"101101", (char) 0x2C}, {"101110", (char) 0x6F}, {"1011110", (char) 0xAA}, {"1011111", (char) 0x77},
- {"110000", (char) 0x64}, {"110001", (char) 0x2E}, {"110010", (char) 0x6B}, {"1100110", (char) 0x66},
- {"1100111", (char) 0xDB}, {"110100", (char) 0x21}, {"1101010", (char) 0x7A}, {"11010110", (char) 0xC5},
- {"11010111", (char) 0x8C}, {"1101100", (char) 0x49}, {"11011010", (char) 0xCD}, {"11011011", (char) 0xCC},
- {"1101110", (char) 0x53}, {"11011110", (char) 0x45}, {"110111110", (char) 0x57}, {"110111111", (char) 0x8D},
- {"1110000", (char) 0xB8}, {"11100010", (char) 0x47}, {"11100011", (char) 0x76}, {"1110010", (char) 0x92},
- {"11100110", (char) 0xED}, {"111001110", (char) 0x44}, {"111001111", (char) 0x4D}, {"1110100", (char) 0x70},
- {"11101010", (char) 0x48}, {"111010110", (char) 0xD0}, {"111010111", (char) 0xDC}, {"11101100", (char) 0xE8},
- {"11101101", (char) 0x3F}, {"11101110", (char) 0x41}, {"111011110", (char) 0xDD}, {"1110111110", (char) 0x8F},
- {"1110111111", (char) 0xF2}, {"11110000", (char) 0x42}, {"11110001", (char) 0xEE}, {"11110010", (char) 0x46},
- {"111100110", (char) 0x4E}, {"1111001110", (char) 0x4C}, {"1111001111", (char) 0xE9}, {"11110100", (char) 0xEF},
- {"111101010", (char) 0x54}, {"111101011", (char) 0xEB}, {"111101100", (char) 0x4B}, {"111101101", (char) 0xD1},
- {"111101110", (char) 0xD9}, {"1111011110", (char) 0xD8}, {"1111011111", (char) 0x52}, {"111110000", (char) 0xEC},
- {"111110001", (char) 0xE4}, {"111110010", (char) 0xD7}, {"1111100110", (char) 0x55}, {"1111100111", (char) 0xEA},
- {"111110100", (char) 0xDF}, {"1111101010", (char) 0xE6}, {"1111101011", (char) 0x5A}, {"111110110", (char) 0x56},
- {"1111101110", (char) 0xD5}, {"11111011110", (char) 0xD6}, {"11111011111", (char) 0xE0}, {"111111000", (char) 0x6A},
- {"1111110010", (char) 0xA3}, {"1111110011", (char) 0xB1}, {"1111110100", (char) 0x2D}, {"1111110101", (char) 0xC8},
- {"1111110110", (char) 0x50}, {"11111101110", (char) 0xE7}, {"111111011110", (char) 0x27},
- {"111111011111", (char) 0xD4}, {"1111111000", (char) 0xCE}, {"11111110010", (char) 0x4F},
- {"11111110011", (char) 0x79}, {"1111111010", (char) 0xC9}, {"11111110110", (char) 0xAF},
- {"111111101110", (char) 0x4A}, {"111111101111", (char) 0xC2}, {"11111111000", (char) 0xC7},
- {"111111110010", (char) 0x31}, {"111111110011", (char) 0xDA}, {"111111110100", (char) 0xA1},
- {"111111110101", (char) 0x32}, {"111111110110", (char) 0xC4}, {"1111111101110", (char) 0xB5},
- {"11111111011110", (char) 0x91}, {"11111111011111", (char) 0xE5}, {"111111111000", (char) 0x25},
- {"1111111110010", (char) 0x35}, {"1111111110011", (char) 0x3A}, {"1111111110100", (char) 0x43},
- {"1111111110101", (char) 0xE3}, {"1111111110110", (char) 0x36}, {"11111111101110", (char) 0x78},
- {"11111111101111", (char) 0x90}, {"1111111111000", (char) 0xE2}, {"11111111110010", (char) 0x33},
- {"11111111110011", (char) 0x8E}, {"1111111111010", (char) 0xA7}, {"11111111110110", (char) 0x34},
- {"111111111101110", (char) 0x39}, {"111111111101111", (char) 0x30}, {"11111111111000", (char) 0x37},
- {"11111111111001", (char) 0x38}, {"11111111111010", (char) 0x71}, {"111111111110110", (char) 0xB7},
- {"111111111110111", (char) 0xBA}, {"11111111111100", (char) 0xB2}, {"111111111111010", (char) 0x3B},
- {"1111111111110110", (char) 0xAE}, {"1111111111110111", (char) 0x22}, {"111111111111100", (char) 0x2F},
- {"1111111111111010", (char) 0x51}, {"1111111111111011", (char) 0xA2}, {"1111111111111100", (char) 0xC3},
- {"11111111111111010", (char) 0xBC}, {"11111111111111011", (char) 0x28}, {"111111111111111000", (char) 0x29},
- {"111111111111111001", (char) 0x59}, {"11111111111111101", (char) 0xBB}, {"11111111111111110", (char) 0xBD},
- {"11111111111111111", (char) 0xC0},
+ {"000", 0x20}, {"001", 0x65}, {"0100", 0x6E}, {"0101", 0x61}, {"0110", 0x72},
+ {"01110", 0x69}, {"011110", 0x74}, {"011111", 0x73}, {"10000", 0x68},
+ {"10001", 0x6C}, {"10010", 0x75}, {"100110", 0x6D}, {"100111", 0xB0},
+ {"10100", 0x67}, {"101010", 0x00}, {"101011", 0x62}, {"101100", 0x63},
+ {"101101", 0x2C}, {"101110", 0x6F}, {"1011110", 0xAA}, {"1011111", 0x77},
+ {"110000", 0x64}, {"110001", 0x2E}, {"110010", 0x6B}, {"1100110", 0x66},
+ {"1100111", 0xDB}, {"110100", 0x21}, {"1101010", 0x7A}, {"11010110", 0xC5},
+ {"11010111", 0x8C}, {"1101100", 0x49}, {"11011010", 0xCD}, {"11011011", 0xCC},
+ {"1101110", 0x53}, {"11011110", 0x45}, {"110111110", 0x57}, {"110111111", 0x8D},
+ {"1110000", 0xB8}, {"11100010", 0x47}, {"11100011", 0x76}, {"1110010", 0x92},
+ {"11100110", 0xED}, {"111001110", 0x44}, {"111001111", 0x4D}, {"1110100", 0x70},
+ {"11101010", 0x48}, {"111010110", 0xD0}, {"111010111", 0xDC}, {"11101100", 0xE8},
+ {"11101101", 0x3F}, {"11101110", 0x41}, {"111011110", 0xDD}, {"1110111110", 0x8F},
+ {"1110111111", 0xF2}, {"11110000", 0x42}, {"11110001", 0xEE}, {"11110010", 0x46},
+ {"111100110", 0x4E}, {"1111001110", 0x4C}, {"1111001111", 0xE9}, {"11110100", 0xEF},
+ {"111101010", 0x54}, {"111101011", 0xEB}, {"111101100", 0x4B}, {"111101101", 0xD1},
+ {"111101110", 0xD9}, {"1111011110", 0xD8}, {"1111011111", 0x52}, {"111110000", 0xEC},
+ {"111110001", 0xE4}, {"111110010", 0xD7}, {"1111100110", 0x55}, {"1111100111", 0xEA},
+ {"111110100", 0xDF}, {"1111101010", 0xE6}, {"1111101011", 0x5A}, {"111110110", 0x56},
+ {"1111101110", 0xD5}, {"11111011110", 0xD6}, {"11111011111", 0xE0}, {"111111000", 0x6A},
+ {"1111110010", 0xA3}, {"1111110011", 0xB1}, {"1111110100", 0x2D}, {"1111110101", 0xC8},
+ {"1111110110", 0x50}, {"11111101110", 0xE7}, {"111111011110", 0x27},
+ {"111111011111", 0xD4}, {"1111111000", 0xCE}, {"11111110010", 0x4F},
+ {"11111110011", 0x79}, {"1111111010", 0xC9}, {"11111110110", 0xAF},
+ {"111111101110", 0x4A}, {"111111101111", 0xC2}, {"11111111000", 0xC7},
+ {"111111110010", 0x31}, {"111111110011", 0xDA}, {"111111110100", 0xA1},
+ {"111111110101", 0x32}, {"111111110110", 0xC4}, {"1111111101110", 0xB5},
+ {"11111111011110", 0x91}, {"11111111011111", 0xE5}, {"111111111000", 0x25},
+ {"1111111110010", 0x35}, {"1111111110011", 0x3A}, {"1111111110100", 0x43},
+ {"1111111110101", 0xE3}, {"1111111110110", 0x36}, {"11111111101110", 0x78},
+ {"11111111101111", 0x90}, {"1111111111000", 0xE2}, {"11111111110010", 0x33},
+ {"11111111110011", 0x8E}, {"1111111111010", 0xA7}, {"11111111110110", 0x34},
+ {"111111111101110", 0x39}, {"111111111101111", 0x30}, {"11111111111000", 0x37},
+ {"11111111111001", 0x38}, {"11111111111010", 0x71}, {"111111111110110", 0xB7},
+ {"111111111110111", 0xBA}, {"11111111111100", 0xB2}, {"111111111111010", 0x3B},
+ {"1111111111110110", 0xAE}, {"1111111111110111", 0x22}, {"111111111111100", 0x2F},
+ {"1111111111111010", 0x51}, {"1111111111111011", 0xA2}, {"1111111111111100", 0xC3},
+ {"11111111111111010", 0xBC}, {"11111111111111011", 0x28}, {"111111111111111000", 0x29},
+ {"111111111111111001", 0x59}, {"11111111111111101", 0xBB}, {"11111111111111110", 0xBD},
+ {"11111111111111111", 0xC0},
{nullptr, '\0'}
};
const DecoderEntry spanishDecoders[] = {
- {"00", (char) 0x20}, {"010", (char) 0x61}, {"0110", (char) 0x6F}, {"01110", (char) 0x65},
- {"01111", (char) 0x72}, {"1000", (char) 0x73}, {"1001", (char) 0x6E}, {"10100", (char) 0x69},
- {"10101", (char) 0x75}, {"10110", (char) 0x63}, {"101110", (char) 0x74}, {"1011110", (char) 0x6C},
- {"1011111", (char) 0x64}, {"11000", (char) 0x70}, {"110010", (char) 0x2E}, {"110011", (char) 0x6D},
- {"110100", (char) 0x00}, {"110101", (char) 0xB3}, {"1101100", (char) 0x62}, {"1101101", (char) 0x2C},
- {"1101110", (char) 0x68}, {"11011110", (char) 0x67}, {"11011111", (char) 0xB1}, {"1110000", (char) 0x76},
- {"1110001", (char) 0xB5}, {"1110010", (char) 0x79}, {"11100110", (char) 0xAB}, {"11100111", (char) 0xB4},
- {"1110100", (char) 0x97}, {"11101010", (char) 0xB2}, {"11101011", (char) 0x98}, {"11101100", (char) 0x45},
- {"11101101", (char) 0x66}, {"11101110", (char) 0x95}, {"111011110", (char) 0x21}, {"111011111", (char) 0x6A},
- {"11110000", (char) 0x4C}, {"11110001", (char) 0x4E}, {"11110010", (char) 0x7F}, {"111100110", (char) 0x96},
- {"111100111", (char) 0x3F}, {"11110100", (char) 0xAC}, {"11110101", (char) 0x94}, {"11110110", (char) 0x7A},
- {"111101110", (char) 0x41}, {"1111011110", (char) 0x53}, {"1111011111", (char) 0x71}, {"11111000", (char) 0x54},
- {"111110010", (char) 0x93}, {"1111100110", (char) 0xAF}, {"1111100111", (char) 0x43}, {"111110100", (char) 0x50},
- {"111110101", (char) 0x4D}, {"111110110", (char) 0x44}, {"1111101110", (char) 0xAE}, {"11111011110", (char) 0xAD},
- {"11111011111", (char) 0xB0}, {"111111000", (char) 0x48}, {"1111110010", (char) 0x51}, {"1111110011", (char) 0x55},
- {"1111110100", (char) 0x4F}, {"1111110101", (char) 0x47}, {"1111110110", (char) 0x99},
- {"11111101110", (char) 0xA8}, {"11111101111", (char) 0x22}, {"1111111000", (char) 0xA9},
- {"11111110010", (char) 0xA6}, {"11111110011", (char) 0x52}, {"1111111010", (char) 0x59},
- {"11111110110", (char) 0xA3}, {"111111101110", (char) 0x78}, {"111111101111", (char) 0x56},
- {"11111111000", (char) 0x77}, {"11111111001", (char) 0x42}, {"111111110100", (char) 0x6B},
- {"111111110101", (char) 0x49}, {"111111110110", (char) 0x31}, {"1111111101110", (char) 0xAA},
- {"1111111101111", (char) 0x2D}, {"111111111000", (char) 0x46}, {"111111111001", (char) 0xA5},
- {"1111111110100", (char) 0x32}, {"1111111110101", (char) 0x3B}, {"1111111110110", (char) 0xA7},
- {"11111111101110", (char) 0x35}, {"11111111101111", (char) 0x25}, {"1111111111000", (char) 0x3A},
- {"1111111111001", (char) 0xA2}, {"1111111111010", (char) 0x57}, {"11111111110110", (char) 0x36},
- {"11111111110111", (char) 0x33}, {"1111111111100", (char) 0x4A}, {"11111111111010", (char) 0x30},
- {"11111111111011", (char) 0x34}, {"11111111111100", (char) 0x37}, {"111111111111010", (char) 0x39},
- {"111111111111011", (char) 0x38}, {"111111111111100", (char) 0xA4}, {"111111111111101", (char) 0x2F},
- {"1111111111111100", (char) 0x5A}, {"1111111111111101", (char) 0x8C}, {"11111111111111100", (char) 0x28},
- {"11111111111111101", (char) 0x29}, {"11111111111111110", (char) 0x4B}, {"111111111111111110", (char) 0x58},
- {"111111111111111111", (char) 0x91},
+ {"00", 0x20}, {"010", 0x61}, {"0110", 0x6F}, {"01110", 0x65},
+ {"01111", 0x72}, {"1000", 0x73}, {"1001", 0x6E}, {"10100", 0x69},
+ {"10101", 0x75}, {"10110", 0x63}, {"101110", 0x74}, {"1011110", 0x6C},
+ {"1011111", 0x64}, {"11000", 0x70}, {"110010", 0x2E}, {"110011", 0x6D},
+ {"110100", 0x00}, {"110101", 0xB3}, {"1101100", 0x62}, {"1101101", 0x2C},
+ {"1101110", 0x68}, {"11011110", 0x67}, {"11011111", 0xB1}, {"1110000", 0x76},
+ {"1110001", 0xB5}, {"1110010", 0x79}, {"11100110", 0xAB}, {"11100111", 0xB4},
+ {"1110100", 0x97}, {"11101010", 0xB2}, {"11101011", 0x98}, {"11101100", 0x45},
+ {"11101101", 0x66}, {"11101110", 0x95}, {"111011110", 0x21}, {"111011111", 0x6A},
+ {"11110000", 0x4C}, {"11110001", 0x4E}, {"11110010", 0x7F}, {"111100110", 0x96},
+ {"111100111", 0x3F}, {"11110100", 0xAC}, {"11110101", 0x94}, {"11110110", 0x7A},
+ {"111101110", 0x41}, {"1111011110", 0x53}, {"1111011111", 0x71}, {"11111000", 0x54},
+ {"111110010", 0x93}, {"1111100110", 0xAF}, {"1111100111", 0x43}, {"111110100", 0x50},
+ {"111110101", 0x4D}, {"111110110", 0x44}, {"1111101110", 0xAE}, {"11111011110", 0xAD},
+ {"11111011111", 0xB0}, {"111111000", 0x48}, {"1111110010", 0x51}, {"1111110011", 0x55},
+ {"1111110100", 0x4F}, {"1111110101", 0x47}, {"1111110110", 0x99},
+ {"11111101110", 0xA8}, {"11111101111", 0x22}, {"1111111000", 0xA9},
+ {"11111110010", 0xA6}, {"11111110011", 0x52}, {"1111111010", 0x59},
+ {"11111110110", 0xA3}, {"111111101110", 0x78}, {"111111101111", 0x56},
+ {"11111111000", 0x77}, {"11111111001", 0x42}, {"111111110100", 0x6B},
+ {"111111110101", 0x49}, {"111111110110", 0x31}, {"1111111101110", 0xAA},
+ {"1111111101111", 0x2D}, {"111111111000", 0x46}, {"111111111001", 0xA5},
+ {"1111111110100", 0x32}, {"1111111110101", 0x3B}, {"1111111110110", 0xA7},
+ {"11111111101110", 0x35}, {"11111111101111", 0x25}, {"1111111111000", 0x3A},
+ {"1111111111001", 0xA2}, {"1111111111010", 0x57}, {"11111111110110", 0x36},
+ {"11111111110111", 0x33}, {"1111111111100", 0x4A}, {"11111111111010", 0x30},
+ {"11111111111011", 0x34}, {"11111111111100", 0x37}, {"111111111111010", 0x39},
+ {"111111111111011", 0x38}, {"111111111111100", 0xA4}, {"111111111111101", 0x2F},
+ {"1111111111111100", 0x5A}, {"1111111111111101", 0x8C}, {"11111111111111100", 0x28},
+ {"11111111111111101", 0x29}, {"11111111111111110", 0x4B}, {"111111111111111110", 0x58},
+ {"111111111111111111", 0x91},
{nullptr, '\0'}
};
@@ -1903,8 +1908,8 @@ void createFile(const char *outFilename) {
FileEntry rec;
uint32 startOffset, numBytes;
uint32 outputStart;
- uint16 resourceId;
- uint16 resourceSize;
+ uint16 resourceId = 0;
+ uint16 resourceSize = 0;
byte *resourceData;
bool resourceFlag;
byte tempBuffer[32];
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index ca9f6e8274b..d0f5b7d6413 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -273,7 +273,7 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s
bool disableEditAndContinue = find(_disableEditAndContinue.begin(), _disableEditAndContinue.end(), name) != _disableEditAndContinue.end();
// Nothing to add here, move along!
- if ((!setup.devTools || !setup.tests) && name != setup.projectName && !enableLanguageExtensions && !disableEditAndContinue && warningsIterator == _projectWarnings.end())
+ if (!setup.devTools && !setup.tests && name != setup.projectName && !enableLanguageExtensions && !disableEditAndContinue && warningsIterator == _projectWarnings.end())
return;
std::string warnings = "";
More information about the Scummvm-git-logs
mailing list