[Scummvm-cvs-logs] CVS: residual engine.cpp,1.32,1.33
Pawel Kolodziejski
aquadran at users.sourceforge.net
Tue Apr 20 10:50:08 CEST 2004
Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16341
Modified Files:
engine.cpp
Log Message:
moved into non fullscreen mode smush
Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/engine.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- engine.cpp 19 Apr 2004 11:56:46 -0000 1.32
+++ engine.cpp 20 Apr 2004 17:49:12 -0000 1.33
@@ -27,6 +27,7 @@
#include <assert.h>
#include "screen.h"
#include "smush.h"
+
#include "driver_gl.h"
Engine *Engine::instance_ = NULL;
@@ -101,7 +102,6 @@
g_driver->drawEmergString(550, 25, fps, Color(255, 255, 255));
}
}
- g_driver->flipBuffer();
} else if (_mode == ENGINE_MODE_NORMAL) {
if (SCREENBLOCKS_GLOBAL)
screenBlocksReset();
@@ -141,14 +141,12 @@
currScene_->setupCamera();
// Draw actors
- if (!g_smush->isPlaying()) {
- for (actor_list_type::iterator i = actors_.begin(); i != actors_.end(); i++) {
- Actor *a = *i;
- if (a->inSet(currScene_->name()) && a->visible())
- a->draw();
- }
- //screenBlocksDrawDebug();
+ for (actor_list_type::iterator i = actors_.begin(); i != actors_.end(); i++) {
+ Actor *a = *i;
+ if (a->inSet(currScene_->name()) && a->visible())
+ a->draw();
}
+ //screenBlocksDrawDebug();
// Draw text
for (text_list_type::iterator i = textObjects_.begin(); i != textObjects_.end(); i++) {
@@ -159,10 +157,10 @@
g_driver->drawEmergString(550, 25, fps, Color(255, 255, 255));
currScene_->drawBitmaps(ObjectState::OBJSTATE_OVERLAY);
-
- g_driver->flipBuffer();
}
+ g_driver->flipBuffer();
+
// don't kill CPU
SDL_Delay(1);
More information about the Scummvm-git-logs
mailing list