[Scummvm-cvs-logs] SF.net SVN: scummvm:[49342] scummvm/trunk/engines/sci/engine/features.cpp
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Mon May 31 09:34:19 CEST 2010
Revision: 49342
http://scummvm.svn.sourceforge.net/scummvm/?rev=49342&view=rev
Author: thebluegr
Date: 2010-05-31 07:34:18 +0000 (Mon, 31 May 2010)
Log Message:
-----------
Cleanup
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/features.cpp
Modified: scummvm/trunk/engines/sci/engine/features.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/features.cpp 2010-05-31 04:58:19 UTC (rev 49341)
+++ scummvm/trunk/engines/sci/engine/features.cpp 2010-05-31 07:34:18 UTC (rev 49342)
@@ -341,12 +341,12 @@
} else { // SCI0 late
// Check if the game is using an overlay
bool searchRoomObj = false;
+ reg_t rmObjAddr = _segMan->findObjectByName("Rm");
if (_kernel->_selectorCache.overlay != -1) {
// The game has an overlay selector, check how it calls kDrawPicto determine
// the graphics functions type used
- reg_t objAddr = _segMan->findObjectByName("Rm");
- if (lookupSelector(_segMan, objAddr, _kernel->_selectorCache.overlay, NULL, NULL) == kSelectorMethod) {
+ if (lookupSelector(_segMan, rmObjAddr, _kernel->_selectorCache.overlay, NULL, NULL) == kSelectorMethod) {
if (!autoDetectGfxFunctionsType()) {
warning("Graphics functions detection failed, taking an educated guess");
@@ -372,7 +372,7 @@
// as the overlay selector might be missing in demos
bool found = false;
- const Object *obj = _segMan->getObject(_segMan->findObjectByName("Rm"));
+ const Object *obj = _segMan->getObject(rmObjAddr);
for (uint m = 0; m < obj->getMethodCount(); m++) {
found = autoDetectGfxFunctionsType(m);
if (found)
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