[Pingus-CVS] CVS: Games/Pingus/src pingus_resource.cxx,1.25,1.26 res_descriptor.cxx,1.14,1.15 res_descriptor.hxx,1.11,1.12

[grumbel]

Update of /var/lib/cvs/Games/Pingus/src
In directory dark:/tmp/cvs-serv14359

Modified Files:
        pingus_resource.cxx res_descriptor.cxx res_descriptor.hxx 
Log Message:
namespace fix

Index: pingus_resource.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/pingus_resource.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- pingus_resource.cxx 2 Apr 2003 19:43:04 -0000       1.25
+++ pingus_resource.cxx 2 Apr 2003 19:59:04 -0000       1.26
@@ -117,7 +117,6 @@
          pout(PINGUS_DEBUG_RESOURCES) << "PingusResource: Loading surface from 
cache 1/2: " << res_desc << std::endl;
          surf = apply_modifier (surf, res_desc);
       
-         // add to cache (FIXME: doesn't work)
          surface_map[res_desc] = surf;
        }
       else // never loaded, need to load it from source
@@ -147,7 +146,6 @@
   std::map<ResDescriptor, CL_Surface>::iterator i = surface_map.find(res_desc);
   if (i == surface_map.end())
     {
-      std::cout << "PingusResource::load_from_cache: no surface cached: " << 
res_desc << std::endl;
       return CL_Surface();
     }
   else

Index: res_descriptor.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/res_descriptor.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- res_descriptor.cxx  2 Apr 2003 19:43:04 -0000       1.14
+++ res_descriptor.cxx  2 Apr 2003 19:59:04 -0000       1.15
@@ -70,32 +70,6 @@
   modifier = arg_modifier;
 }
 
-ResDescriptor::ResDescriptor(const std::string& str) 
-{
-  modifier = ResourceModifierNS::ROT0;
-
-  std::string::size_type pos1;
-  std::string::size_type pos2;
-
-  //cout << "Resdes: " << str << std::endl;
-
-  type = RD_RESOURCE;
-  
-  pos1 = str.find_first_of(':');
-  pos2 = str.find_first_of(')');
-  
-  if (pos1 != std::string::npos && pos2 != std::string::npos)
-    {
-      datafile = str.substr(pos1 + 1, (pos2 - pos1 - 1));
-      res_name = str.substr(pos2 + 1);
-    }
-  else
-    {
-      res_name = str;
-      datafile = "global";
-    }
-}
-
 bool
 ResDescriptor::operator<(const ResDescriptor& res_desc) const
 {
@@ -137,8 +111,8 @@
   switch (desc.type)
     {
     case ResDescriptor::RD_RESOURCE:
-      return s << "(datafile: " << desc.datafile << ", res_name: " << 
desc.res_name 
-               << ", modifier: " << rs_to_string(desc.modifier) << ")";
+      return s << "[" << desc.res_name << ", " << desc.datafile 
+               << ", " << ResourceModifierNS::rs_to_string(desc.modifier) << 
"]";
       break;
     case ResDescriptor::RD_FILE:
       return s << "(plainfile:" << desc.res_name << ")";

Index: res_descriptor.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/res_descriptor.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- res_descriptor.hxx  21 Mar 2003 22:08:06 -0000      1.11
+++ res_descriptor.hxx  2 Apr 2003 19:59:04 -0000       1.12
@@ -47,7 +47,6 @@
                 ResourceType type = RD_RESOURCE,
                 ResourceModifierNS::ResourceModifier modifier 
                 = ResourceModifierNS::ROT0);
-  ResDescriptor (const std::string& str);
 
   bool operator< (const ResDescriptor&) const;