libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-12 06:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DREAMWEB: Merge DreamWebEngine::setPalette into DreamGenContext::showGroup

Browse Source
This commit is contained in:
Max Horn 2011-12-07 11:14:13 +01:00
parent 641e1bff59
commit ce8b1e06c7
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engines/dreamweb/dreamweb.cpp
View File

@ -345,15 +345,6 @@ void DreamWebEngine::fadeDos() {
}
}
void DreamWebEngine::setPalette() {
processEvents();
unsigned n = (uint16)_context.cx;
uint8 *src = _context.ds.ptr(_context.si, n * 3);
setPalette(src, _context.al, n);
_context.si += n * 3;
_context.cx = 0;
}
void DreamWebEngine::getPalette(uint8 *data, uint start, uint count) {
_system->getPaletteManager()->grabPalette(data, start, count);
while(count--)

1
engines/dreamweb/dreamweb.h
View File

@ -101,7 +101,6 @@ public:
void mouseCall(uint16 *x, uint16 *y, uint16 *state); //fill mouse pos and button state
void processEvents();
void setPalette();
void fadeDos();
void blit(const uint8 *src, int pitch, int x, int y, int w, int h);
void cls();

7
engines/dreamweb/stubs.cpp
View File

@ -1109,7 +1109,12 @@ void DreamGenContext::set16ColPalette() {
}
void DreamGenContext::showGroup() {
engine->setPalette();
engine->processEvents();
unsigned n = (uint16)cx;
uint8 *src = ds.ptr(si, n * 3);
engine->setPalette(src, al, n);
si += n * 3;
cx = 0;
}
void DreamGenContext::fadeDOS() {