[Scummvm-cvs-logs] SF.net SVN: scummvm:[35645] scummvm/trunk/engines/saga
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Dec 31 23:11:21 CET 2008
Revision: 35645
http://scummvm.svn.sourceforge.net/scummvm/?rev=35645&view=rev
Author: thebluegr
Date: 2008-12-31 22:11:20 +0000 (Wed, 31 Dec 2008)
Log Message:
-----------
Proper fix for non-interactive ITE demos (the previous one was affecting sprites for other games)
Modified Paths:
--------------
scummvm/trunk/engines/saga/interface.cpp
scummvm/trunk/engines/saga/sprite.h
Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp 2008-12-31 22:10:09 UTC (rev 35644)
+++ scummvm/trunk/engines/saga/interface.cpp 2008-12-31 22:11:20 UTC (rev 35645)
@@ -215,14 +215,16 @@
// Main panel sprites
_vm->_sprite->loadList(_vm->getResourceDescription()->mainPanelSpritesResourceId, _mainPanel.sprites);
- // Option panel sprites
- _vm->_sprite->loadList(_vm->getResourceDescription()->optionPanelSpritesResourceId, _optionPanel.sprites);
- // Save panel sprites
- _vm->_sprite->loadList(_vm->getResourceDescription()->warningPanelSpritesResourceId, _savePanel.sprites);
- // Load panel sprites
- _vm->_sprite->loadList(_vm->getResourceDescription()->warningPanelSpritesResourceId, _loadPanel.sprites);
- // Quit panel sprites
- _vm->_sprite->loadList(_vm->getResourceDescription()->warningPanelSpritesResourceId, _quitPanel.sprites);
+ if (!(_vm->getFeatures() & GF_NON_INTERACTIVE)) {
+ // Option panel sprites
+ _vm->_sprite->loadList(_vm->getResourceDescription()->optionPanelSpritesResourceId, _optionPanel.sprites);
+ // Save panel sprites
+ _vm->_sprite->loadList(_vm->getResourceDescription()->warningPanelSpritesResourceId, _savePanel.sprites);
+ // Load panel sprites
+ _vm->_sprite->loadList(_vm->getResourceDescription()->warningPanelSpritesResourceId, _loadPanel.sprites);
+ // Quit panel sprites
+ _vm->_sprite->loadList(_vm->getResourceDescription()->warningPanelSpritesResourceId, _quitPanel.sprites);
+ }
if (_vm->getGameId() == GID_ITE) {
_vm->_sprite->loadList(_vm->getResourceDescription()->defaultPortraitsResourceId, _defPortraits);
Modified: scummvm/trunk/engines/saga/sprite.h
===================================================================
--- scummvm/trunk/engines/saga/sprite.h 2008-12-31 22:10:09 UTC (rev 35644)
+++ scummvm/trunk/engines/saga/sprite.h 2008-12-31 22:11:20 UTC (rev 35645)
@@ -49,9 +49,6 @@
SpriteInfo *infoList;
void freeMem() {
- if (!spriteListResourceId)
- return;
-
for (int i = 0; i < spriteCount; i++) {
free(infoList[i].decodedBuffer);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list