[Scummvm-cvs-logs] SF.net SVN: scummvm:[53245] scummvm/trunk/engines/sword25

[sev at users.sourceforge.net]

Revision: 53245
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53245&view=rev
Author:   sev
Date:     2010-10-12 22:46:35 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
SWORD25: Fix initialization.

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
    scummvm/trunk/engines/sword25/package/scummvmpackagemanager.cpp

Modified: scummvm/trunk/engines/sword25/gfx/graphicengine.cpp
===================================================================
--- scummvm/trunk/engines/sword25/gfx/graphicengine.cpp	2010-10-12 22:46:13 UTC (rev 53244)
+++ scummvm/trunk/engines/sword25/gfx/graphicengine.cpp	2010-10-12 22:46:35 UTC (rev 53245)
@@ -71,8 +71,7 @@
 	m_FrameTimeSampleSlot(0),
 	m_RepaintedPixels(0),
 	BS_ResourceService(pKernel) {
-	for (int i = 0; i < FRAMETIME_SAMPLE_COUNT; i++)
-		m_FrameTimeSamples[i] = 0;
+	m_FrameTimeSamples.resize(FRAMETIME_SAMPLE_COUNT);
 
 	if (!RegisterScriptBindings())
 		BS_LOG_ERRORLN("Script bindings could not be registered.");

Modified: scummvm/trunk/engines/sword25/package/scummvmpackagemanager.cpp
===================================================================
--- scummvm/trunk/engines/sword25/package/scummvmpackagemanager.cpp	2010-10-12 22:46:13 UTC (rev 53244)
+++ scummvm/trunk/engines/sword25/package/scummvmpackagemanager.cpp	2010-10-12 22:46:35 UTC (rev 53245)
@@ -223,7 +223,7 @@
 void *BS_ScummVMPackageManager::GetFile(const Common::String &FileName, unsigned int *FileSizePtr) {
 	Common::SeekableReadStream *in;
 	Common::ArchiveMemberPtr fileNode = GetArchiveMember(FileName);
-	if (fileNode->getName().empty())
+	if (!fileNode)
 		return 0;
 	if (!(in = fileNode->createReadStream()))
 		return 0;
@@ -267,7 +267,7 @@
 unsigned int BS_ScummVMPackageManager::GetFileSize(const Common::String &FileName) {
 	Common::SeekableReadStream *in;
 	Common::ArchiveMemberPtr fileNode = GetArchiveMember(FileName);
-	if (fileNode->getName().empty())
+	if (!fileNode)
 		return 0;
 	if (!(in = fileNode->createReadStream()))
 		return 0;
@@ -290,7 +290,7 @@
 
 bool BS_ScummVMPackageManager::FileExists(const Common::String &FileName) {
 	Common::ArchiveMemberPtr fileNode = GetArchiveMember(FileName);
-	return !fileNode->getName().empty();
+	return fileNode;
 }
 
 // -----------------------------------------------------------------------------


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