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

Merge pull request #995 from klusark/smushprim

Browse Source 
GRIM/EMI: Simplify primitive drawing, and don't draw primitives over movies.
This commit is contained in:
Joel Teichroeb 2014-08-06 09:55:18 -07:00
commit dc57920d53
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/grim/grim.cpp
View File

@ -440,19 +440,6 @@ void GrimEngine::drawTextObjects() {
}
}
void GrimEngine::drawPrimitives() {
_iris->draw();
// Draw text
if (_mode == SmushMode) {
if (_movieSubtitle) {
_movieSubtitle->draw();
}
} else {
drawTextObjects();
}
}
void GrimEngine::playIrisAnimation(Iris::Direction dir, int x, int y, int time) {
_iris->play(dir, x, y, time);
}
@ -527,10 +514,10 @@ void GrimEngine::updateDisplayScene() {
g_driver->releaseMovieFrame();
}
// Draw Primitives
foreach (PrimitiveObject *p, PrimitiveObject::getPool()) {
p->draw();
_iris->draw();
if (_movieSubtitle) {
_movieSubtitle->draw();
}
drawPrimitives();
} else if (_mode == NormalMode || _mode == OverworldMode) {
updateNormalMode();
} else if (_mode == DrawMode) {
@ -547,7 +534,9 @@ void GrimEngine::updateNormalMode() {
drawNormalMode();
g_driver->drawBuffers();
drawPrimitives();
_iris->draw();
drawTextObjects();
}
void GrimEngine::updateDrawMode() {

1
engines/grim/grim.h
View File

@ -116,7 +116,6 @@ public:
void setFlipEnable(bool state) { _flipEnable = state; }
bool getFlipEnable() { return _flipEnable; }
virtual void drawTextObjects();
void drawPrimitives();
void playIrisAnimation(Iris::Direction dir, int x, int y, int time);
void mainLoop();