diff options
| author | Travis Howell | 2004-08-14 02:44:16 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-08-14 02:44:16 +0000 |
| commit | 4d86651ae2d79474cd8c15a09e7557f50c913c66 (patch) | |
| tree | 18eff27ac646fb82d6cf2c0b200a1525263d5d6c /scumm | |
| parent | da8ad9d94b8a59f794268beeb72efb8280681b77 (diff) | |
| download | scummvm-rg350-4d86651ae2d79474cd8c15a09e7557f50c913c66.tar.gz scummvm-rg350-4d86651ae2d79474cd8c15a09e7557f50c913c66.tar.bz2 scummvm-rg350-4d86651ae2d79474cd8c15a09e7557f50c913c66.zip | |
Check no longer required
Move palette function define back to correct place
svn-id: r14590
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/insane/insane.cpp | 3 | ||||
| -rw-r--r-- | scumm/scumm.h | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp index 2dd7f96aea..d6c8c3d0b0 100644 --- a/scumm/insane/insane.cpp +++ b/scumm/insane/insane.cpp @@ -1357,9 +1357,6 @@ void Insane::smlayer_setActorFacing(int actornum, int actnum, int frame, int dir } const char *Insane::handleTrsTag(int32 trsId) { - if ((_vm->_features & GF_DEMO) && (_vm->_features & GF_PC)) - return 0; - debugC(DEBUG_INSANE, "Insane::handleTrsTag(%d)", trsId); return _player->getString(trsId); } diff --git a/scumm/scumm.h b/scumm/scumm.h index 00932ca012..a0d98f9039 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -890,8 +890,6 @@ protected: void initBGBuffers(int height); void initCycl(const byte *ptr); // Color cycle - void setupShadowPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor, int start, int end); - void drawObject(int obj, int arg); void drawRoomObjects(int arg); void drawRoomObject(int i, int arg); @@ -932,6 +930,7 @@ public: protected: void moveMemInPalRes(int start, int end, byte direction); void setupShadowPalette(int slot, int redScale, int greenScale, int blueScale, int startColor, int endColor); + void setupShadowPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor, int start, int end); void darkenPalette(int redScale, int greenScale, int blueScale, int startColor, int endColor); void desaturatePalette(int hueScale, int satScale, int lightScale, int startColor, int endColor); |