aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2009-03-24 08:33:24 +0000
committerFilippos Karapetis2009-03-24 08:33:24 +0000
commit95d92b0d244275c768f7b98c2500f7aafaa4e7fd (patch)
treecdea3f1d5de41f858283159055e3ced25621bfd3
parent76c0d0820059d5e9e4addeb40de35adbd99e061a (diff)
downloadscummvm-rg350-95d92b0d244275c768f7b98c2500f7aafaa4e7fd.tar.gz
scummvm-rg350-95d92b0d244275c768f7b98c2500f7aafaa4e7fd.tar.bz2
scummvm-rg350-95d92b0d244275c768f7b98c2500f7aafaa4e7fd.zip
Make sure that the currently buggy dirty rectangle handling code is not used. Also, make sure that the resource data pointer is initialized to zero
svn-id: r39655
-rw-r--r--engines/saga/render.cpp10
-rw-r--r--engines/saga/sprite.cpp4
2 files changed, 6 insertions, 8 deletions
diff --git a/engines/saga/render.cpp b/engines/saga/render.cpp
index d02d772054..85c2573794 100644
--- a/engines/saga/render.cpp
+++ b/engines/saga/render.cpp
@@ -49,7 +49,7 @@ Render::Render(SagaEngine *vm, OSystem *system) {
_vm = vm;
_system = system;
_initialized = false;
- _fullRefresh = false;
+ _fullRefresh = true;
#ifdef SAGA_DEBUG
// Initialize FPS timer callback
@@ -83,10 +83,6 @@ void Render::drawScene() {
int curMode = _vm->_interface->getMode();
assert(_initialized);
- // TODO: Remove this to use dirty rectangles
- // Still quite buggy
- _fullRefresh = true;
-
#ifdef SAGA_DEBUG
_renderedFrameCount++;
#endif
@@ -206,7 +202,9 @@ void Render::drawScene() {
_system->updateScreen();
- _fullRefresh = false;
+ // TODO: Change this to false to use dirty rectangles
+ // Still quite buggy
+ _fullRefresh = true;
}
void Render::addDirtyRect(Common::Rect rect) {
diff --git a/engines/saga/sprite.cpp b/engines/saga/sprite.cpp
index 8b3d62bf49..6a5bc03206 100644
--- a/engines/saga/sprite.cpp
+++ b/engines/saga/sprite.cpp
@@ -89,8 +89,8 @@ Sprite::~Sprite(void) {
void Sprite::loadList(int resourceId, SpriteList &spriteList) {
SpriteInfo *spriteInfo;
- byte *spriteListData;
- size_t spriteListLength;
+ byte *spriteListData = 0;
+ size_t spriteListLength = 0;
uint16 oldSpriteCount;
uint16 newSpriteCount;
uint16 spriteCount;