diff options
| author | Torbjörn Andersson | 2005-04-26 11:05:06 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2005-04-26 11:05:06 +0000 |
| commit | 728da398d7f7f4c43567157f04d1bbf9a3acbb5a (patch) | |
| tree | 71eb5cb90f7d64bd59cdfdbbb9830af94b10e6b0 | |
| parent | 3931115b9a6484094deb207d080139c5eb367626 (diff) | |
| download | scummvm-rg350-728da398d7f7f4c43567157f04d1bbf9a3acbb5a.tar.gz scummvm-rg350-728da398d7f7f4c43567157f04d1bbf9a3acbb5a.tar.bz2 scummvm-rg350-728da398d7f7f4c43567157f04d1bbf9a3acbb5a.zip | |
...and since RGBToColor() returns OverlayColor, let's use that datatype
instead of uint16. (I never realized that we could use RGBToColor() here
myself. Good job in spotting that!)
svn-id: r17812
| -rw-r--r-- | graphics/animation.cpp | 8 | ||||
| -rw-r--r-- | graphics/animation.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/graphics/animation.cpp b/graphics/animation.cpp index 19c17e1512..6dd98c7915 100644 --- a/graphics/animation.cpp +++ b/graphics/animation.cpp @@ -376,11 +376,11 @@ void BaseAnimationState::buildLookup() { int16 *Cb_g_tab = &_colorTab[2 * 256]; int16 *Cb_b_tab = &_colorTab[3 * 256]; - _rgbToPix = (uint16 *)malloc(3 * 768 * sizeof(uint16)); + _rgbToPix = (OverlayColor *)malloc(3 * 768 * sizeof(OverlayColor)); - uint16 *r_2_pix_alloc = &_rgbToPix[0 * 768]; - uint16 *g_2_pix_alloc = &_rgbToPix[1 * 768]; - uint16 *b_2_pix_alloc = &_rgbToPix[2 * 768]; + OverlayColor *r_2_pix_alloc = &_rgbToPix[0 * 768]; + OverlayColor *g_2_pix_alloc = &_rgbToPix[1 * 768]; + OverlayColor *b_2_pix_alloc = &_rgbToPix[2 * 768]; int16 CR, CB; int i; diff --git a/graphics/animation.h b/graphics/animation.h index 5efb3797d8..a74c473b8a 100644 --- a/graphics/animation.h +++ b/graphics/animation.h @@ -109,7 +109,7 @@ protected: OverlayColor *_overlay; int _bitFormat; int16 *_colorTab; - uint16 *_rgbToPix; + OverlayColor *_rgbToPix; #endif public: |