[Scummvm-git-logs] scummvm master -> e06dee94437839a288ad092a082883ee091e7af3
Strangerke
noreply at scummvm.org
Sun Mar 6 21:17:55 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e06dee9443 CHEWY: remove a couple of unused functions in effect and mcga_graphics, some renaming
Commit: e06dee94437839a288ad092a082883ee091e7af3
https://github.com/scummvm/scummvm/commit/e06dee94437839a288ad092a082883ee091e7af3
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2022-03-06T22:17:49+01:00
Commit Message:
CHEWY: remove a couple of unused functions in effect and mcga_graphics, some renaming
Changed paths:
engines/chewy/effect.cpp
engines/chewy/effect.h
engines/chewy/globals.h
engines/chewy/main.cpp
engines/chewy/mcga.cpp
engines/chewy/mcga.h
engines/chewy/mcga_graphics.cpp
engines/chewy/mcga_graphics.h
engines/chewy/rooms/room28.cpp
engines/chewy/rooms/room40.cpp
engines/chewy/rooms/room76.cpp
engines/chewy/rooms/room82.cpp
engines/chewy/rooms/room89.cpp
diff --git a/engines/chewy/effect.cpp b/engines/chewy/effect.cpp
index 011965a28c2..1dc85a66d54 100644
--- a/engines/chewy/effect.cpp
+++ b/engines/chewy/effect.cpp
@@ -53,55 +53,54 @@ void Effect::rnd_blende(byte *rnd_speicher, byte *sram_speicher, byte *screen, b
else
x = rnd_zeiger[i] * 8;
_G(out)->setPointer(sram_speicher);
- _G(out)->sprite_save(sp, x, y, 8, 8, 0);
+ _G(out)->spriteSave(sp, x, y, 8, 8, 0);
_G(out)->setPointer(screen);
_G(out)->spriteSet(sp, x, y, 0);
}
free(sp);
}
-void Effect::blende1(byte *sram_speicher, byte *screen, byte *palette, int16 frames, uint8 mode, int16 col) {
+void Effect::blende1(byte *memPtr, byte *screen, byte *palette, int16 frames, uint8 mode, int16 color) {
byte *sp = (byte *)MALLOC(8 * 8 + 4);
- int16 i = 0;
- if (col < 256) {
- for (i = 0; i < 13; i++) {
+ if (color < 256) {
+ for (int16 i = 0; i < 13; i++) {
int16 x, y, x1;
for (x = i; x < 39 - i; x++)
- _G(out)->boxFill(x * 8, i * 8, x * 8 + 8, i * 8 + 8, col);
+ _G(out)->boxFill(x * 8, i * 8, x * 8 + 8, i * 8 + 8, color);
for (y = i; y < 24 - i; y++)
- _G(out)->boxFill(x * 8, y * 8, x * 8 + 8, y * 8 + 8, col);
+ _G(out)->boxFill(x * 8, y * 8, x * 8 + 8, y * 8 + 8, color);
for (x1 = 39 - i; x1 > i; x1--)
- _G(out)->boxFill(x1 * 8, y * 8, x1 * 8 + 8, y * 8 + 8, col);
+ _G(out)->boxFill(x1 * 8, y * 8, x1 * 8 + 8, y * 8 + 8, color);
for (int16 y1 = 24 - i; y1 >= i; y1--)
- _G(out)->boxFill(x1 * 8, y1 * 8, x1 * 8 + 8, y1 * 8 + 8, col);
+ _G(out)->boxFill(x1 * 8, y1 * 8, x1 * 8 + 8, y1 * 8 + 8, color);
}
_G(out)->setPalette(palette);
}
switch (mode) {
case 0:
- for (i = 13; i >= 0; i--) {
+ for (int16 i = 13; i >= 0; i--) {
int16 x, y, x1;
for (x = i; x < 39 - i; x++) {
- _G(out)->setPointer(sram_speicher);
- _G(out)->sprite_save(sp, x * 8, i * 8, 8, 8, 0);
+ _G(out)->setPointer(memPtr);
+ _G(out)->spriteSave(sp, x * 8, i * 8, 8, 8, 0);
_G(out)->setPointer(screen);
_G(out)->spriteSet(sp, x * 8, i * 8, 0);
}
for (y = i; y < 24 - i; y++) {
- _G(out)->setPointer(sram_speicher);
- _G(out)->sprite_save(sp, x * 8, y * 8, 8, 8, 0);
+ _G(out)->setPointer(memPtr);
+ _G(out)->spriteSave(sp, x * 8, y * 8, 8, 8, 0);
_G(out)->setPointer(screen);
_G(out)->spriteSet(sp, x * 8, y * 8, 0);
}
for (x1 = 39 - i; x1 > i; x1--) {
- _G(out)->setPointer(sram_speicher);
- _G(out)->sprite_save(sp, x1 * 8, y * 8, 8, 8, 0);
+ _G(out)->setPointer(memPtr);
+ _G(out)->spriteSave(sp, x1 * 8, y * 8, 8, 8, 0);
_G(out)->setPointer(screen);
_G(out)->spriteSet(sp, x1 * 8, y * 8, 0);
}
for (int16 y1 = 24 - i; y1 > i; y1--) {
- _G(out)->setPointer(sram_speicher);
- _G(out)->sprite_save(sp, x1 * 8, y1 * 8, 8, 8, 0);
+ _G(out)->setPointer(memPtr);
+ _G(out)->spriteSave(sp, x1 * 8, y1 * 8, 8, 8, 0);
_G(out)->setPointer(screen);
_G(out)->spriteSet(sp, x1 * 8, y1 * 8, 0);
}
@@ -109,29 +108,29 @@ void Effect::blende1(byte *sram_speicher, byte *screen, byte *palette, int16 fra
break;
case 1:
- for (i = 0; i < 13; i++) {
+ for (int16 i = 0; i < 13; i++) {
int16 x, y, x1;
for (x = i; x < 39 - i; x++) {
- _G(out)->setPointer(sram_speicher);
- _G(out)->sprite_save(sp, x * 8, i * 8, 8, 8, 0);
+ _G(out)->setPointer(memPtr);
+ _G(out)->spriteSave(sp, x * 8, i * 8, 8, 8, 0);
_G(out)->setPointer(screen);
_G(out)->spriteSet(sp, x * 8, i * 8, 0);
}
for (y = i; y < 24 - i; y++) {
- _G(out)->setPointer(sram_speicher);
- _G(out)->sprite_save(sp, x * 8, y * 8, 8, 8, 0);
+ _G(out)->setPointer(memPtr);
+ _G(out)->spriteSave(sp, x * 8, y * 8, 8, 8, 0);
_G(out)->setPointer(screen);
_G(out)->spriteSet(sp, x * 8, y * 8, 0);
}
for (x1 = 39 - i; x1 > i; x1--) {
- _G(out)->setPointer(sram_speicher);
- _G(out)->sprite_save(sp, x1 * 8, y * 8, 8, 8, 0);
+ _G(out)->setPointer(memPtr);
+ _G(out)->spriteSave(sp, x1 * 8, y * 8, 8, 8, 0);
_G(out)->setPointer(screen);
_G(out)->spriteSet(sp, x1 * 8, y * 8, 0);
}
for (int16 y1 = 24 - i; y1 > i; y1--) {
- _G(out)->setPointer(sram_speicher);
- _G(out)->sprite_save(sp, x1 * 8, y1 * 8, 8, 8, 0);
+ _G(out)->setPointer(memPtr);
+ _G(out)->spriteSave(sp, x1 * 8, y1 * 8, 8, 8, 0);
_G(out)->setPointer(screen);
_G(out)->spriteSet(sp, x1 * 8, y1 * 8, 0);
}
@@ -144,40 +143,22 @@ void Effect::blende1(byte *sram_speicher, byte *screen, byte *palette, int16 fra
free(sp);
}
-void Effect::border(byte *workpage_, int16 lines, uint8 mode, int16 farbe) {
+void Effect::border(byte *workpage_, int16 lines, uint8 mode, int16 color) {
if (mode) {
for (int i = 0, x = 0; i < 20; ++i, x += 8) {
_G(out)->setPointer(workpage_ + 4);
- _G(out)->boxFill(152 - x, 0, 152 - x + 8, 200, farbe);
- _G(out)->boxFill(x + 160, 0, x + 168, 200, farbe);
+ _G(out)->boxFill(152 - x, 0, 152 - x + 8, 200, color);
+ _G(out)->boxFill(x + 160, 0, x + 168, 200, color);
_G(out)->back2screen(workpage_);
}
} else {
for (int i = 0, x = 0; i < 20; ++i, x += 8) {
_G(out)->setPointer(workpage_ + 4);
- _G(out)->boxFill(x, 0, x + 8, 200, farbe);
- _G(out)->boxFill(312 - x, 0, 31 - x + 8, 200, farbe);
+ _G(out)->boxFill(x, 0, x + 8, 200, color);
+ _G(out)->boxFill(312 - x, 0, 31 - x + 8, 200, color);
_G(out)->back2screen(workpage_);
}
}
}
-void Effect::spr_blende(byte *wrkPage, int16 lines, bool mode, int16 col) {
- if (mode) {
- for (int i = 0, y = 0; i < 20; ++i, y += 8) {
- _G(out)->setPointer(wrkPage + 4);
- _G(out)->boxFill(0, 92 - y, 320, 92 - y + 8, col);
- _G(out)->boxFill(0, 100 + y, 320, 108 + y, col);
- _G(out)->back2screen(wrkPage);
- }
- } else {
- for (int i = 0; i < 20; ++i) {
- _G(out)->setPointer(wrkPage + 4);
- _G(out)->boxFill(0, i, 320, i + 8, col);
- _G(out)->boxFill(0, 192 - i, 320, 200 - i, col);
- _G(out)->back2screen(wrkPage);
- }
- }
-}
-
} // namespace Chewy
diff --git a/engines/chewy/effect.h b/engines/chewy/effect.h
index 96fd88b156d..61d1dda2bca 100644
--- a/engines/chewy/effect.h
+++ b/engines/chewy/effect.h
@@ -37,14 +37,13 @@ public:
Effect();
~Effect();
- void blende1(byte *sram_speicher, byte *screen,
- byte *palette, int16 frames, uint8 mode, int16 col);
- void border(byte *screen, int16 val1, uint8 mode, int16 farbe);
+ void blende1(byte *memPtr, byte *screen,
+ byte *palette, int16 frames, uint8 mode, int16 color);
+ void border(byte *screen, int16 val1, uint8 mode, int16 color);
void rnd_blende(byte *rnd_speicher, byte *sram_speicher,
byte *screen, byte *palette, int16 col, int16 skip_line);
- void spr_blende(byte *workpage, int16 lines, bool mode, int16 col);
};
} // namespace Chewy
diff --git a/engines/chewy/globals.h b/engines/chewy/globals.h
index b07d3c7bcb2..81f8e3143fb 100644
--- a/engines/chewy/globals.h
+++ b/engines/chewy/globals.h
@@ -271,14 +271,11 @@ public:
// mcga.cpp
byte _saved_palette[PALETTE_SIZE] = { 0 };
- bool _screenHasDefault = false;
- byte *_screenDefaultPtr = nullptr;
int _spriteWidth = 0;
// mcga_graphics.cpp
int16 _clipx1 = 0, _clipx2 = 0, _clipy1 = 0, _clipy2 = 0;
int16 _gcurx = 0, _gcury = 0;
- int16 _scr_w = 0, _scr_h = SCREEN_HEIGHT;
// menus.cpp
int8 _m_flip = 0;
diff --git a/engines/chewy/main.cpp b/engines/chewy/main.cpp
index e6f5d930d82..a59df7c5215 100644
--- a/engines/chewy/main.cpp
+++ b/engines/chewy/main.cpp
@@ -1147,25 +1147,25 @@ void check_shad(int16 palIdx, int16 mode) {
switch (palIdx) {
case 1:
if (mode)
- _G(out)->set_teilpalette(PAL_1, 1, 11);
+ _G(out)->set_partialpalette(PAL_1, 1, 11);
palcopy(_G(pal), PAL_1, 0, 0, 12);
break;
case 2:
if (mode)
- _G(out)->set_teilpalette(PAL_2, 1, 11);
+ _G(out)->set_partialpalette(PAL_2, 1, 11);
palcopy(_G(pal), PAL_2, 0, 0, 12);
break;
case 3:
if (mode)
- _G(out)->set_teilpalette(PAL_3, 1, 11);
+ _G(out)->set_partialpalette(PAL_3, 1, 11);
palcopy(_G(pal), PAL_3, 0, 0, 12);
break;
case 4:
if (mode)
- _G(out)->set_teilpalette(PAL_0, 1, 11);
+ _G(out)->set_partialpalette(PAL_0, 1, 11);
palcopy(_G(pal), PAL_0, 0, 0, 12);
break;
diff --git a/engines/chewy/mcga.cpp b/engines/chewy/mcga.cpp
index f314ba4746c..3fec834ad0d 100644
--- a/engines/chewy/mcga.cpp
+++ b/engines/chewy/mcga.cpp
@@ -35,8 +35,6 @@ namespace Chewy {
void init_mcga() {
_G(currentScreen) = (byte *)g_screen->getPixels();
- _G(screenHasDefault) = false;
- _G(screenDefaultPtr) = nullptr;
_G(spriteWidth) = 0;
}
@@ -78,8 +76,8 @@ void rastercol(int16 color, int16 r, int16 g, int16 b) {
setScummVMPalette(&rgb[0], color, 1);
}
-void set_palpart(const byte *palette, int16 startcol, int16 anz) {
- setScummVMPalette(palette + startcol * 3, startcol, anz);
+void setPartialPalette(const byte *palette, int16 startCol, int16 nr) {
+ setScummVMPalette(palette + startCol * 3, startCol, nr);
}
void clear_mcga() {
@@ -93,8 +91,8 @@ uint8 getpix(int16 x, int16 y) {
return *(byte *)SCREEN_S.getBasePtr(x, y);
}
-void line_mcga(int16 x1, int16 y1, int16 x2, int16 y2, int16 farbe) {
- return SCREEN_S.drawLine(x1, y1, x2, y2, farbe);
+void line_mcga(int16 x1, int16 y1, int16 x2, int16 y2, int16 color) {
+ return SCREEN_S.drawLine(x1, y1, x2, y2, color);
}
void mem2mcga(const byte *ptr) {
@@ -422,8 +420,8 @@ void zoom_set(byte *source, int16 x, int16 y, int16 xDiff, int16 yDiff, int16 sc
} // namespace Zoom
-void zoom_set(byte *source, int16 x, int16 y, int16 xdiff_, int16 ydiff_, int16 scrWidth) {
- Zoom::zoom_set(source, x, y, xdiff_, ydiff_, scrWidth);
+void zoom_set(byte *source, int16 x, int16 y, int16 xDiff, int16 yDiff, int16 scrWidth) {
+ Zoom::zoom_set(source, x, y, xDiff, yDiff, scrWidth);
}
} // namespace Chewy
diff --git a/engines/chewy/mcga.h b/engines/chewy/mcga.h
index a66b19f39dd..ac472412b7b 100644
--- a/engines/chewy/mcga.h
+++ b/engines/chewy/mcga.h
@@ -22,9 +22,6 @@
#ifndef CHEWY_MCGA_H
#define CHEWY_MCGA_H
-#include "chewy/mouse.h"
-#include "chewy/ngstypes.h"
-
namespace Chewy {
void init_mcga();
@@ -36,11 +33,11 @@ void set_palette(const byte *palette);
void save_palette(byte *palette);
void restore_palette();
void rastercol(int16 color, int16 r, int16 g, int16 b);
-void set_palpart(const byte *palette, int16 startcol, int16 anz);
+void setPartialPalette(const byte *palette, int16 startCol, int16 nr);
void clear_mcga();
uint8 getpix(int16 x, int16 y);
-void line_mcga(int16 x1, int16 y1, int16 x2, int16 y2, int16 farbe);
+void line_mcga(int16 x1, int16 y1, int16 x2, int16 y2, int16 color);
void mem2mcga(const byte *ptr);
diff --git a/engines/chewy/mcga_graphics.cpp b/engines/chewy/mcga_graphics.cpp
index b82971c6216..32c4a8ee5fe 100644
--- a/engines/chewy/mcga_graphics.cpp
+++ b/engines/chewy/mcga_graphics.cpp
@@ -36,8 +36,6 @@ McgaGraphics::~McgaGraphics() {
}
void McgaGraphics::init() {
- _G(scr_w) = SCREEN_WIDTH;
- _G(scr_h) = SCREEN_HEIGHT;
init_mcga();
}
@@ -51,8 +49,6 @@ void McgaGraphics::setClip(int16 x1, int16 y1, int16 x2, int16 y2) {
void McgaGraphics::setPointer(byte *ptr) {
if (ptr) {
_G(currentScreen) = ptr;
- } else if (_G(screenHasDefault)) {
- _G(currentScreen) = _G(screenDefaultPtr);
} else {
_G(currentScreen) = (byte *)g_screen->getPixels();
}
@@ -121,84 +117,78 @@ void McgaGraphics::ausblenden(int16 frames) {
}
}
-void McgaGraphics::set_teilpalette(const byte *palette, int16 startcol, int16 anz) {
- int16 k = startcol * 3;
- int16 endcol = startcol + anz;
- for (int16 i = startcol; i < endcol; i++) {
+void McgaGraphics::set_partialpalette(const byte *palette, int16 startCol, int16 nr) {
+ int16 k = startCol * 3;
+ int16 endcol = startCol + nr;
+ for (int16 i = startCol; i < endcol; i++) {
_palTable[k] = palette[k];
_palTable[k + 1] = palette[k + 1];
_palTable[k + 2] = palette[k + 2];
k += 3;
}
- set_palpart(_palTable, startcol, anz);
+ setPartialPalette(_palTable, startCol, nr);
}
void McgaGraphics::cls() {
clear_mcga();
}
-uint8 McgaGraphics::get_pixel(int16 xpos, int16 ypos) {
- uint8 pix = getpix(xpos, ypos);
-
- return pix;
-}
-
-void McgaGraphics::linie(int16 x1, int16 y1, int16 x2, int16 y2, int16 farbe) {
- line_mcga(x1, y1, x2, y2, farbe);
+void McgaGraphics::drawLine(int16 x1, int16 y1, int16 x2, int16 y2, int16 color) {
+ line_mcga(x1, y1, x2, y2, color);
}
-void McgaGraphics::box(int16 x1, int16 y1, int16 x2, int16 y2, int16 farbe) {
- line_mcga(x1, y1, x2, y1, farbe);
- line_mcga(x1, y2 - 1, x2, y2 - 1, farbe);
- line_mcga(x1, y1, x1, y2, farbe);
- line_mcga(x2, y1, x2, y2, farbe);
+void McgaGraphics::box(int16 x1, int16 y1, int16 x2, int16 y2, int16 color) {
+ line_mcga(x1, y1, x2, y1, color);
+ line_mcga(x1, y2 - 1, x2, y2 - 1, color);
+ line_mcga(x1, y1, x1, y2, color);
+ line_mcga(x2, y1, x2, y2, color);
}
-void McgaGraphics::boxFill(int16 x1, int16 y1, int16 x2, int16 y2, int16 farbe) {
+void McgaGraphics::boxFill(int16 x1, int16 y1, int16 x2, int16 y2, int16 color) {
if (x2 == x1)x2++;
int16 h = abs(y2 - y1);
if (h == 0)
h = 1;
for (int16 i = 0; i < h; i++)
- line_mcga(x1, y1 + i, x2, y1 + i, farbe);
+ line_mcga(x1, y1 + i, x2, y1 + i, color);
}
void McgaGraphics::pop_box(int16 x, int16 y, int16 x1, int16 y1, int16 col1, int16 col2, int16 back_col) {
if (back_col < 255)
boxFill(x, y, x1, y1, back_col);
- linie(x, y1, x1, y1, col2);
- linie(x1, y, x1, y1, col2);
- linie(x, y, x1, y, col1);
- linie(x, y, x, y1 + 1, col1);
+ drawLine(x, y1, x1, y1, col2);
+ drawLine(x1, y, x1, y1, col2);
+ drawLine(x, y, x1, y, col1);
+ drawLine(x, y, x, y1 + 1, col1);
}
void McgaGraphics::back2screen(byte *ptr) {
mem2mcga(ptr);
}
-void McgaGraphics::sprite_save(byte *sptr, int16 x, int16 y, int16 breite, int16 hoehe, int16 scrwidth) {
- if (breite < 4)
- breite = 4;
- if (hoehe <= 0)
- hoehe = 1;
+void McgaGraphics::spriteSave(byte *spritePtr, int16 x, int16 y, int16 width, int16 height, int16 screenWidth) {
+ if (width < 4)
+ width = 4;
+ if (height <= 0)
+ height = 1;
if (x < _G(clipx1)) {
x = _G(clipx1);
- breite -= (_G(clipx1) - x);
+ width -= (_G(clipx1) - x);
}
- if ((x + breite) > _G(clipx2) + 1)
- breite = _G(clipx2) - x;
+ if ((x + width) > _G(clipx2) + 1)
+ width = _G(clipx2) - x;
if (y < _G(clipy1)) {
y = _G(clipy1);
- hoehe -= (_G(clipy1) - y);
+ height -= (_G(clipy1) - y);
}
- if ((y + hoehe) > _G(clipy2) + 1)
- hoehe = _G(clipy2) - y;
- if (breite < 1)
- breite = 0;
- if (hoehe <= 0)
- hoehe = 0;
-
- spr_save_mcga(sptr, x, y, breite, hoehe, scrwidth);
+ if ((y + height) > _G(clipy2) + 1)
+ height = _G(clipy2) - y;
+ if (width < 1)
+ width = 0;
+ if (height <= 0)
+ height = 0;
+
+ spr_save_mcga(spritePtr, x, y, width, height, screenWidth);
}
void McgaGraphics::spriteSet(byte *sptr, int16 x, int16 y, int16 scrwidth) {
diff --git a/engines/chewy/mcga_graphics.h b/engines/chewy/mcga_graphics.h
index 8dc0d606a96..680124eddd0 100644
--- a/engines/chewy/mcga_graphics.h
+++ b/engines/chewy/mcga_graphics.h
@@ -42,20 +42,19 @@ public:
void raster_col(int16 c, int16 r, int16 g, int16 b);
void einblenden(byte *palette, int16 frames);
void ausblenden(int16 frames);
- void set_teilpalette(const byte *palette, int16 startcol, int16 anz);
+ void set_partialpalette(const byte *palette, int16 startCol, int16 nr);
void cls();
- uint8 get_pixel(int16 xpos, int16 ypos);
- void linie(int16 x1, int16 y1, int16 x2, int16 y2, int16 farbe);
- void box(int16 x1, int16 y1, int16 x2, int16 y2, int16 farbe);
- void boxFill(int16 x1, int16 y1, int16 x2, int16 y2, int16 farbe);
+ void drawLine(int16 x1, int16 y1, int16 x2, int16 y2, int16 color);
+ void box(int16 x1, int16 y1, int16 x2, int16 y2, int16 color);
+ void boxFill(int16 x1, int16 y1, int16 x2, int16 y2, int16 color);
void pop_box(int16 x, int16 y, int16 x1, int16 y1,
int16 col1, int16 col2, int16 back_col);
void back2screen(byte *ptr);
- void sprite_save(byte *sptr, int16 x, int16 y, int16 breite,
- int16 hoehe, int16 scrwidth);
+ void spriteSave(byte *spritePtr, int16 x, int16 y, int16 width,
+ int16 height, int16 screenWidth);
void spriteSet(byte *sptr, int16 x, int16 y, int16 scrwidth);
void scale_set(byte *sptr, int16 x, int16 y, int16 xdiff,
int16 ydiff, int16 scrwidth);
diff --git a/engines/chewy/rooms/room28.cpp b/engines/chewy/rooms/room28.cpp
index a2cf613425e..2ee6d1e9925 100644
--- a/engines/chewy/rooms/room28.cpp
+++ b/engines/chewy/rooms/room28.cpp
@@ -81,7 +81,7 @@ void Room28::entry(int16 eib_nr) {
if (!_G(spieler).R40TeilKarte) {
_G(out)->ausblenden(0);
- _G(out)->set_teilpalette(_G(pal), 255, 1);
+ _G(out)->set_partialpalette(_G(pal), 255, 1);
startAadWait(607);
_G(fx_blend) = BLEND3;
}
diff --git a/engines/chewy/rooms/room40.cpp b/engines/chewy/rooms/room40.cpp
index dfa0c4f09fd..f47672e77a3 100644
--- a/engines/chewy/rooms/room40.cpp
+++ b/engines/chewy/rooms/room40.cpp
@@ -475,7 +475,7 @@ int16 Room40::use_haendler() {
_G(det)->set_static_ani(3, -1);
startAadWait(211);
_G(out)->ausblenden(0);
- _G(out)->set_teilpalette(_G(pal), 255, 1);
+ _G(out)->set_partialpalette(_G(pal), 255, 1);
startAadWait(212);
_G(out)->ausblenden(0);
_G(spieler).R40Wettbewerb = true;
diff --git a/engines/chewy/rooms/room76.cpp b/engines/chewy/rooms/room76.cpp
index c8800d06f69..fe19256ebd5 100644
--- a/engines/chewy/rooms/room76.cpp
+++ b/engines/chewy/rooms/room76.cpp
@@ -192,7 +192,7 @@ int Room76::proc7() {
invent_2_slot(105);
startAadWait(444);
_G(out)->ausblenden(0);
- _G(out)->set_teilpalette(_G(pal), 255, 1);
+ _G(out)->set_partialpalette(_G(pal), 255, 1);
startAadWait(443);
_G(spieler).scrollx = 0;
_G(fx_blend) = BLEND3;
diff --git a/engines/chewy/rooms/room82.cpp b/engines/chewy/rooms/room82.cpp
index 80c7c450db7..1ac4a0f7f4a 100644
--- a/engines/chewy/rooms/room82.cpp
+++ b/engines/chewy/rooms/room82.cpp
@@ -197,7 +197,7 @@ int Room82::proc6() {
if (_G(spieler).flags30_10) {
startAadWait(450);
_G(out)->ausblenden(0);
- _G(out)->set_teilpalette(_G(pal), 255, 1);
+ _G(out)->set_partialpalette(_G(pal), 255, 1);
_G(atds)->enableEvents(false);
startAadWait(598);
_G(atds)->enableEvents(true);
diff --git a/engines/chewy/rooms/room89.cpp b/engines/chewy/rooms/room89.cpp
index d2424671ebc..80d015b9282 100644
--- a/engines/chewy/rooms/room89.cpp
+++ b/engines/chewy/rooms/room89.cpp
@@ -94,7 +94,7 @@ void Room89::entry() {
// Squash screen into a single point at the center
int edi = -20;
int var24 = 0;
- _G(out)->sprite_save(_G(Ci).TempArea, 0, 0, 320, 200, 320);
+ _G(out)->spriteSave(_G(Ci).TempArea, 0, 0, 320, 200, 320);
for (int esi = 0; esi < 100; ++esi) {
edi -= 3;
var24 -= 2;
@@ -113,7 +113,7 @@ void Room89::entry() {
// Those strings are also displayed in the the German version
_G(out)->printxy(70, 80, 15, 0, 0, "Thank you for playing");
_G(out)->printxy(70, 100, 15, 0, 0, " CHEWY Esc from F5");
- _G(out)->sprite_save(_G(Ci).TempArea, 0, 0, 320, 200, 320);
+ _G(out)->spriteSave(_G(Ci).TempArea, 0, 0, 320, 200, 320);
edi = -300;
int var30 = -200;
More information about the Scummvm-git-logs
mailing list