aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush/blitter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/smush/blitter.cpp')
-rw-r--r--scumm/smush/blitter.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/scumm/smush/blitter.cpp b/scumm/smush/blitter.cpp
index 290c97a16d..e7c0af543a 100644
--- a/scumm/smush/blitter.cpp
+++ b/scumm/smush/blitter.cpp
@@ -27,12 +27,12 @@
#include <assert.h>
#include <string.h> // for memcpy
-Blitter::Blitter(byte * ptr, const Point & dstsize, const Rect & src) :
- _ptr(ptr),
- _clip(dstsize),
- _src(src),
- _cur(src.left(), src.top()),
- _outside(false) {
+Blitter::Blitter(byte *ptr, const Point &dstsize, const Rect &src) :
+ _ptr(ptr),
+ _clip(dstsize),
+ _src(src),
+ _cur(src.left(), src.top()),
+ _outside(false) {
#ifdef DEBUG_CLIPPER
_clipped = 0;
_clippedBlock = 0;
@@ -62,7 +62,7 @@ void Blitter::advance(int32 x, int32 y) {
_cur.set(_src.left(), _cur.getY()+1);
}
}
- _offset = _ptr + _clip.getX() * _cur.getY() + _cur.getX();
+ _offset = _ptr + _clip.getX() * _cur.getY() + _cur.getX();
_outside = ! _src.isInside(_cur);
}
@@ -76,7 +76,7 @@ void Blitter::put(byte data) {
advance();
}
#ifdef DEBUG_CLIPPER
- else _clipped ++;
+ else _clipped++;
#endif
}
@@ -95,7 +95,7 @@ void Blitter::put(byte data, uint32 len) {
}
}
-void Blitter::blit(byte * ptr, uint32 len) {
+void Blitter::blit(byte *ptr, uint32 len) {
while(len) {
if(_outside) {
#ifdef DEBUG_CLIPPER
@@ -111,7 +111,7 @@ void Blitter::blit(byte * ptr, uint32 len) {
}
}
-void Blitter::blit(Chunk & src, uint32 len) {
+void Blitter::blit(Chunk &src, uint32 len) {
while(len) {
if(_outside) {
#ifdef DEBUG_CLIPPER
@@ -129,7 +129,7 @@ void Blitter::blit(Chunk & src, uint32 len) {
void Blitter::putBlock(uint32 data) {
if(_cur.getX() + 3 < _src.right() && _cur.getY() + 3 < _src.bottom()) { // This is clipping
assert((_clip.getX() & 3) == 0);
- uint32 * dst = (uint32 *)_offset;
+ uint32 *dst = (uint32 *)_offset;
int32 line_size = _clip.getX() >> 2;
data = TO_LE_32(data);
@@ -149,7 +149,7 @@ void Blitter::putBlock(uint32 data) {
void Blitter::putBlock(uint32 d1, uint32 d2, uint32 d3, uint32 d4) {
if(_cur.getX() + 3 < _src.right() && _cur.getY() + 3 < _src.bottom()) { // This is clipping
assert((_clip.getX() & 3) == 0);
- uint32 * dst = (uint32 *)_offset;
+ uint32 *dst = (uint32 *)_offset;
int32 line_size = _clip.getX() >> 2;
*dst = TO_LE_32(d4); dst += line_size;
@@ -159,34 +159,34 @@ void Blitter::putBlock(uint32 d1, uint32 d2, uint32 d3, uint32 d4) {
#ifdef DEBUG_CLIPPER
} else {
- _clippedBlock ++;
+ _clippedBlock++;
#endif
}
advanceBlock();
}
-void Blitter::putBlock(byte * data) {
+void Blitter::putBlock(byte *data) {
if(_cur.getX() + 3 < _src.right() && _cur.getY() + 3 < _src.bottom()) { // This is clipping
assert((_clip.getX() & 3) == 0);
- uint32 * dst = (uint32 *)_offset;
+ uint32 *dst = (uint32 *)_offset;
int32 line_size = _clip.getX() >> 2;
- uint32 * src = (uint32 *)data;
+ uint32 *src = (uint32 *)data;
*dst = TO_LE_32(*src++); dst += line_size;
*dst = TO_LE_32(*src++); dst += line_size;
*dst = TO_LE_32(*src++); dst += line_size;
*dst = TO_LE_32(*src++);
#ifdef DEBUG_CLIPPER
} else {
- _clippedBlock ++;
+ _clippedBlock++;
#endif
}
advanceBlock();
}
-void Blitter::putBlock(Chunk & src) {
+void Blitter::putBlock(Chunk &src) {
if(_cur.getX() + 3 < _src.right() && _cur.getY() + 3 < _src.bottom()) { // This is clipping
assert((_clip.getX() & 3) == 0);
- uint32 * dst = (uint32 *)_offset;
+ uint32 *dst = (uint32 *)_offset;
int32 line_size = _clip.getX() >> 2;
*dst = TO_LE_32(src.getDword()); dst += line_size;
*dst = TO_LE_32(src.getDword()); dst += line_size;
@@ -194,7 +194,7 @@ void Blitter::putBlock(Chunk & src) {
*dst = TO_LE_32(src.getDword());
#ifdef DEBUG_CLIPPER
} else {
- _clippedBlock ++;
+ _clippedBlock++;
#endif
}
advanceBlock();
@@ -228,7 +228,7 @@ void Blitter::blockCopy(int32 offset) {
#endif
#ifdef DEBUG_CLIPPER
} else {
- _clippedBlock ++;
+ _clippedBlock++;
#endif
}
advanceBlock();