aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorChris Apers2005-12-03 19:04:33 +0000
committerChris Apers2005-12-03 19:04:33 +0000
commit64bfec97d947f36495241cd4b41763bbde638f85 (patch)
treef71ce6d5c2140fbda57b4ae65385aebe238add92 /scumm
parent71e21f0fdf996348afe256b51305c5cd5fba8e8a (diff)
downloadscummvm-rg350-64bfec97d947f36495241cd4b41763bbde638f85.tar.gz
scummvm-rg350-64bfec97d947f36495241cd4b41763bbde638f85.tar.bz2
scummvm-rg350-64bfec97d947f36495241cd4b41763bbde638f85.zip
Not needed anymore :)
svn-id: r19735
Diffstat (limited to 'scumm')
-rw-r--r--scumm/costume.cpp26
-rw-r--r--scumm/gfx.cpp48
2 files changed, 0 insertions, 74 deletions
diff --git a/scumm/costume.cpp b/scumm/costume.cpp
index 4d9f76cafc..e8767fab77 100644
--- a/scumm/costume.cpp
+++ b/scumm/costume.cpp
@@ -27,11 +27,6 @@
#include "scumm/sound.h"
#include "scumm/util.h"
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
namespace Scumm {
#ifdef PALMOS_68K
@@ -414,27 +409,6 @@ void ClassicCostumeRenderer::procC64(Codec1 &v1, int actor) {
#undef MASK_AT
void ClassicCostumeRenderer::proc3(Codec1 &v1) {
-#ifdef PALMOS_68K
- ARM_START(CostumeProc3Type)
- ARM_INIT(SCUMM_PROC3)
- ARM_ADDP(v1)
- ARM_ADDM(_srcptr)
- ARM_ADDM(_height)
- ARM_ADDM(_scaleIndexX)
- ARM_ADDM(_scaleIndexY)
- ARM_ADDM(_scaleX)
- ARM_ADDM(_scaleY)
- ARM_ADDM(_numStrips)
- ARM_ADDM(_shadow_mode)
- ARM_ADDM(_shadow_table)
- ARM_ADDM(_palette)
- ARM_ADDV(_out_pitch, _out.pitch)
- ARM_ADDV(_out_w, _out.w)
- ARM_ADDV(_out_h, _out.h)
- ARM_CALL_VALUE(ARM_ENGINE, PNO_DATA(), _scaleIndexX)
- ARM_END()
-#endif
-
const byte *mask, *src;
byte *dst;
byte len, maskbit;
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 57d2748ec3..6ce482a669 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -29,11 +29,6 @@
#include "scumm/usage_bits.h"
#include "scumm/wiz_he.h"
-#if defined(PALMOS_68K)
-#include "arm/native.h"
-#include "arm/macros.h"
-#endif
-
namespace Scumm {
static void blit(byte *dst, int dstPitch, const byte *src, int srcPitch, int w, int h);
@@ -542,20 +537,6 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
byte *dst = _compositeBuf + x + y * _screenWidth;
const byte *text = (byte *)_charset->_textSurface.pixels + x + y * _charset->_textSurface.pitch;
-#ifdef PALMOS_68K
- ARM_START(DrawStripType)
- ARM_INIT(SCUMM_DRAWSTRIP)
- ARM_ADDM(width)
- ARM_ADDM(height)
- ARM_ADDM(src)
- ARM_ADDM(dst)
- ARM_ADDM(text)
- ARM_ADDV(_vm_screenWidth, _screenWidth)
- ARM_ADDV(vs_pitch, vs->pitch)
- ARM_ADDV(_charset_textSurface_pitch, _charset->_textSurface.pitch)
- ARM_CALL(ARM_ENGINE, PNO_DATA())
- ARM_CONTINUE()
-#endif
// Compose the text over the game graphics
for (int h = 0; h < height; ++h) {
for (int w = 0; w < width; ++w) {
@@ -606,20 +587,6 @@ void ScummEngine::drawStripToScreen(VirtScreen *vs, int x, int width, int top, i
// Odd lines have colors swapped, so there will be checkered patterns.
// But apparently there is a mistake for 10th color.
void ScummEngine::ditherCGA(byte *dst, int dstPitch, int x, int y, int width, int height) const {
-#ifdef PALMOS_68K
- ARM_START(RenderCGAType)
- ARM_INIT(SCUMM_RENDERCGA)
- ARM_ADDM(dst)
- ARM_ADDM(dstPitch)
- ARM_ADDM(x)
- ARM_ADDM(y)
- ARM_ADDM(width)
- ARM_ADDM(height)
- ARM_ADDV(_version, _version)
- ARM_CALL(ARM_ENGINE, PNO_DATA())
- ARM_END()
-#endif
-
byte *ptr;
int idx1, idx2;
static const byte cgaDither[2][2][16] = {
@@ -654,20 +621,6 @@ void ScummEngine::ditherCGA(byte *dst, int dstPitch, int x, int y, int width, in
// cccc1
// dddd0
void ScummEngine::ditherHerc(byte *src, byte *hercbuf, int srcPitch, int *x, int *y, int *width, int *height) const {
-#ifdef PALMOS_68K
- ARM_START(RenderHercType)
- ARM_INIT(SCUMM_RENDERHERC)
- ARM_ADDM(src)
- ARM_ADDM(hercbuf)
- ARM_ADDM(srcPitch)
- ARM_ADDM(x)
- ARM_ADDM(y)
- ARM_ADDM(width)
- ARM_ADDM(height)
- ARM_CALL(ARM_ENGINE, PNO_DATA())
- ARM_END()
-#endif
-
byte *srcptr, *dstptr;
int xo = *x, yo = *y, widtho = *width, heighto = *height;
int idx1, idx2, dsty = 0, y1;
@@ -3289,4 +3242,3 @@ _GRELEASEPTR(GBVARS_TRANSITIONEFFECTS_INDEX, GBVARS_SCUMM)
_GEND
#endif
-