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

sev at users.sourceforge.net sev at users.sourceforge.net
Wed Oct 13 00:49:08 CEST 2010


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

Log Message:
-----------
SWORD25: Made game run with extracted data

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/package/scummvmpackagemanager.cpp
    scummvm/trunk/engines/sword25/script/luascript.cpp

Modified: scummvm/trunk/engines/sword25/package/scummvmpackagemanager.cpp
===================================================================
--- scummvm/trunk/engines/sword25/package/scummvmpackagemanager.cpp	2010-10-12 22:48:45 UTC (rev 53251)
+++ scummvm/trunk/engines/sword25/package/scummvmpackagemanager.cpp	2010-10-12 22:49:08 UTC (rev 53252)
@@ -113,18 +113,19 @@
 
 bool BS_ScummVMPackageManager::LoadDirectoryAsPackage(const Common::String &directoryName, const Common::String &mountPosition) {
 	Common::FSNode directory(directoryName);
-	Common::Archive *folderArchive = new Common::FSDirectory(directory);
+	Common::Archive *folderArchive = new Common::FSDirectory(directory, 6);
 	if (!directory.exists() || (folderArchive == NULL)) {
 		BS_LOG_ERRORLN("Unable to mount directory \"%s\" to \"%s\".", directoryName.c_str(), mountPosition.c_str());
 		return false;
 	} else {
 		BS_LOGLN("Directory '%s' mounted as '%s'.", directoryName.c_str(), mountPosition.c_str());
-		_archiveList.push_front(new ArchiveEntry(folderArchive, mountPosition));
 
 		Common::ArchiveMemberList files;
 		folderArchive->listMembers(files);
 		debug(0, "Capacity %d", files.size());
 
+		_archiveList.push_front(new ArchiveEntry(folderArchive, mountPosition));
+
 		return true;
 	}
 }

Modified: scummvm/trunk/engines/sword25/script/luascript.cpp
===================================================================
--- scummvm/trunk/engines/sword25/script/luascript.cpp	2010-10-12 22:48:45 UTC (rev 53251)
+++ scummvm/trunk/engines/sword25/script/luascript.cpp	2010-10-12 22:49:08 UTC (rev 53252)
@@ -150,7 +150,7 @@
 #ifdef DEBUG
 	int __startStackDepth = lua_gettop(m_State);
 #endif
-	debug(0, "ExecuteFile(%s)", FileName.c_str());
+	debug(2, "ExecuteFile(%s)", FileName.c_str());
 
 	// Get a pointer to the package manager
 	BS_PackageManager *pPackage = static_cast<BS_PackageManager *>(BS_Kernel::GetInstance()->GetService("package"));
@@ -221,8 +221,6 @@
 // -----------------------------------------------------------------------------
 
 bool BS_LuaScriptEngine::ExecuteBuffer(const char *Data, unsigned int Size, const Common::String &Name) const {
-	debug(0, "ExecuteBuffer()");
-
 	// Compile buffer
 	if (luaL_loadbuffer(m_State, Data, Size, Name.c_str()) != 0) {
 		BS_LOG_ERRORLN("Couldn't compile \"%s\":\n%s", Name.c_str(), lua_tostring(m_State, -1));


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