[Pingus-CVS] r2452 - trunk/src

[David Philippi at BerliOS]

Author: torangan
Date: 2005-09-30 19:43:07 +0200 (Fri, 30 Sep 2005)
New Revision: 2452

Modified:
   trunk/src/pingus_level_test.cxx
   trunk/src/plf_res_mgr.cxx
   trunk/src/theme.cxx
   trunk/src/xml_pdf.cxx
   trunk/src/xml_pingus_level.cxx
   trunk/src/xml_pingus_level.hxx
Log:
patch from Jason Green to make worldmap playable again

Modified: trunk/src/pingus_level_test.cxx
===================================================================
--- trunk/src/pingus_level_test.cxx     2005-09-30 13:57:37 UTC (rev 2451)
+++ trunk/src/pingus_level_test.cxx     2005-09-30 17:43:07 UTC (rev 2452)
@@ -30,7 +30,7 @@
   try
     {
       CL_SetupCore setup_core;
-      PingusLevel level = XMLPingusLevel("levelout.xml");
+      PingusLevel level = XMLPingusLevel("levelout.xml", "levelout.xml");
 
       std::cout << "Levelname:        " << level.get_levelname() << std::endl;
       std::cout << "Description:      " << level.get_description() << 
std::endl;

Modified: trunk/src/plf_res_mgr.cxx
===================================================================
--- trunk/src/plf_res_mgr.cxx   2005-09-30 13:57:37 UTC (rev 2451)
+++ trunk/src/plf_res_mgr.cxx   2005-09-30 17:43:07 UTC (rev 2452)
@@ -40,7 +40,7 @@
     { // Entry not cached, so load it and add it to cache
       pout(PINGUS_DEBUG_LOADING) << "PLFResMgr: Loading level from DISK: '" << 
res_name << "' -> '" << filename << "'" << std::endl;
 
-      PingusLevel plf = XMLPingusLevel(filename);
+      PingusLevel plf = XMLPingusLevel(res_name, filename);
 
       PLFEntry entry;
 
@@ -61,7 +61,7 @@
           pout(PINGUS_DEBUG_LOADING) << "PLFResMgr: level changed on DISK, 
reloading: '" << res_name << "' -> '" << filename << "'" << std::endl;
 
           // Reload the file since it has changed on disk
-          PingusLevel plf = XMLPingusLevel(filename);
+          PingusLevel plf = XMLPingusLevel(res_name, filename);
 
           PLFEntry entry;
 

Modified: trunk/src/theme.cxx
===================================================================
--- trunk/src/theme.cxx 2005-09-30 13:57:37 UTC (rev 2451)
+++ trunk/src/theme.cxx 2005-09-30 17:43:07 UTC (rev 2452)
@@ -325,7 +325,7 @@
 
       try
              {
-                XMLPingusLevel plf(filename);
+                XMLPingusLevel plf(filename, filename);
                levelnames.push_back(System::translate(plf.get_levelname()));
              }
            catch (PingusError& err)

Modified: trunk/src/xml_pdf.cxx
===================================================================
--- trunk/src/xml_pdf.cxx       2005-09-30 13:57:37 UTC (rev 2451)
+++ trunk/src/xml_pdf.cxx       2005-09-30 17:43:07 UTC (rev 2452)
@@ -61,7 +61,8 @@
   if (levelname.empty())
     PingusError::raise("XMLPDF: No level given");
 
-  plf = XMLPingusLevel(path_manager.complete("levels/" + levelname + 
".pingus"));
+  plf = XMLPingusLevel(path_manager.complete("levels/" + levelname + 
".pingus"),
+                       path_manager.complete("levels/" + levelname + 
".pingus"));
 
   std::cout << "XXXXXXXXX Read Demo file: " << std::endl;
   write_xml(std::cout);

Modified: trunk/src/xml_pingus_level.cxx
===================================================================
--- trunk/src/xml_pingus_level.cxx      2005-09-30 13:57:37 UTC (rev 2451)
+++ trunk/src/xml_pingus_level.cxx      2005-09-30 17:43:07 UTC (rev 2452)
@@ -34,9 +34,10 @@
 
 namespace Pingus {
 
-XMLPingusLevel::XMLPingusLevel(const std::string& filename)
+XMLPingusLevel::XMLPingusLevel(const std::string& res_name,
+                               const std::string& filename)
 {
-  impl->resname = CL_String::get_filename(filename);
+  impl->resname = res_name;
 
   CL_InputSourceProvider_File provider(".");
   CL_DomDocument doc(provider.open_source(filename), true);

Modified: trunk/src/xml_pingus_level.hxx
===================================================================
--- trunk/src/xml_pingus_level.hxx      2005-09-30 13:57:37 UTC (rev 2451)
+++ trunk/src/xml_pingus_level.hxx      2005-09-30 17:43:07 UTC (rev 2452)
@@ -29,7 +29,8 @@
 {
 private:
 public:
-  XMLPingusLevel(const std::string& filename);
+  XMLPingusLevel(const std::string& res_name,
+                 const std::string& filename);
 };
 
 } // namespace Pingus