aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/screen_eob.cpp
diff options
context:
space:
mode:
authorathrxx2011-12-11 12:29:09 +0100
committerJohannes Schickel2011-12-26 16:18:16 +0100
commit8b618e46df21d90a1a5ad62633a2b9d3c1da0317 (patch)
tree9fb69909c5d19210a458d98dbfe4b6e40d97539b /engines/kyra/screen_eob.cpp
parentaac7e16afa8546232a27754c6928cd43cd6ba876 (diff)
downloadscummvm-rg350-8b618e46df21d90a1a5ad62633a2b9d3c1da0317.tar.gz
scummvm-rg350-8b618e46df21d90a1a5ad62633a2b9d3c1da0317.tar.bz2
scummvm-rg350-8b618e46df21d90a1a5ad62633a2b9d3c1da0317.zip
KYRA: (EOB/LOL) - cleanup common code
(rename some stuff and move EOB/LOL common code to separate files)
Diffstat (limited to 'engines/kyra/screen_eob.cpp')
-rw-r--r--engines/kyra/screen_eob.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp
index 0b877b7247..ca44a8a771 100644
--- a/engines/kyra/screen_eob.cpp
+++ b/engines/kyra/screen_eob.cpp
@@ -189,7 +189,7 @@ void Screen_Eob::loadEobBitmap(const char *file, const uint8 *ditheringData, int
delete s;
}
}
-
+
if (copyToPage == -1) {
return;
} else if (copyToPage == 0) {
@@ -248,7 +248,7 @@ uint8 *Screen_Eob::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b
uint8 *lineEnd = src + (w << 3);
do {
uint8 val = *src++;
- if (!val) {
+ if (!val) {
*dst++ = 0;
uint8 *startZeroPos = src;
@@ -563,9 +563,9 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
addDirtyRect(rX, rY, rW, rH);
while (dH--) {
- int16 xpos = (int16) marginLeft;
+ int16 xpos = (int16) marginLeft;
- if (flags & 1) {
+ if (flags & 1) {
for (int i = 0; i < w2; i++) {
if (*src++ == 0) {
i += (*src - 1);
@@ -636,7 +636,7 @@ void Screen_Eob::drawShape(uint8 pageNum, const uint8 *shapeData, int x, int y,
dstL += 320;
dst = dstL;
- if (flags & 1)
+ if (flags & 1)
src = src2 + 1;
}
}
@@ -751,7 +751,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
int rY1 = dm->sy;
int rX2 = rX1 + (dm->w << 3);
int rY2 = rY1 + dm->h - 1;
-
+
int16 gx2 = _gfxX;
int16 gy2 = _gfxY;
@@ -783,7 +783,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
py = ymax;
if (posWithinRect(px, py, rX1, rY1, rX2, rY2))
setPagePixel(0, px, py, ptr6[i]);
- }
+ }
}
l = 0;
@@ -798,7 +798,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
ptr5[i] += 5;
ptr3[i] += ptr5[i];
ptr8[i] += ptr7[i];
-
+
int16 px = ((ptr2[i] >> 6) >> scale) + gx2;
int16 py = ((ptr3[i] >> 6) >> scale) + gy2;
if (py >= ymax || py < ymin)
@@ -808,7 +808,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
if (py > ymax)
py = ymax;
-
+
int pxVal1 = 0;
if (posWithinRect(px, py, 0, 0, 319, 199)) {
pxVal1 = getPagePixel(2, px, py);
@@ -833,7 +833,7 @@ void Screen_Eob::drawExplosion(int scale, int radius, int numElements, int stepS
}
}
}
-
+
showMouse();
}