diff options
| -rw-r--r-- | queen/display.cpp | 14 | ||||
| -rw-r--r-- | scumm/costume.cpp | 3 | ||||
| -rw-r--r-- | scumm/gfx.cpp | 3 |
3 files changed, 12 insertions, 8 deletions
diff --git a/queen/display.cpp b/queen/display.cpp index 5d8e68bdc6..1609ddb687 100644 --- a/queen/display.cpp +++ b/queen/display.cpp @@ -566,13 +566,14 @@ void Display::prepareUpdate() { #ifdef __PALM_OS__ ARM_START(CopyRectangleType) + ARM_INIT(COMMON_COPYRECT) ARM_ADDM(dst) ARM_ADDV(buf, src) ARM_ADDV(pitch, BACKDROP_W) ARM_ADDV(_offScreenPitch, SCREEN_W) ARM_ADDV(w, SCREEN_W) ARM_ADDM(h) - PNO_CALL(PNO_COPYRECT, ARM_DATA()) + ARM_CALL(ARM_COMMON, PNO_DATA()) ARM_END() #endif @@ -690,6 +691,7 @@ void Display::blit(uint8 *dstBuf, uint16 dstPitch, uint16 x, uint16 y, const uin #ifdef __PALM_OS__ ARM_CHECK_EXEC(w > 8 && h > 8) ARM_START(BlitType) + ARM_INIT(QUEEN_BLIT) ARM_ADDM(dstBuf) ARM_ADDM(dstPitch) ARM_ADDM(srcBuf) @@ -698,7 +700,7 @@ void Display::blit(uint8 *dstBuf, uint16 dstPitch, uint16 x, uint16 y, const uin ARM_ADDM(h) ARM_ADDM(xflip) ARM_ADDM(masked) - PNO_CALL(PNO_BLIT, ARM_DATA()) + ARM_CALL(ARM_ENGINE, PNO_DATA()) ARM_END() ARM_CHECK_END() #endif @@ -711,9 +713,9 @@ void Display::blit(uint8 *dstBuf, uint16 dstPitch, uint16 x, uint16 y, const uin } } else if (!xflip) { // Masked bitmap unflipped while (h--) { - for (int i = 0; i < w; ++i) { + for(int i = 0; i < w; ++i) { uint8 b = *(srcBuf + i); - if (b != 0) { + if(b != 0) { *(dstBuf + i) = b; } } @@ -722,9 +724,9 @@ void Display::blit(uint8 *dstBuf, uint16 dstPitch, uint16 x, uint16 y, const uin } } else { // Masked bitmap flipped while (h--) { - for (int i = 0; i < w; ++i) { + for(int i = 0; i < w; ++i) { uint8 b = *(srcBuf + i); - if (b != 0) { + if(b != 0) { *(dstBuf - i) = b; } } diff --git a/scumm/costume.cpp b/scumm/costume.cpp index 5e76341f94..c42892eb73 100644 --- a/scumm/costume.cpp +++ b/scumm/costume.cpp @@ -409,6 +409,7 @@ void CostumeRenderer::procC64(Codec1 &v1, int actor) { void CostumeRenderer::proc3(Codec1 &v1) { #ifdef __PALM_OS__ ARM_START(CostumeProc3Type) + ARM_INIT(SCUMM_PROC3) ARM_ADDP(v1) ARM_ADDM(revBitMask) ARM_ADDM(_srcptr) @@ -424,7 +425,7 @@ void CostumeRenderer::proc3(Codec1 &v1) { ARM_ADDV(_out_pitch, _out.pitch) ARM_ADDV(_out_w, _out.w) ARM_ADDV(_out_h, _out.h) - PCE_CALL_RETURN(PNO_COSTUMEPROC3, ARM_DATA(), _scaleIndexX) + ARM_CALL_RETURN(ARM_ENGINE, PNO_DATA(), _scaleIndexX) ARM_END() #endif diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp index 96405490e5..e73cc9dbdd 100644 --- a/scumm/gfx.cpp +++ b/scumm/gfx.cpp @@ -482,6 +482,7 @@ void Gdi::drawStripToScreen(VirtScreen *vs, int x, int width, int top, int botto #ifdef __PALM_OS__ ARM_START(DrawStripType) + ARM_INIT(SCUMM_DRAWSTRIP) ARM_ADDM(width) ARM_ADDM(height) ARM_ADDM(src) @@ -490,7 +491,7 @@ void Gdi::drawStripToScreen(VirtScreen *vs, int x, int width, int top, int botto ARM_ADDV(_vm_screenWidth, _vm->_screenWidth) ARM_ADDV(vs_pitch, vs->pitch) ARM_ADDV(_textSurface_pitch, _textSurface.pitch) - PCE_CALL(PNO_DRAWSTRIP, ARM_DATA()) + ARM_CALL(ARM_ENGINE, PNO_DATA()) ARM_CONTINUE() #endif // Compose the text over the game graphics |