[PlaneShift-svn] SF.net SVN: planeshift: [1644] trunk/src/common

[<mg...@us...>]

Revision: 1644
          http://planeshift.svn.sourceforge.net/planeshift/?rev=1644&view=rev
Author:   mgist
Date:     2008-06-01 14:13:50 -0700 (Sun, 01 Jun 2008)

Log Message:
-----------
- Revert CS workaround for vfs readfile, it's fixed properly in CS now.

Modified Paths:
--------------
    trunk/src/common/engine/psregion.cpp
    trunk/src/common/paws/pawsobjectview.cpp

Modified: trunk/src/common/engine/psregion.cpp
===================================================================
--- trunk/src/common/engine/psregion.cpp	2008-06-01 17:47:47 UTC (rev 1643)
+++ trunk/src/common/engine/psregion.cpp	2008-06-01 21:13:50 UTC (rev 1644)
@@ -83,7 +83,7 @@
     csString target;
     target.Format("%s/world", worlddir.GetData());
 
-    csRef<iDataBuffer> buf (vfs->ReadFile (target.GetData(), false));
+    csRef<iDataBuffer> buf (vfs->ReadFile (target.GetData()));
     if (!buf || !buf->GetSize ())
     {
         Error2("Error loading world file. %s\n", target.GetData());

Modified: trunk/src/common/paws/pawsobjectview.cpp
===================================================================
--- trunk/src/common/paws/pawsobjectview.cpp	2008-06-01 17:47:47 UTC (rev 1643)
+++ trunk/src/common/paws/pawsobjectview.cpp	2008-06-01 21:13:50 UTC (rev 1644)
@@ -133,7 +133,7 @@
         csRef<iDocument> doc = xml->CreateDocument();
         csString filename = map;
         filename.Append("/world");
-        csRef<iDataBuffer> buf (VFS->ReadFile (filename, false));
+        csRef<iDataBuffer> buf (VFS->ReadFile (filename));
         doc->Parse(buf);
         csRef<iDocumentNode> worldNode = doc->GetRoot()->GetNode("world");
 


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