ALL: synced with ScummVM

This commit is contained in:
Pawel Kolodziejski 2013-07-07 15:29:33 +02:00
parent 1f3ad19a38
commit 068ff94d20
228 changed files with 11689 additions and 4232 deletions

View file

@ -26,11 +26,11 @@
#include "backends/graphics/graphics.h"
#include "backends/mutex/mutex.h"
#include "gui/EventRecorder.h"
#include "audio/mixer.h"
#include "graphics/pixelformat.h"
// ResidualVM specific:
#include "graphics/pixelbuffer.h"
#include "graphics/pixelbuffer.h" // ResidualVM specific:
ModularBackend::ModularBackend()
:
@ -54,7 +54,7 @@ bool ModularBackend::hasFeature(Feature f) {
}
void ModularBackend::setFeatureState(Feature f, bool enable) {
return _graphicsManager->setFeatureState(f, enable);
_graphicsManager->setFeatureState(f, enable);
}
bool ModularBackend::getFeatureState(Feature f) {
@ -153,7 +153,9 @@ void ModularBackend::fillScreen(uint32 col) {
}
void ModularBackend::updateScreen() {
g_eventRec.preDrawOverlayGui();
_graphicsManager->updateScreen();
g_eventRec.postDrawOverlayGui();
}
void ModularBackend::setShakePos(int shakeOffset) {