thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PRIVATE: removed screen locking

Browse source
This commit is contained in:
neuromancer 2021-02-20 14:36:53 -03:00 • committed by Eugene Sandulenko
parent 817fc1ba0c
commit 750eeeb85f
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engines/private/private.cpp
View file

@ -929,8 +929,9 @@ void PrivateEngine::loadImage(const Common::String &name, int x, int y) {
//drawScreen(); //drawScreen();
} }
void PrivateEngine::drawScreenFrame(Graphics::Surface *surf) { void PrivateEngine::drawScreenFrame() {
surf->copyRectToSurface(*_frame, 0, 0, Common::Rect(0, 0, _screenW, _screenH)); g_system->copyRectToScreen(_frame->getPixels(), _frame->pitch, 0, 0, _screenW, _screenH);
//surf->copyRectToSurface(*_frame, 0, 0, Common::Rect(0, 0, _screenW, _screenH));
} }
@ -979,13 +980,13 @@ void PrivateEngine::drawScreen() {
delete cframe; delete cframe;
} }
Graphics::Surface *screen = g_system->lockScreen();
if (_mode == 1) { if (_mode == 1) {
drawScreenFrame(screen); drawScreenFrame();
} }
Common::Rect window(_origin->x, _origin->y, _screenW - _origin->x, _screenH - _origin->y);
screen->copyRectToSurface(*surface, _origin->x, _origin->y, window); Common::Rect w(_origin->x, _origin->y, _screenW - _origin->x, _screenH - _origin->y);
g_system->unlockScreen(); Graphics::Surface sa = surface->getSubArea(w);
g_system->copyRectToScreen(sa.getPixels(), sa.pitch, _origin->x, _origin->y, sa.w, sa.h);
//if (_image->getPalette() != nullptr) //if (_image->getPalette() != nullptr)
// g_system->getPaletteManager()->setPalette(_image->getPalette(), _image->getPaletteStartIndex(), _image->getPaletteColorCount()); // g_system->getPaletteManager()->setPalette(_image->getPalette(), _image->getPaletteStartIndex(), _image->getPaletteColorCount());
g_system->updateScreen(); g_system->updateScreen();

2
engines/private/private.h
View file

@ -192,7 +192,7 @@ public:
void skipVideo(); void skipVideo();
void loadImage(const Common::String &file, int x, int y); void loadImage(const Common::String &file, int x, int y);
void drawScreenFrame(Graphics::Surface *); void drawScreenFrame();
void changeCursor(Common::String); void changeCursor(Common::String);
void initCursors(); void initCursors();