diff options
author | Florian Kagerer | 2009-06-15 20:52:09 +0000 |
---|---|---|
committer | Florian Kagerer | 2009-06-15 20:52:09 +0000 |
commit | 583a89be627f300488ea12d8c96c699ff2c684f4 (patch) | |
tree | d37fe5ac9885ce937b827c19a0b715ed423f7f3b /engines/kyra/screen_lol.cpp | |
parent | f2e3ddf72a91f1b4857a74b4c6ee228aa5d6d0d8 (diff) | |
download | scummvm-rg350-583a89be627f300488ea12d8c96c699ff2c684f4.tar.gz scummvm-rg350-583a89be627f300488ea12d8c96c699ff2c684f4.tar.bz2 scummvm-rg350-583a89be627f300488ea12d8c96c699ff2c684f4.zip |
LOL: - started on the ingame menu code (death menu, load menu and main menu)
- fixed regression in kyra gui code (broken menu highlighting)
- fixed minor bug in animation code
svn-id: r41557
Diffstat (limited to 'engines/kyra/screen_lol.cpp')
-rw-r--r-- | engines/kyra/screen_lol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp index 3f3aef72fe..751d313840 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -105,7 +105,7 @@ void Screen_LoL::fprintString(const char *format, int x, int y, uint8 col1, uint va_end(vaList); if (flags & 1) - x -= getTextWidth(string) >> 1; + x -= (getTextWidth(string) >> 1); if (flags & 2) x -= getTextWidth(string); @@ -956,7 +956,7 @@ uint8 *Screen_LoL::generateFadeTable(uint8 *dst, uint8 *src1, uint8 *src2, int n t += d; for (int ii = 0; ii < 768; ii++) { - int val = (((int8)*p3++ * t) >> 8) + (int8)*p2++; + int16 val = (((int8)*p3++ * t) >> 8) + (int8)*p2++; *dst++ = (uint8)val; } } |