[Scummvm-cvs-logs] SF.net SVN: scummvm:[33557] residual/trunk/engine/lua.cpp

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Sun Aug 3 08:41:26 CEST 2008


Revision: 33557
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33557&view=rev
Author:   aquadran
Date:     2008-08-03 06:41:26 +0000 (Sun, 03 Aug 2008)

Log Message:
-----------
forced finding files in savepath directory

Modified Paths:
--------------
    residual/trunk/engine/lua.cpp

Modified: residual/trunk/engine/lua.cpp
===================================================================
--- residual/trunk/engine/lua.cpp	2008-08-02 23:11:31 UTC (rev 33556)
+++ residual/trunk/engine/lua.cpp	2008-08-03 06:41:26 UTC (rev 33557)
@@ -2134,7 +2134,7 @@
 
 static void luaFileFindNext() {
 	if (g_findfile != g_fslist->end()) {
-		lua_pushstring(g_findfile->getPath().c_str());
+		lua_pushstring(g_findfile->getName().c_str());
 		g_findfile++;
 	} else {
 		lua_pushnil();
@@ -2144,21 +2144,17 @@
 
 static void luaFileFindFirst() {
 	const char *path, *extension;
-	lua_Object pathObj;
 
 	DEBUG_FUNCTION();
 	extension = luaL_check_string(1);
-	pathObj = lua_getparam(2);
+	lua_getparam(2); // overrinding below devel external gama data path to savepath
 	FileFindDispose();
 
-	if (lua_isnil(pathObj)) {
-		path = ConfMan.get("savepath").c_str();
+	path = ConfMan.get("savepath").c_str();
 #ifdef _WIN32_WCE
-		if (path.empty())
-			path = ConfMan.get("path").c_str();
+	if (path.empty())
+		path = ConfMan.get("path").c_str();
 #endif
-	} else
-		path = lua_getstring(pathObj);
 
 	g_fslist = new FSList();
 	g_fsdir = new FilesystemNode(path);


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