[Scummvm-cvs-logs] scummvm master -> f52d3fa84b1ce9f75a602b0d88e40d0a60cc6f97
wjp
wjp at usecode.org
Fri Oct 10 17:03:33 CEST 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f52d3fa84b PRINCE: Attempt to fix compilation on AmigaOS
Commit: f52d3fa84b1ce9f75a602b0d88e40d0a60cc6f97
https://github.com/scummvm/scummvm/commit/f52d3fa84b1ce9f75a602b0d88e40d0a60cc6f97
Author: Willem Jan Palenstijn (Willem.Jan.Palenstijn at cwi.nl)
Date: 2014-10-10T17:02:30+02:00
Commit Message:
PRINCE: Attempt to fix compilation on AmigaOS
Changed paths:
engines/prince/graphics.cpp
diff --git a/engines/prince/graphics.cpp b/engines/prince/graphics.cpp
index 91ba699..c6796ff 100644
--- a/engines/prince/graphics.cpp
+++ b/engines/prince/graphics.cpp
@@ -367,14 +367,14 @@ void GraphicsMan::drawBackSpriteDrawNode(Graphics::Surface *screen, DrawNode *dr
}
byte GraphicsMan::getBlendTableColor(byte pixelColor, byte backgroundPixelColor, byte *blendTable) {
- int32 redFirstOrg, greenFirstOrg, blueFirstOrg;
- int32 redFirstBack, greenFirstBack, blueFirstBack;
- int32 redSecondOrg, greenSecondOrg, blueSecondOrg;
- int32 redNew, greenNew, blueNew;
+ int redFirstOrg, greenFirstOrg, blueFirstOrg;
+ int redFirstBack, greenFirstBack, blueFirstBack;
+ int redSecondOrg, greenSecondOrg, blueSecondOrg;
+ int redNew, greenNew, blueNew;
- int32 sumOfColorValues;
- int32 bigValue;
- int32 currColor;
+ int sumOfColorValues;
+ int bigValue;
+ int currColor;
if (blendTable[pixelColor] != 255) {
currColor = blendTable[pixelColor];
@@ -440,13 +440,13 @@ byte GraphicsMan::getBlendTableColor(byte pixelColor, byte backgroundPixelColor,
}
void GraphicsMan::makeShadowTable(int brightness, byte *shadowPalette) {
- int32 redFirstOrg, greenFirstOrg, blueFirstOrg;
- int32 redSecondOrg, greenSecondOrg, blueSecondOrg;
- int32 redNew, greenNew, blueNew;
+ int redFirstOrg, greenFirstOrg, blueFirstOrg;
+ int redSecondOrg, greenSecondOrg, blueSecondOrg;
+ int redNew, greenNew, blueNew;
- int32 sumOfColorValues;
- int32 bigValue;
- int32 currColor;
+ int sumOfColorValues;
+ int bigValue;
+ int currColor;
int shadow = brightness * 256 / 100;
More information about the Scummvm-git-logs
mailing list