[Scummvm-cvs-logs] SF.net SVN: scummvm:[39501] scummvm/trunk/engines/sci/gfx/resmgr.cpp

[thebluegr at users.sourceforge.net]

Revision: 39501
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39501&view=rev
Author:   thebluegr
Date:     2009-03-17 23:43:32 +0000 (Tue, 17 Mar 2009)

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

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gfx/resmgr.cpp

Modified: scummvm/trunk/engines/sci/gfx/resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resmgr.cpp	2009-03-17 23:39:28 UTC (rev 39500)
+++ scummvm/trunk/engines/sci/gfx/resmgr.cpp	2009-03-17 23:43:32 UTC (rev 39501)
@@ -502,11 +502,7 @@
 		view = res->unscaled_data.view;
 	}
 
-	if (*loop < 0)
-		*loop = 0;
-	else
-		if (*loop >= view->loops_nr)
-			*loop = view->loops_nr - 1;
+	*loop = CLIP<int>(*loop, 0, view->loops_nr - 1);
 
 	if (*loop < 0) {
 		GFXWARN("View %d has no loops\n", nr);
@@ -519,12 +515,7 @@
 		return NULL;
 	}
 
-	if (*cel < 0) {
-		sciprintf("Resetting cel! %d\n", *cel);
-		*cel = 0;
-	} else
-		if (*cel >= loop_data->cels_nr)
-			*cel = loop_data->cels_nr - 1;
+	*cel = CLIP<int>(*cel, 0, loop_data->cels_nr - 1);
 
 	if (*cel < 0) {
 		GFXWARN("View %d loop %d has no cels\n", nr, *loop);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.