[Scummvm-cvs-logs] SF.net SVN: scummvm:[45465] scummvm/trunk/engines/sci/engine/kgraphics.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Wed Oct 28 15:35:48 CET 2009


Revision: 45465
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45465&view=rev
Author:   thebluegr
Date:     2009-10-28 14:35:47 +0000 (Wed, 28 Oct 2009)

Log Message:
-----------
Cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-28 14:25:39 UTC (rev 45464)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-28 14:35:47 UTC (rev 45465)
@@ -491,20 +491,14 @@
 	reg_t object = argv[0];
 
 	if (lookup_selector(s->_segMan, object, s->_kernel->_selectorCache.brLeft, NULL, NULL) == kSelectorVariable) {
-		SegManager *segMan = s->_segMan;
+		int x = (int16)GET_SEL32V(s->_segMan, object, x);
+		int y = (int16)GET_SEL32V(s->_segMan, object, y);
+		int z = (s->_kernel->_selectorCache.z > -1) ? (int16)GET_SEL32V(s->_segMan, object, z) : 0;
+		//int ystep = (int16)GET_SEL32V(s->_segMan, object, yStep);
+		int view = GET_SEL32V(s->_segMan, object, view);
+		int loop = GET_SEL32V(s->_segMan, object, loop);
+		int cel = GET_SEL32V(s->_segMan, object, cel);
 
-		int x = (int16)GET_SEL32V(segMan, object, x);
-		int y = (int16)GET_SEL32V(segMan, object, y);
-		int z = (s->_kernel->_selectorCache.z > -1) ? (int16)GET_SEL32V(segMan, object, z) : 0;
-
-		int ystep = (int16)GET_SEL32V(segMan, object, yStep);
-
-		int view = (int16)GET_SEL32V(segMan, object, view);
-		int loop = GET_SEL32V(segMan, object, loop);
-		int cel = GET_SEL32V(segMan, object, cel);
-
-		Common::Point offset;
-
 		SciGuiView *tmpView = new SciGuiView(s->resMan, NULL, NULL, view);
 		sciViewCelInfo *celInfo = tmpView->getCelInfo(loop, cel);
 		int left = x + celInfo->displaceX - (celInfo->width >> 1);
@@ -517,10 +511,10 @@
 
 		delete tmpView;
 
-		PUT_SEL32V(segMan, object, brLeft, left);
-		PUT_SEL32V(segMan, object, brRight, right);
-		PUT_SEL32V(segMan, object, brTop, top);
-		PUT_SEL32V(segMan, object, brBottom, bottom);
+		PUT_SEL32V(s->_segMan, object, brLeft, left);
+		PUT_SEL32V(s->_segMan, object, brRight, right);
+		PUT_SEL32V(s->_segMan, object, brTop, top);
+		PUT_SEL32V(s->_segMan, object, brBottom, bottom);
 	}
 
 	return s->r_acc;


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