[Scummvm-cvs-logs] SF.net SVN: scummvm:[50923] scummvm/trunk/engines/sword2

[eriktorbjorn at users.sourceforge.net]

Revision: 50923
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50923&view=rev
Author:   eriktorbjorn
Date:     2010-07-16 03:07:30 +0000 (Fri, 16 Jul 2010)

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

Modified Paths:
--------------
    scummvm/trunk/engines/sword2/anims.cpp
    scummvm/trunk/engines/sword2/music.cpp

Modified: scummvm/trunk/engines/sword2/anims.cpp
===================================================================
--- scummvm/trunk/engines/sword2/anims.cpp	2010-07-15 21:28:48 UTC (rev 50922)
+++ scummvm/trunk/engines/sword2/anims.cpp	2010-07-16 03:07:30 UTC (rev 50923)
@@ -56,8 +56,6 @@
 	ObjectGraphic obGraph(ob_graph);
 
 	if (obLogic.getLooping() == 0) {
-		byte *ptr;
-
 		// This is the start of the anim - set up the first frame
 
 		// For testing all anims!
@@ -75,12 +73,8 @@
 				return IR_STOP;
 			}
 
-			ptr = _vm->_resman->openResource(animRes);
-
 			// if it's not an animation file
 			if (_vm->_resman->fetchType(animRes) != ANIMATION_FILE) {
-				_vm->_resman->closeResource(animRes);
-
 				// switch off the sprite
 				// don't animate - just continue
 				// script next cycle
@@ -88,8 +82,6 @@
 				return IR_STOP;
 			}
 
-			_vm->_resman->closeResource(animRes);
-
 			// switch on the sprite
 			setSpriteStatus(ob_graph, SORT_SPRITE);
 		}

Modified: scummvm/trunk/engines/sword2/music.cpp
===================================================================
--- scummvm/trunk/engines/sword2/music.cpp	2010-07-15 21:28:48 UTC (rev 50922)
+++ scummvm/trunk/engines/sword2/music.cpp	2010-07-16 03:07:30 UTC (rev 50923)
@@ -136,10 +136,8 @@
 			return NULL;
 		}
 		if (fh->fileSize != fh->file.size()) {
-			if (fh->idxTab) {
-				free(fh->idxTab);
-				fh->idxTab = NULL;
-			}
+			free(fh->idxTab);
+			fh->idxTab = NULL;
 		}
 	} else
 		alreadyOpen = true;


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