thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed more test code and performed some cleanup

Browse source 
svn-id: r35241
This commit is contained in:
Filippos Karapetis 2008-12-04 19:12:58 +00:00
parent b085afc451
commit 12f4c3b9b9
2 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
engines/saga/render.cpp
View file

@ -50,8 +50,10 @@ Render::Render(SagaEngine *vm, OSystem *system) {
_system = system; _system = system;
_initialized = false; _initialized = false;
#ifdef SAGA_DEBUG
// Initialize FPS timer callback // Initialize FPS timer callback
_vm->_timer->installTimerProc(&fpsTimerCallback, 1000000, this); _vm->_timer->installTimerProc(&fpsTimerCallback, 1000000, this);
#endif
_backGroundSurface.create(_vm->getDisplayWidth(), _vm->getDisplayHeight(), 1); _backGroundSurface.create(_vm->getDisplayWidth(), _vm->getDisplayHeight(), 1);
@ -61,7 +63,10 @@ Render::Render(SagaEngine *vm, OSystem *system) {
} }
Render::~Render(void) { Render::~Render(void) {
#ifdef SAGA_DEBUG
_vm->_timer->removeTimerProc(&fpsTimerCallback); _vm->_timer->removeTimerProc(&fpsTimerCallback);
#endif
_backGroundSurface.free(); _backGroundSurface.free();
_initialized = false; _initialized = false;
@ -75,17 +80,19 @@ void Render::drawScene() {
Surface *backBufferSurface; Surface *backBufferSurface;
Point mousePoint; Point mousePoint;
Point textPoint; Point textPoint;
int curMode = _vm->_interface->getMode();
assert(_initialized); assert(_initialized);
#ifdef SAGA_DEBUG
_renderedFrameCount++; _renderedFrameCount++;
#endif
backBufferSurface = _vm->_gfx->getBackBuffer(); backBufferSurface = _vm->_gfx->getBackBuffer();
// Get mouse coordinates // Get mouse coordinates
mousePoint = _vm->mousePos(); mousePoint = _vm->mousePos();
if (!(_flags & (RF_DEMO_SUBST | RF_MAP) || _vm->_interface->getMode() == kPanelPlacard)) { if (!(_flags & (RF_DEMO_SUBST | RF_MAP) || curMode == kPanelPlacard)) {
if (_vm->_interface->getFadeMode() != kFadeOut) { if (_vm->_interface->getFadeMode() != kFadeOut) {
// Display scene background // Display scene background
if (!(_flags & RF_DISABLE_ACTORS) || _vm->getGameType() == GType_ITE) if (!(_flags & RF_DISABLE_ACTORS) || _vm->getGameType() == GType_ITE)
@ -121,24 +128,24 @@ void Render::drawScene() {
if (_flags & RF_MAP) if (_flags & RF_MAP)
_vm->_interface->mapPanelDrawCrossHair(); _vm->_interface->mapPanelDrawCrossHair();
if ((_vm->_interface->getMode() == kPanelOption) || if ((curMode == kPanelOption) ||
(_vm->_interface->getMode() == kPanelQuit) || (curMode == kPanelQuit) ||
(_vm->_interface->getMode() == kPanelLoad) || (curMode == kPanelLoad) ||
(_vm->_interface->getMode() == kPanelSave)) { (curMode == kPanelSave)) {
_vm->_interface->drawOption(); _vm->_interface->drawOption();
if (_vm->_interface->getMode() == kPanelQuit) { if (curMode == kPanelQuit) {
_vm->_interface->drawQuit(); _vm->_interface->drawQuit();
} }
if (_vm->_interface->getMode() == kPanelLoad) { if (curMode == kPanelLoad) {
_vm->_interface->drawLoad(); _vm->_interface->drawLoad();
} }
if (_vm->_interface->getMode() == kPanelSave) { if (curMode == kPanelSave) {
_vm->_interface->drawSave(); _vm->_interface->drawSave();
} }
} }
if (_vm->_interface->getMode() == kPanelProtect) { if (curMode == kPanelProtect) {
_vm->_interface->drawProtect(); _vm->_interface->drawProtect();
} }
@ -198,6 +205,7 @@ void Render::drawScene() {
_system->updateScreen(); _system->updateScreen();
} }
#ifdef SAGA_DEBUG
void Render::fpsTimerCallback(void *refCon) { void Render::fpsTimerCallback(void *refCon) {
((Render *)refCon)->fpsTimer(); ((Render *)refCon)->fpsTimer();
} }
@ -206,5 +214,6 @@ void Render::fpsTimer(void) {
_fps = _renderedFrameCount; _fps = _renderedFrameCount;
_renderedFrameCount = 0; _renderedFrameCount = 0;
} }
#endif
} // End of namespace Saga } // End of namespace Saga

6
engines/saga/render.h
View file

@ -77,8 +77,12 @@ public:
} }
private: private:
#ifdef SAGA_DEBUG
static void fpsTimerCallback(void *refCon); static void fpsTimerCallback(void *refCon);
void fpsTimer(void); void fpsTimer(void);
unsigned int _fps;
unsigned int _renderedFrameCount;
#endif
SagaEngine *_vm; SagaEngine *_vm;
OSystem *_system; OSystem *_system;
@ -87,8 +91,6 @@ private:
// Module data // Module data
Surface _backGroundSurface; Surface _backGroundSurface;
unsigned int _fps;
unsigned int _renderedFrameCount;
uint32 _flags; uint32 _flags;
}; };