libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CHEWY: Remove more screen related dead code

Browse Source 
The custom clip rect and the screen fading frame code aren't used
This commit is contained in:
Filippos Karapetis 2022-05-22 17:47:29 +03:00
parent ef181e8fed
commit b612498015
7 changed files with 34 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/chewy/dialogs/inventory.cpp
View File

@ -359,7 +359,6 @@ void Inventory::menu() {
} else if (menu_flag1 == MENU_HIDE)
_G(fx)->blende1(_G(workptr), _G(screen0), nullptr, 200, 1, 300);
menu_flag1 = false;
_G(out)->setClip(0, 0, 320, 200);
_G(out)->copyToScreen();
} else {
showCur();

1
engines/chewy/globals.h
View File

@ -247,7 +247,6 @@ public:
int _spriteWidth = 0;
// mcga_graphics.cpp
int16 _clipx1 = 0, _clipx2 = 0, _clipy1 = 0, _clipy2 = 0;
int16 _gcurx = 0, _gcury = 0;
// menus.cpp

5
engines/chewy/inits.cpp
View File

@ -48,7 +48,6 @@ void standard_init() {
_G(out)->init();
_G(out)->cls();
_G(out)->setClip(0, 0, 320, 200);
_G(scr_width) = 0;
_G(screen0) = (byte *)g_screen->getPixels();
@ -65,7 +64,7 @@ void standard_init() {
_G(pal)[765] = 63;
_G(pal)[766] = 63;
_G(pal)[767] = 63;
_G(out)->fadeIn(_G(pal), 0);
_G(out)->fadeIn(_G(pal));
_G(room)->set_timer_start(1);
_G(out)->cls();
@ -77,7 +76,7 @@ void standard_init() {
_G(pal)[765] = 63;
_G(pal)[766] = 63;
_G(pal)[767] = 63;
_G(out)->fadeIn(_G(pal), 0);
_G(out)->fadeIn(_G(pal));
_G(out)->cls();
_G(uhr)->setNewTimer(0, 5, SEC_10_MODE);

65
engines/chewy/mcga_graphics.cpp
View File

@ -53,13 +53,6 @@ void setScummVMPalette(const byte *palette, uint start, uint count) {
g_system->getPaletteManager()->setPalette(tempPal, start, count);
}
void McgaGraphics::setClip(int16 x1, int16 y1, int16 x2, int16 y2) {
_G(clipx1) = x1;
_G(clipx2) = x2;
_G(clipy1) = y1;
_G(clipy2) = y2;
}
void McgaGraphics::setPointer(byte *ptr) {
if (ptr) {
_G(currentScreen) = ptr;
@ -81,7 +74,7 @@ void McgaGraphics::raster_col(int16 c, int16 r, int16 g, int16 b) {
setScummVMPalette(&_palTable[c * 3], c, 1);
}
void McgaGraphics::fadeIn(byte *palette, int16 frames) {
void McgaGraphics::fadeIn(byte *palette) {
for (int16 j = 63; j >= 0; j--) {
int16 k = 0;
for (int16 i = 0; i < 256; i++) {
@ -177,18 +170,18 @@ void McgaGraphics::spriteSave(byte *spritePtr, int16 x, int16 y, int16 width, in
width = 4;
if (height <= 0)
height = 1;
if (x < _G(clipx1)) {
x = _G(clipx1);
width -= (_G(clipx1) - x);
if (x < 0) {
x = 0;
width -= (0 - x);
}
if ((x + width) > _G(clipx2) + 1)
width = _G(clipx2) - x;
if (y < _G(clipy1)) {
y = _G(clipy1);
height -= (_G(clipy1) - y);
if ((x + width) > 320 + 1)
width = 320 - x;
if (y < 0) {
y = 0;
height -= (0 - y);
}
if ((y + height) > _G(clipy2) + 1)
height = _G(clipy2) - y;
if ((y + height) > 200 + 1)
height = 200 - y;
if (width < 1)
width = 0;
if (height <= 0)
@ -212,35 +205,35 @@ void McgaGraphics::spriteSave(byte *spritePtr, int16 x, int16 y, int16 width, in
}
static bool mspr_set_mcga_clip(int x, int y, int pitch, int &width, int &height, const byte *&srcP, byte *&destP) {
if (y < _G(clipy1)) {
int yDiff = ABS(_G(clipy1) - y);
if (y < 0) {
int yDiff = ABS(0 - y);
height -= yDiff;
srcP += yDiff * width;
y = _G(clipy1);
y = 0;
}
if (height < 1)
return false;
if (x < _G(clipx1)) {
int xDiff = ABS(_G(clipx1) - x);
if (x < 0) {
int xDiff = ABS(0 - x);
width -= xDiff;
srcP += xDiff;
x = _G(clipx1);
x = 0;
}
if (width < 1)
return false;
int x2 = x + width;
if (x2 > _G(clipx2)) {
int xDiff = x2 - _G(clipx2);
if (x2 > 320) {
int xDiff = x2 - 320;
width -= xDiff;
}
if (width <= 1)
return false;
int y2 = y + height;
if (y2 > _G(clipy2)) {
int yDiff = y2 - _G(clipy2);
if (y2 > 200) {
int yDiff = y2 - 200;
height -= yDiff;
}
if (height < 1)
@ -818,8 +811,8 @@ void McgaGraphics::setYVals(int spriteHeight) {
}
void McgaGraphics::clip(byte *&source, byte *&dest, int16 &x, int16 &y) {
if (y < _G(clipy1)) {
int yCount = _G(clipy1) - y;
if (y < 0) {
int yCount = 0 - y;
_zoomSpriteDeltaY2 -= yCount;
--yCount;
@ -841,8 +834,8 @@ void McgaGraphics::clip(byte *&source, byte *&dest, int16 &x, int16 &y) {
return;
}
if (x < _G(clipx1)) {
int xCount = _G(clipx1) - x;
if (x < 0) {
int xCount = 0 - x;
_zoomSpriteDeltaX2 -= xCount;
dest += xCount;
@ -860,14 +853,14 @@ void McgaGraphics::clip(byte *&source, byte *&dest, int16 &x, int16 &y) {
if (_zoomSpriteDeltaX2 > 0) {
int x2 = x + _zoomSpriteDeltaX2;
if (x2 >= _G(clipx2)) {
_zoomSpriteDeltaX2 -= x2 - _G(clipx2);
if (x2 >= 320) {
_zoomSpriteDeltaX2 -= x2 - 320;
}
if (_zoomSpriteDeltaY2 > 0) {
int y2 = y + _zoomSpriteDeltaY2;
if (y2 >= _G(clipy2)) {
_zoomSpriteDeltaY2 -= y2 - _G(clipy2);
if (y2 >= 200) {
_zoomSpriteDeltaY2 -= y2 - 200;
}
if (_zoomSpriteDeltaY2 <= 0)
source = nullptr;

3
engines/chewy/mcga_graphics.h
View File

@ -33,12 +33,11 @@ public:
void init();
void setClip(int16 x1, int16 y1, int16 x2, int16 y2);
void setPointer(byte *ptr);
void setPalette(byte *palette);
void raster_col(int16 c, int16 r, int16 g, int16 b);
void fadeIn(byte *palette, int16 frames);
void fadeIn(byte *palette);
void fadeOut();
void set_partialpalette(const byte *palette, int16 startCol, int16 nr);

2
engines/chewy/rooms/room40.cpp
View File

@ -118,7 +118,7 @@ void Room40::xit(int16 eib_nr) {
_G(out)->fadeOut();
hide_person();
setupScreen(DO_SETUP);
_G(out)->fadeIn(_G(pal), 0);
_G(out)->fadeIn(_G(pal));
_G(uhr)->enableTimer();
_G(mouseLeftClick) = false;

2
engines/chewy/rooms/room51.cpp
View File

@ -258,7 +258,7 @@ int16 Room51::use_door(int16 txt_nr) {
_G(out)->fadeOut();
_G(out)->setPointer(nullptr);
_G(out)->cls();
_G(out)->fadeIn(_G(pal), 0);
_G(out)->fadeIn(_G(pal));
_G(flags).NoPalAfterFlc = true;
_G(det)->showStaticSpr(16);
flic_cut(FCUT_068);