[Scummvm-cvs-logs] scummvm master -> 04259f7be4113f28c8b541d3100dbd81488c02fa

[eriktorbjorn]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
04259f7be4 HOPKINS: Slight cleanup to silence cppcheck warning.


Commit: 04259f7be4113f28c8b541d3100dbd81488c02fa
    https://github.com/scummvm/scummvm/commit/04259f7be4113f28c8b541d3100dbd81488c02fa
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-03-30T05:17:27-07:00

Commit Message:
HOPKINS: Slight cleanup to silence cppcheck warning.

Changed paths:
    engines/hopkins/anim.cpp



diff --git a/engines/hopkins/anim.cpp b/engines/hopkins/anim.cpp
index 458e8d2..e907b30 100644
--- a/engines/hopkins/anim.cpp
+++ b/engines/hopkins/anim.cpp
@@ -56,7 +56,6 @@ void AnimationManager::clearAll() {
  * @param rate3			Delay amount after animation finishes
  */
 void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, uint32 rate2, uint32 rate3, bool skipSeqFl) {
-	byte *screenCopy = NULL;
 	Common::File f;
 
 	if (_vm->shouldQuit())
@@ -172,7 +171,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
 	}
 
 	if (_vm->_graphicsManager->_fadingFl) {
-		screenCopy = _vm->_globals->allocMemory(307200);
+		byte *screenCopy = _vm->_globals->allocMemory(307200);
 
 		f.seek(6);
 		f.read(_vm->_graphicsManager->_palette, 800);
@@ -197,7 +196,7 @@ void AnimationManager::playAnim(const Common::String &filename, uint32 rate1, ui
 				_vm->_graphicsManager->copyWinscanVbe3(screenP, screenCopy);
 		}
 		_vm->_graphicsManager->fadeOutDefaultLength(screenCopy);
-		screenCopy = _vm->_globals->freeMemory(screenCopy);
+		_vm->_globals->freeMemory(screenCopy);
 	}
 
 	_vm->_graphicsManager->_fadingFl = false;