diff options
| author | Filippos Karapetis | 2009-01-11 04:23:57 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-01-11 04:23:57 +0000 |
| commit | f997ea3c6e6c9631977feec62e5772d9c576d4c3 (patch) | |
| tree | cae627138b713229166aa1006936682d61fe2bb8 | |
| parent | ffa104da856e5c340bdcf6390812cdbd650a896d (diff) | |
| download | scummvm-rg350-f997ea3c6e6c9631977feec62e5772d9c576d4c3.tar.gz scummvm-rg350-f997ea3c6e6c9631977feec62e5772d9c576d4c3.tar.bz2 scummvm-rg350-f997ea3c6e6c9631977feec62e5772d9c576d4c3.zip | |
Oops... *really* fixed compilation
svn-id: r35818
| -rw-r--r-- | graphics/video/video_player.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/graphics/video/video_player.cpp b/graphics/video/video_player.cpp index 1f8fe78447..7859a67bab 100644 --- a/graphics/video/video_player.cpp +++ b/graphics/video/video_player.cpp @@ -36,8 +36,8 @@ namespace Graphics { VideoDecoder::VideoDecoder() : _fileStream(0) { - _black = 0; - _white = 255; + _curFrameBlack = 0; + _curFrameWhite = 255; } VideoDecoder::~VideoDecoder() { @@ -138,12 +138,12 @@ void VideoDecoder::setPalette(byte *pal) { weight = 3 * r * r + 6 * g * g + 2 * b * b; if (weight >= maxWeight) { - _white = i; + _curFrameWhite = i; maxWeight = weight; } if (weight <= minWeight) { - _black = i; + _curFrameBlack = i; minWeight = i; } } |