- Simplified font mapping (in print_abc and print_abc_opc)

- Moved checkFlag to rooms.cpp
- x_de_letra/y_de_letra -> letterX/letterY
- Made itemLocations a const
- Removed loads of now unneeded letter descriptions

svn-id: r32407

1 files changed, 58 insertions, 1 deletions

diff --git a/engines/drascula/staticdata.h b/engines/drascula/staticdata.h
index 937f3460b7..eddccd3b98 100644
--- a/engines/drascula/staticdata.h
+++ b/engines/drascula/staticdata.h
@@ -30,7 +30,64 @@
 
 namespace Drascula {
 
-ItemLocation itemLocations[] = {
+const CharInfo charMap[CHARMAP_SIZE] = {
+	//               Letters                  
+	// ---------------------------------------
+	{    'A',   6,   0 }, {    'B',  15,   0 },
+	{    'C',  24,   0 }, {    'D',  33,   0 },
+	{    'E',  42,   0 }, {    'F',  51,   0 },
+	{    'G',  60,   0 }, {    'H',  69,   0 },
+	{    'I',  78,   0 }, {    'J',  87,   0 },
+	{    'K',  96,   0 }, {    'L', 105,   0 },
+	{    'M', 114,   0 }, {    'N', 123,   0 },
+	{ '\244', 132,   0 }, { '\245', 132,   0 },	// special Spanish char
+	{    'O', 141,   0 }, {    'P', 150,   0 },
+	{    'Q', 159,   0 }, {    'R', 168,   0 },
+	{    'S', 177,   0 }, {    'T', 186,   0 },
+	{    'U', 195,   0 }, {    'V', 204,   0 },
+	{    'W', 213,   0 }, {    'X', 222,   0 },
+	{    'Y', 231,   0 }, {    'Z', 240,   0 },
+	// ---------------------------------------
+	{   0xa7, 250,   0 }, {    ' ', 250,   0 },
+	//               Signs                    
+	// ---------------------------------------
+	{    '.',   6,   1 }, {    ',',  15,   1 },
+	{    '-',  24,   1 }, {    '?',  33,   1 },
+	{ '\250',  42,   1 }, {    '"',  51,   1 },
+	{    '!',  60,   1 }, { '\255',  69,   1 },
+	{    ';',  78,   1 }, {    '>',  87,   1 },
+	{    '<',  96,   1 }, {    '$', 105,   1 },
+	{    '%', 114,   1 }, {    ':', 123,   1 },
+	{    '&', 132,   1 }, {    '/', 141,   1 },
+	{    '(', 150,   1 }, {    ')', 159,   1 },
+	{    '*', 168,   1 }, {    '+', 177,   1 },
+	{    '1', 186,   1 }, {    '2', 195,   1 },
+	{    '3', 204,   1 }, {    '4', 213,   1 },
+	{    '5', 222,   1 }, {    '6', 231,   1 },
+	{    '7', 240,   1 }, {    '8', 249,   1 },
+	{    '9', 258,   1 }, {    '0', 267,   1 },
+	//               Accented                 
+	// ---------------------------------------
+	{ '\240',   6,   2 }, { '\202',  15,   2 },	// A, B
+	{ '\241',  24,   2 }, { '\242',  33,   2 },	// C, D
+	{ '\243',  42,   2 }, { '\205',  51,   2 },	// E, F
+	{ '\212',  60,   2 }, { '\215',  69,   2 },	// G, H
+	{ '\225',  78,   2 }, { '\227',  87,   2 },	// I, J
+	{ '\203',  96,   2 }, { '\210', 105,   2 },	// K, L
+	{ '\214', 114,   2 }, { '\223', 123,   2 },	// M, N
+	{ '\226', 132,   2 }, { '\047', 141,   2 }, // special Spanish char, O
+	{ '\200', 150,   2 }, { '\207', 150,   2 },	// P, P
+	{ '\265',   6,   2 }, { '\220',  15,   2 },	// A, B
+	{ '\326',  24,   2 }, { '\340',  33,   2 },	// C, D
+	{ '\351',  42,   2 }, { '\267',  51,   2 },	// E, F
+	{ '\324',  60,   2 }, { '\336',  69,   2 },	// G, H
+	{ '\343',  78,   2 }, { '\353',  87,   2 },	// I, J
+	{ '\266',  96,   2 }, { '\322', 105,   2 },	// K, L
+	{ '\327', 114,   2 }, { '\342', 123,   2 },	// M, N
+	{ '\352', 132,   0 }						// special Spanish char
+};
+
+const ItemLocation itemLocations[] = {
 	{   0,   0 },							  // empty
 	{   5,  10 }, {  50,  10 }, {  95,  10 }, // 1-3
 	{ 140,  10 }, { 185,  10 }, { 230,  10 }, // 4-6