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

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

Revision: 3197
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3197&view=rev
Author:   mgist
Date:     2009-03-13 23:48:25 +0000 (Fri, 13 Mar 2009)

Log Message:
-----------
- Fixed the file attribute of <map node being wrongly parsed.

Modified Paths:
--------------
    trunk/src/common/paws/pawswidget.cpp
    trunk/src/common/util/localization.cpp

Modified: trunk/src/common/paws/pawswidget.cpp
===================================================================
--- trunk/src/common/paws/pawswidget.cpp	2009-03-13 23:33:19 UTC (rev 3196)
+++ trunk/src/common/paws/pawswidget.cpp	2009-03-13 23:48:25 UTC (rev 3197)
@@ -756,6 +756,9 @@
     {
         csRef<iDocumentNode> childWidgetNode = childIter->Next();
 
+        if(!strcmp(childWidgetNode->GetValue(), "map"))
+          continue;
+
         widget=NULL;
 
         // Check if the child should be loaded from 

Modified: trunk/src/common/util/localization.cpp
===================================================================
--- trunk/src/common/util/localization.cpp	2009-03-13 23:33:19 UTC (rev 3196)
+++ trunk/src/common/util/localization.cpp	2009-03-13 23:48:25 UTC (rev 3197)
@@ -121,6 +121,8 @@
     fullPath += shortPath;
     if (FileExists(fullPath))
         return fullPath;
+    else if (FileExists(shortPath))
+        return shortPath;
     else
     {    
         fullPath = DEFAULT_FILE_PATH + shortPath;


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