TONY: Fix some Valgrind identified warnings

This commit is contained in:
Paul Gilbert 2012-05-05 09:31:21 +10:00
parent 3454a0a9c3
commit 657d93ea8f
3 changed files with 286 additions and 286 deletions

View file

@ -286,38 +286,38 @@ void RMFontParla::Init(void) {
cTable['\"'] = 77;
cTable['^'] = 77;
cTable['/'] = 78;
cTable['£'] = 79;
cTable[(byte)'£'] = 79;
cTable['$'] = 80;
cTable['%'] = 81;
cTable['&'] = 82;
cTable['='] = 83;
cTable['«'] = 84;
cTable['»'] = 85;
cTable['®'] = 86;
cTable['©'] = 87;
cTable['à'] = 88;
cTable['è'] = 89;
cTable['é'] = 89;
cTable['ì'] = 90;
cTable['ò'] = 91;
cTable['ù'] = 92;
cTable['ä'] = 93;
cTable['ë'] = 94;
cTable['ï'] = 95;
cTable['ö'] = 96;
cTable['ü'] = 97;
cTable['ÿ'] = 98;
cTable['å'] = 99;
cTable[(byte)'«'] = 84;
cTable[(byte)'»'] = 85;
cTable[(byte)'®'] = 86;
cTable[(byte)'©'] = 87;
cTable[(byte)'à'] = 88;
cTable[(byte)'è'] = 89;
cTable[(byte)'é'] = 89;
cTable[(byte)'ì'] = 90;
cTable[(byte)'ò'] = 91;
cTable[(byte)'ù'] = 92;
cTable[(byte)'ä'] = 93;
cTable[(byte)'ë'] = 94;
cTable[(byte)'ï'] = 95;
cTable[(byte)'ö'] = 96;
cTable[(byte)'ü'] = 97;
cTable[(byte)'ÿ'] = 98;
cTable[(byte)'å'] = 99;
//cTable[' '] = 100; e cerchietto
//cTable[' '] = 101; i cerchietto
//cTable[' '] = 102; o cerchietto
//cTable[' '] = 103; u cerchietto
cTable['ñ'] = 104;
cTable['Ñ'] = 105;
cTable['ç'] = 106;
cTable['æ'] = 107;
cTable['Æ'] = 108;
cTable['ø'] = 109;
cTable[(byte)'ñ'] = 104;
cTable[(byte)'Ñ'] = 105;
cTable[(byte)'ç'] = 106;
cTable[(byte)'æ'] = 107;
cTable[(byte)'Æ'] = 108;
cTable[(byte)'ø'] = 109;
//cTable['ƒ'] = 110; integrale
cTable['\''] = 111;
@ -359,43 +359,43 @@ void RMFontParla::Init(void) {
//AaCcEeLlNnOoSsZzZz
//¥¹ÆæÊꣳÑñÓ󌜯¿<C2AF>Ÿ
cTable['¥'] = 112;
cTable['¹'] = 113;
cTable['Æ'] = 114;
cTable['æ'] = 115;
cTable['Ê'] = 116;
cTable['ê'] = 117;
cTable['£'] = 118;
cTable['³'] = 119;
cTable['Ñ'] = 120;
cTable['ñ'] = 121;
cTable['Ó'] = 122;
cTable['ó'] = 123;
cTable['Œ'] = 124;
cTable['œ'] = 125;
cTable['¯'] = 126;
cTable['¿'] = 127;
cTable['<EFBFBD>'] = 128;
cTable['Ÿ'] = 129;
cTable[(byte)'¥'] = 112;
cTable[(byte)'¹'] = 113;
cTable[(byte)'Æ'] = 114;
cTable[(byte)'æ'] = 115;
cTable[(byte)'Ê'] = 116;
cTable[(byte)'ê'] = 117;
cTable[(byte)'£'] = 118;
cTable[(byte)'³'] = 119;
cTable[(byte)'Ñ'] = 120;
cTable[(byte)'ñ'] = 121;
cTable[(byte)'Ó'] = 122;
cTable[(byte)'ó'] = 123;
cTable[(byte)'Œ'] = 124;
cTable[(byte)'œ'] = 125;
cTable[(byte)'¯'] = 126;
cTable[(byte)'¿'] = 127;
cTable[(byte)'<EFBFBD>'] = 128;
cTable[(byte)'Ÿ'] = 129;
lTable['¥'] = 14;
lTable['¹'] = 16;
lTable['Æ'] = 12;
lTable['æ'] = 12;
lTable['Ê'] = 11;
lTable['ê'] = 12;
lTable['£'] = 14;
lTable['³'] = 9;
lTable['Ñ'] = 10;
lTable['ñ'] = 11;
lTable['Ó'] = 13;
lTable['ó'] = 11;
lTable['Œ'] = 12;
lTable['œ'] = 12;
lTable['¯'] = 13;
lTable['¿'] = 13;
lTable['<EFBFBD>'] = 14;
lTable['Ÿ'] = 13;
lTable[(byte)'¥'] = 14;
lTable[(byte)'¹'] = 16;
lTable[(byte)'Æ'] = 12;
lTable[(byte)'æ'] = 12;
lTable[(byte)'Ê'] = 11;
lTable[(byte)'ê'] = 12;
lTable[(byte)'£'] = 14;
lTable[(byte)'³'] = 9;
lTable[(byte)'Ñ'] = 10;
lTable[(byte)'ñ'] = 11;
lTable[(byte)'Ó'] = 13;
lTable[(byte)'ó'] = 11;
lTable[(byte)'Œ'] = 12;
lTable[(byte)'œ'] = 12;
lTable[(byte)'¯'] = 13;
lTable[(byte)'¿'] = 13;
lTable[(byte)'<EFBFBD>'] = 14;
lTable[(byte)'Ÿ'] = 13;
#ifdef FONT_RUSSIAN
// Russian Characters
@ -403,241 +403,241 @@ void RMFontParla::Init(void) {
// per le altre traduzioni. Per compilare Tony in altre lingue,
// commentare via queste definizioni.
cTable['À'] = 130;
cTable['Á'] = 131;
cTable['Â'] = 132;
cTable['Ã'] = 133;
cTable['Ä'] = 134;
cTable['Å'] = 135;
cTable['¨'] = 136;
cTable['Æ'] = 137;
cTable['Ç'] = 138;
cTable['È'] = 139;
cTable['É'] = 140;
cTable['Ê'] = 141;
cTable['Ë'] = 142;
cTable['Ì'] = 143;
cTable['Í'] = 144;
cTable['Î'] = 145;
cTable['Ï'] = 146;
cTable['Ð'] = 147;
cTable['Ñ'] = 148;
cTable['Ò'] = 149;
cTable['Ó'] = 150;
cTable['Ô'] = 151;
cTable['Õ'] = 152;
cTable['Ö'] = 153;
cTable['×'] = 154;
cTable['Ø'] = 155;
cTable['Ù'] = 156;
cTable['Ü'] = 157;
cTable['Ú'] = 158;
cTable['Û'] = 159;
cTable['Ý'] = 160;
cTable['Þ'] = 161;
cTable['ß'] = 162;
cTable[(byte)'À'] = 130;
cTable[(byte)'Á'] = 131;
cTable[(byte)'Â'] = 132;
cTable[(byte)'Ã'] = 133;
cTable[(byte)'Ä'] = 134;
cTable[(byte)'Å'] = 135;
cTable[(byte)'¨'] = 136;
cTable[(byte)'Æ'] = 137;
cTable[(byte)'Ç'] = 138;
cTable[(byte)'È'] = 139;
cTable[(byte)'É'] = 140;
cTable[(byte)'Ê'] = 141;
cTable[(byte)'Ë'] = 142;
cTable[(byte)'Ì'] = 143;
cTable[(byte)'Í'] = 144;
cTable[(byte)'Î'] = 145;
cTable[(byte)'Ï'] = 146;
cTable[(byte)'Ð'] = 147;
cTable[(byte)'Ñ'] = 148;
cTable[(byte)'Ò'] = 149;
cTable[(byte)'Ó'] = 150;
cTable[(byte)'Ô'] = 151;
cTable[(byte)'Õ'] = 152;
cTable[(byte)'Ö'] = 153;
cTable[(byte)'×'] = 154;
cTable[(byte)'Ø'] = 155;
cTable[(byte)'Ù'] = 156;
cTable[(byte)'Ü'] = 157;
cTable[(byte)'Ú'] = 158;
cTable[(byte)'Û'] = 159;
cTable[(byte)'Ý'] = 160;
cTable[(byte)'Þ'] = 161;
cTable[(byte)'ß'] = 162;
cTable['à'] = 163;
cTable['á'] = 164;
cTable['â'] = 165;
cTable['ã'] = 166;
cTable['ä'] = 167;
cTable['å'] = 168;
cTable['¸'] = 169;
cTable['æ'] = 170;
cTable['ç'] = 171;
cTable['è'] = 172;
cTable['é'] = 173;
cTable['ê'] = 174;
cTable['ë'] = 175;
cTable['ì'] = 176;
cTable['í'] = 177;
cTable['î'] = 178;
cTable['ï'] = 179;
cTable['ð'] = 180;
cTable['ñ'] = 181;
cTable['ò'] = 182;
cTable['ó'] = 183;
cTable['ô'] = 184;
cTable['õ'] = 185;
cTable['ö'] = 186;
cTable['÷'] = 187;
cTable['ø'] = 188;
cTable['ù'] = 189;
cTable['ü'] = 190;
cTable['ú'] = 191;
cTable['û'] = 192;
cTable['ý'] = 193;
cTable['þ'] = 194;
cTable['ÿ'] = 195;
cTable[(byte)'à'] = 163;
cTable[(byte)'á'] = 164;
cTable[(byte)'â'] = 165;
cTable[(byte)'ã'] = 166;
cTable[(byte)'ä'] = 167;
cTable[(byte)'å'] = 168;
cTable[(byte)'¸'] = 169;
cTable[(byte)'æ'] = 170;
cTable[(byte)'ç'] = 171;
cTable[(byte)'è'] = 172;
cTable[(byte)'é'] = 173;
cTable[(byte)'ê'] = 174;
cTable[(byte)'ë'] = 175;
cTable[(byte)'ì'] = 176;
cTable[(byte)'í'] = 177;
cTable[(byte)'î'] = 178;
cTable[(byte)'ï'] = 179;
cTable[(byte)'ð'] = 180;
cTable[(byte)'ñ'] = 181;
cTable[(byte)'ò'] = 182;
cTable[(byte)'ó'] = 183;
cTable[(byte)'ô'] = 184;
cTable[(byte)'õ'] = 185;
cTable[(byte)'ö'] = 186;
cTable[(byte)'÷'] = 187;
cTable[(byte)'ø'] = 188;
cTable[(byte)'ù'] = 189;
cTable[(byte)'ü'] = 190;
cTable[(byte)'ú'] = 191;
cTable[(byte)'û'] = 192;
cTable[(byte)'ý'] = 193;
cTable[(byte)'þ'] = 194;
cTable[(byte)'ÿ'] = 195;
lTable['À'] = 13;
lTable['Á'] = 15;
lTable['Â'] = 15;
lTable['Ã'] = 11;
lTable['Ä'] = 15;
lTable['Å'] = 11;
lTable['¨'] = 11;
lTable['Æ'] = 15;
lTable['Ç'] = 10;
lTable['È'] = 13;
lTable['É'] = 13;
lTable['Ê'] = 12;
lTable['Ë'] = 13;
lTable['Ì'] = 14;
lTable['Í'] = 14;
lTable['Î'] = 13;
lTable['Ï'] = 11;
lTable['Ð'] = 12;
lTable['Ñ'] = 12;
lTable['Ò'] = 18;
lTable['Ó'] = 11;
lTable['Ô'] = 13;
lTable['Õ'] = 12;
lTable['Ö'] = 13;
lTable['×'] = 12;
lTable['Ø'] = 17;
lTable['Ù'] = 18;
lTable['Ü'] = 16;
lTable['Ú'] = 18;
lTable['Û'] = 19;
lTable['Ý'] = 11;
lTable['Þ'] = 16;
lTable['ß'] = 14;
lTable[(byte)'À'] = 13;
lTable[(byte)'Á'] = 15;
lTable[(byte)'Â'] = 15;
lTable[(byte)'Ã'] = 11;
lTable[(byte)'Ä'] = 15;
lTable[(byte)'Å'] = 11;
lTable[(byte)'¨'] = 11;
lTable[(byte)'Æ'] = 15;
lTable[(byte)'Ç'] = 10;
lTable[(byte)'È'] = 13;
lTable[(byte)'É'] = 13;
lTable[(byte)'Ê'] = 12;
lTable[(byte)'Ë'] = 13;
lTable[(byte)'Ì'] = 14;
lTable[(byte)'Í'] = 14;
lTable[(byte)'Î'] = 13;
lTable[(byte)'Ï'] = 11;
lTable[(byte)'Ð'] = 12;
lTable[(byte)'Ñ'] = 12;
lTable[(byte)'Ò'] = 18;
lTable[(byte)'Ó'] = 11;
lTable[(byte)'Ô'] = 13;
lTable[(byte)'Õ'] = 12;
lTable[(byte)'Ö'] = 13;
lTable[(byte)'×'] = 12;
lTable[(byte)'Ø'] = 17;
lTable[(byte)'Ù'] = 18;
lTable[(byte)'Ü'] = 16;
lTable[(byte)'Ú'] = 18;
lTable[(byte)'Û'] = 19;
lTable[(byte)'Ý'] = 11;
lTable[(byte)'Þ'] = 16;
lTable[(byte)'ß'] = 14;
lTable['à'] = 14;
lTable['á'] = 15;
lTable['â'] = 10;
lTable['ã'] = 12;
lTable['ä'] = 13;
lTable['å'] = 12;
lTable['¸'] = 12;
lTable['æ'] = 12;
lTable['ç'] = 10;
lTable['è'] = 10;
lTable['é'] = 10;
lTable['ê'] = 11;
lTable['ë'] = 12;
lTable['ì'] = 12;
lTable['í'] = 12;
lTable['î'] = 12;
lTable['ï'] = 10;
lTable['ð'] = 11;
lTable['ñ'] = 10;
lTable['ò'] = 14;
lTable['ó'] = 8;
lTable['ô'] = 11;
lTable['õ'] = 11;
lTable['ö'] = 12;
lTable['÷'] = 10;
lTable['ø'] = 15;
lTable['ù'] = 16;
lTable['ü'] = 14;
lTable['ú'] = 16;
lTable['û'] = 16;
lTable['ý'] = 9;
lTable['þ'] = 15;
lTable['ÿ'] = 14;
lTable[(byte)'à'] = 14;
lTable[(byte)'á'] = 15;
lTable[(byte)'â'] = 10;
lTable[(byte)'ã'] = 12;
lTable[(byte)'ä'] = 13;
lTable[(byte)'å'] = 12;
lTable[(byte)'¸'] = 12;
lTable[(byte)'æ'] = 12;
lTable[(byte)'ç'] = 10;
lTable[(byte)'è'] = 10;
lTable[(byte)'é'] = 10;
lTable[(byte)'ê'] = 11;
lTable[(byte)'ë'] = 12;
lTable[(byte)'ì'] = 12;
lTable[(byte)'í'] = 12;
lTable[(byte)'î'] = 12;
lTable[(byte)'ï'] = 10;
lTable[(byte)'ð'] = 11;
lTable[(byte)'ñ'] = 10;
lTable[(byte)'ò'] = 14;
lTable[(byte)'ó'] = 8;
lTable[(byte)'ô'] = 11;
lTable[(byte)'õ'] = 11;
lTable[(byte)'ö'] = 12;
lTable[(byte)'÷'] = 10;
lTable[(byte)'ø'] = 15;
lTable[(byte)'ù'] = 16;
lTable[(byte)'ü'] = 14;
lTable[(byte)'ú'] = 16;
lTable[(byte)'û'] = 16;
lTable[(byte)'ý'] = 9;
lTable[(byte)'þ'] = 15;
lTable[(byte)'ÿ'] = 14;
#endif // FONT_RUSSIAN
#ifdef FONT_CZECH
cTable['Ì'] = 196;
cTable['Š'] = 197;
cTable['È'] = 198;
cTable['Ø'] = 199;
cTable['Ž'] = 200;
cTable['Ý'] = 201;
cTable['Á'] = 202;
cTable['Í'] = 203;
cTable['É'] = 204;
cTable['Ï'] = 205;
cTable['<EFBFBD>'] = 206;
cTable['Ò'] = 207;
cTable['Ó'] = 208;
cTable['Ù'] = 209;
cTable['Ú'] = 210;
cTable[(byte)'Ì'] = 196;
cTable[(byte)'Š'] = 197;
cTable[(byte)'È'] = 198;
cTable[(byte)'Ø'] = 199;
cTable[(byte)'Ž'] = 200;
cTable[(byte)'Ý'] = 201;
cTable[(byte)'Á'] = 202;
cTable[(byte)'Í'] = 203;
cTable[(byte)'É'] = 204;
cTable[(byte)'Ï'] = 205;
cTable[(byte)'<EFBFBD>'] = 206;
cTable[(byte)'Ò'] = 207;
cTable[(byte)'Ó'] = 208;
cTable[(byte)'Ù'] = 209;
cTable[(byte)'Ú'] = 210;
cTable['ì'] = 211;
cTable['š'] = 212;
cTable['è'] = 213;
cTable['ø'] = 214;
cTable['ž'] = 215;
cTable['ý'] = 216;
cTable['á'] = 217;
cTable['í'] = 218;
cTable['é'] = 219;
cTable['ï'] = 220;
cTable['<EFBFBD>'] = 221;
cTable['ò'] = 222;
cTable['ó'] = 223;
cTable['ù'] = 224;
cTable['ú'] = 225;
cTable[(byte)'ì'] = 211;
cTable[(byte)'š'] = 212;
cTable[(byte)'è'] = 213;
cTable[(byte)'ø'] = 214;
cTable[(byte)'ž'] = 215;
cTable[(byte)'ý'] = 216;
cTable[(byte)'á'] = 217;
cTable[(byte)'í'] = 218;
cTable[(byte)'é'] = 219;
cTable[(byte)'ï'] = 220;
cTable[(byte)'<EFBFBD>'] = 221;
cTable[(byte)'ò'] = 222;
cTable[(byte)'ó'] = 223;
cTable[(byte)'ù'] = 224;
cTable[(byte)'ú'] = 225;
lTable['Ì'] = 11;
lTable['Š'] = 12;
lTable['È'] = 12;
lTable['Ø'] = 14;
lTable['Ž'] = 13;
lTable['Ý'] = 11;
lTable['Á'] = 13;
lTable['Í'] = 11;
lTable['É'] = 11;
lTable['Ï'] = 15;
lTable['<EFBFBD>'] = 19;
lTable['Ò'] = 10;
lTable['Ó'] = 13;
lTable['Ù'] = 13;
lTable['Ú'] = 13;
lTable[(byte)'Ì'] = 11;
lTable[(byte)'Š'] = 12;
lTable[(byte)'È'] = 12;
lTable[(byte)'Ø'] = 14;
lTable[(byte)'Ž'] = 13;
lTable[(byte)'Ý'] = 11;
lTable[(byte)'Á'] = 13;
lTable[(byte)'Í'] = 11;
lTable[(byte)'É'] = 11;
lTable[(byte)'Ï'] = 15;
lTable[(byte)'<EFBFBD>'] = 19;
lTable[(byte)'Ò'] = 10;
lTable[(byte)'Ó'] = 13;
lTable[(byte)'Ù'] = 13;
lTable[(byte)'Ú'] = 13;
lTable['ì'] = 12;
lTable['š'] = 12;
lTable['è'] = 12;
lTable['ø'] = 12;
lTable['ž'] = 13;
lTable['ý'] = 11;
lTable['á'] = 15;
lTable['í'] = 7;
lTable['é'] = 12;
lTable['ï'] = 17;
lTable['<EFBFBD>'] = 16;
lTable['ò'] = 11;
lTable['ó'] = 11;
lTable['ù'] = 13;
lTable['ú'] = 13;
lTable[(byte)'ì'] = 12;
lTable[(byte)'š'] = 12;
lTable[(byte)'è'] = 12;
lTable[(byte)'ø'] = 12;
lTable[(byte)'ž'] = 13;
lTable[(byte)'ý'] = 11;
lTable[(byte)'á'] = 15;
lTable[(byte)'í'] = 7;
lTable[(byte)'é'] = 12;
lTable[(byte)'ï'] = 17;
lTable[(byte)'<EFBFBD>'] = 16;
lTable[(byte)'ò'] = 11;
lTable[(byte)'ó'] = 11;
lTable[(byte)'ù'] = 13;
lTable[(byte)'ú'] = 13;
#endif // FONT_CZECH
#ifdef FONT_FRENCH
cTable['â'] = 226;
cTable['é'] = 227;
cTable['ê'] = 228;
cTable['î'] = 229;
cTable['ù'] = 230;
cTable['û'] = 231;
cTable['ô'] = 232;
cTable['ö'] = 233;
cTable[(byte)'â'] = 226;
cTable[(byte)'é'] = 227;
cTable[(byte)'ê'] = 228;
cTable[(byte)'î'] = 229;
cTable[(byte)'ù'] = 230;
cTable[(byte)'û'] = 231;
cTable[(byte)'ô'] = 232;
cTable[(byte)'ö'] = 233;
lTable['â'] = 15;
lTable['é'] = 12;
lTable['ê'] = 12;
lTable['î'] = 9;
lTable['ù'] = 13;
lTable['û'] = 13;
lTable['ô'] = 11;
lTable['ö'] = 11;
lTable[(byte)'â'] = 15;
lTable[(byte)'é'] = 12;
lTable[(byte)'ê'] = 12;
lTable[(byte)'î'] = 9;
lTable[(byte)'ù'] = 13;
lTable[(byte)'û'] = 13;
lTable[(byte)'ô'] = 11;
lTable[(byte)'ö'] = 11;
#endif // FONT_FRENCH
#ifdef FONT_GERMAN
cTable['ß'] = 234;
cTable[(byte)'ß'] = 234;
// 'SS' = 235
cTable['Ä'] = 236;
cTable['Ö'] = 237;
cTable['Ü'] = 238;
cTable[(byte)'Ä'] = 236;
cTable[(byte)'Ö'] = 237;
cTable[(byte)'Ü'] = 238;
lTable['ß'] = 15;
lTable[(byte)'ß'] = 15;
#endif // FONT_GERMAN
}

View file

@ -1832,7 +1832,7 @@ RMGfxSourceBuffer16::~RMGfxSourceBuffer16() {
}
void RMGfxSourceBuffer16::Draw(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim) {
int x,y;
int x, y;
uint16 *buf = bigBuf;
uint16 *raw = (uint16*)m_buf;
int dimx, dimy;
@ -1881,7 +1881,7 @@ void RMGfxSourceBuffer16::Draw(RMGfxTargetBuffer &bigBuf, RMGfxPrimitive *prim)
}
} else {
for (y = 0; y < dimy; y++) {
CopyMemory(buf, raw, dimx * 2);
Common::copy(raw, raw + dimx, buf);
buf += bigBuf.Dimx();
raw += m_dimx;
}

View file

@ -82,6 +82,17 @@ void RMTony::Init(void) {
RMRes body(9999);
RMDataStream ds;
// Mostra Tony di default
m_bShow=m_bShowOmbra = true;
// Nessuna azione in attesa
m_bActionPending = false;
m_bAction = false;
m_bPastorella = false;
m_bIsTalking = false;
m_bIsStaticTalk = false;
// Apre il buffer
ds.OpenBuffer(tony);
@ -97,17 +108,6 @@ void RMTony::Init(void) {
ds.Close();
m_body.SetPattern(0);
// Mostra Tony di default
m_bShow=m_bShowOmbra = true;
// Nessuna azione in attesa
m_bActionPending = false;
m_bAction = false;
m_bPastorella = false;
m_bIsTalking = false;
m_bIsStaticTalk = false;
m_nTimeLastStep = _vm->GetTime();
}