diff options
| author | Paul Gilbert | 2012-05-05 09:31:21 +1000 |
|---|---|---|
| committer | Paul Gilbert | 2012-05-05 09:31:21 +1000 |
| commit | 657d93ea8f5e123024c4618b8a3dc441a9f45cbc (patch) | |
| tree | 0a7d48af80a0b1f36635064a793133699839220d /engines | |
| parent | 3454a0a9c3738b09ac8de417297cb1f8adb0d2da (diff) | |
| download | scummvm-rg350-657d93ea8f5e123024c4618b8a3dc441a9f45cbc.tar.gz scummvm-rg350-657d93ea8f5e123024c4618b8a3dc441a9f45cbc.tar.bz2 scummvm-rg350-657d93ea8f5e123024c4618b8a3dc441a9f45cbc.zip | |
TONY: Fix some Valgrind identified warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/tony/font.cpp | 562 | ||||
| -rw-r--r-- | engines/tony/gfxcore.cpp | 4 | ||||
| -rw-r--r-- | engines/tony/tonychar.cpp | 22 |
3 files changed, 294 insertions, 294 deletions
diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp index ec5a78731b..c4f589a21d 100644 --- a/engines/tony/font.cpp +++ b/engines/tony/font.cpp @@ -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 //ꣳ - 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[''] = 128; - cTable[''] = 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[''] = 14; - lTable[''] = 13; + 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)''] = 128; + cTable[(byte)''] = 129; + + 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)''] = 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[''] = 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; - - 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[''] = 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; + 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[(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[(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[(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[''] = 206; - cTable[''] = 207; - cTable[''] = 208; - cTable[''] = 209; - cTable[''] = 210; - - cTable[''] = 211; - cTable[''] = 212; - cTable[''] = 213; - cTable[''] = 214; - cTable[''] = 215; - cTable[''] = 216; - cTable[''] = 217; - cTable[''] = 218; - cTable[''] = 219; - cTable[''] = 220; - cTable[''] = 221; - cTable[''] = 222; - cTable[''] = 223; - cTable[''] = 224; - cTable[''] = 225; - - lTable[''] = 11; - lTable[''] = 12; - lTable[''] = 12; - lTable[''] = 14; - lTable[''] = 13; - lTable[''] = 11; - lTable[''] = 13; - lTable[''] = 11; - lTable[''] = 11; - lTable[''] = 15; - lTable[''] = 19; - lTable[''] = 10; - lTable[''] = 13; - lTable[''] = 13; - lTable[''] = 13; - - lTable[''] = 12; - lTable[''] = 12; - lTable[''] = 12; - lTable[''] = 12; - lTable[''] = 13; - lTable[''] = 11; - lTable[''] = 15; - lTable[''] = 7; - lTable[''] = 12; - lTable[''] = 17; - lTable[''] = 16; - lTable[''] = 11; - lTable[''] = 11; - lTable[''] = 13; - lTable[''] = 13; + 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)''] = 206; + cTable[(byte)''] = 207; + cTable[(byte)''] = 208; + cTable[(byte)''] = 209; + cTable[(byte)''] = 210; + + 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)''] = 221; + cTable[(byte)''] = 222; + cTable[(byte)''] = 223; + cTable[(byte)''] = 224; + cTable[(byte)''] = 225; + + 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)''] = 19; + lTable[(byte)''] = 10; + lTable[(byte)''] = 13; + lTable[(byte)''] = 13; + lTable[(byte)''] = 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)''] = 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; - - lTable[''] = 15; - lTable[''] = 12; - lTable[''] = 12; - lTable[''] = 9; - lTable[''] = 13; - lTable[''] = 13; - lTable[''] = 11; - lTable[''] = 11; + 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[(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 } diff --git a/engines/tony/gfxcore.cpp b/engines/tony/gfxcore.cpp index 9f725f2523..5737a6af45 100644 --- a/engines/tony/gfxcore.cpp +++ b/engines/tony/gfxcore.cpp @@ -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; } diff --git a/engines/tony/tonychar.cpp b/engines/tony/tonychar.cpp index 12a8c8eabb..a2648318fe 100644 --- a/engines/tony/tonychar.cpp +++ b/engines/tony/tonychar.cpp @@ -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(); } |