[PlaneShift-svn] SF.net SVN: planeshift:[4192] trunk/src/common/paws/pawsmanager.cpp

[<Ven...@us...>]

Revision: 4192
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4192&view=rev
Author:   Vengeance2001
Date:     2009-08-05 21:39:36 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
Changed where base styles are loaded, to be after the custom skin
styles.

Modified Paths:
--------------
    trunk/src/common/paws/pawsmanager.cpp

Modified: trunk/src/common/paws/pawsmanager.cpp
===================================================================
--- trunk/src/common/paws/pawsmanager.cpp	2009-08-05 20:55:33 UTC (rev 4191)
+++ trunk/src/common/paws/pawsmanager.cpp	2009-08-05 21:39:36 UTC (rev 4192)
@@ -131,11 +131,10 @@
     csString borderFile = cfg->GetStr("PlaneShift.GUI.BorderFile", "/this/data/gui/borderlist.xml");
 
     styles = new pawsStyles( objectReg );
-    // Load custom styles first to override base styles
-    csString stylePath = csString(skin) + "/styles.xml";
-    if (!styles->LoadStyles(stylePath))
+
+    if(!LoadSkinDefinition(skin))
     {
-        Error2("Failed to load styles from skin: %s.",stylePath.GetData() );
+        Error2("Failed to load skin %s!", skin);
     }
 
     // now load standard styles for anything else
@@ -146,11 +145,6 @@
         styles = NULL;
     }
 
-    if(!LoadSkinDefinition(skin))
-    {
-        Error2("Failed to load skin %s!", skin);
-    }
-
     // Mount base skin to satisfy unskinned elements
     if(skinBase)
     {


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