diff options
| author | Max Horn | 2003-05-12 22:08:39 +0000 |
|---|---|---|
| committer | Max Horn | 2003-05-12 22:08:39 +0000 |
| commit | 81bfe8cd5116e99f794ddfa105378aa1d9a3f401 (patch) | |
| tree | 42b793b32def16436bb43ab8981b1a9dce2ffb36 /scumm/smush | |
| parent | 47227fdf77f52dfb392dfd4fa26c3e76d8f6e523 (diff) | |
| download | scummvm-rg350-81bfe8cd5116e99f794ddfa105378aa1d9a3f401.tar.gz scummvm-rg350-81bfe8cd5116e99f794ddfa105378aa1d9a3f401.tar.bz2 scummvm-rg350-81bfe8cd5116e99f794ddfa105378aa1d9a3f401.zip | |
swapped talkPosX and talkPosY (they were misnamed); factored out some duplicate code in string.cpp; VC warning fix in smush_player.cpp
svn-id: r7481
Diffstat (limited to 'scumm/smush')
| -rw-r--r-- | scumm/smush/smush_player.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index 70ceef6950..ccd09234cf 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -615,8 +615,7 @@ void SmushPlayer::readPalette(byte *out, Chunk &in) { } static byte delta_color(byte org_color, int16 delta_color) { - int16 t; - t = (((int32)(org_color) << 7) + org_color + delta_color) >> 7; + int t = ((org_color << 7) + org_color + delta_color) >> 7; if (t > 255) t = 255; if (t < 0) |