aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/gfx
diff options
context:
space:
mode:
authorFilippos Karapetis2011-01-30 20:34:47 +0000
committerFilippos Karapetis2011-01-30 20:34:47 +0000
commit2e42c2d11d27ae51431a7c287fab061fca38e23c (patch)
tree67e3b4ae9d7313e0a26a2ba2fe3cfb645807c933 /engines/sword25/gfx
parent5257d91e99775c583f998a2508011ebd4a372fec (diff)
downloadscummvm-rg350-2e42c2d11d27ae51431a7c287fab061fca38e23c.tar.gz
scummvm-rg350-2e42c2d11d27ae51431a7c287fab061fca38e23c.tar.bz2
scummvm-rg350-2e42c2d11d27ae51431a7c287fab061fca38e23c.zip
SWORD25: Some translations, and a bugfix. Disabled a hack.
Translated some comments, and pushed the indirect rendering define to the header file, so that the engine won't try and update the screen with direct movie rendering. Also, the thumbnail hack has been disabled, as it doesn't really work (at least not for me: all the thumbnails are gray) svn-id: r55663
Diffstat (limited to 'engines/sword25/gfx')
-rw-r--r--engines/sword25/gfx/graphicengine.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/engines/sword25/gfx/graphicengine.cpp b/engines/sword25/gfx/graphicengine.cpp
index cf97534d6c..5fefcec420 100644
--- a/engines/sword25/gfx/graphicengine.cpp
+++ b/engines/sword25/gfx/graphicengine.cpp
@@ -51,6 +51,8 @@
#include "sword25/gfx/graphicengine.h"
+#include "sword25/fmv/movieplayer.h"
+
#include "sword25/util/lua/lua.h"
#include "sword25/util/lua/lauxlib.h"
enum {
@@ -140,10 +142,16 @@ bool GraphicEngine::startFrame(bool updateAll) {
}
bool GraphicEngine::endFrame() {
- // Scene zeichnen
+#ifndef THEORA_INDIRECT_RENDERING
+ if (Kernel::getInstance()->getFMV()->isMovieLoaded())
+ return true;
+#endif
+
_renderObjectManagerPtr->render();
- // FIXME: The frame buffer surface is only used as the base for creating thumbnails when saving the
+ // FIXME: The following hack doesn't really work (all the thumbnails are empty)
+#if 0
+ // HACK: The frame buffer surface is only used as the base for creating thumbnails when saving the
// game, since the _backSurface is blanked. Currently I'm doing a slightly hacky check and only
// copying the back surface if line 50 (the first line after the interface area) is non-blank
if (READ_LE_UINT32((byte *)_backSurface.pixels + (_backSurface.pitch * 50)) & 0xffffff) {
@@ -151,6 +159,7 @@ bool GraphicEngine::endFrame() {
Common::copy((byte *)_backSurface.pixels, (byte *)_backSurface.pixels +
(_backSurface.pitch * _backSurface.h), (byte *)_frameBuffer.pixels);
}
+#endif
g_system->updateScreen();