[Pingus-CVS] CVS: Games/Pingus/src/worldmap level_dot.cxx,1.8,1.9 level_dot.hxx,1.5,1.6 worldmap.cxx,1.31,1.32

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src/worldmap
In directory dark:/tmp/cvs-serv31575/worldmap

Modified Files:
        level_dot.cxx level_dot.hxx worldmap.cxx 
Log Message:
seperated PLF loading a bit, not 100% sure if this is a good idea or not.


Index: level_dot.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/level_dot.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- level_dot.cxx       19 Feb 2003 09:50:36 -0000      1.8
+++ level_dot.cxx       3 Mar 2003 20:32:18 -0000       1.9
@@ -53,7 +53,7 @@
         {
           levelname = XMLhelper::parse_string(doc, cur);
           //std::cout << "Levelname: " << levelname << std::endl;         
-          plf = PLF::create(path_manager.complete("levels/") + levelname);
+          plf = PingusResource::load_plf(levelname);
         }
       
       cur = cur->next;
@@ -78,7 +78,7 @@
 {
   std::cout << "Starting level: " << levelname << std::endl;
   ScreenManager::instance()->fade_out();
-  ScreenManager::instance()->push_screen(new PingusGameSession 
(path_manager.complete("levels/") + levelname),
+  ScreenManager::instance()->push_screen(new PingusGameSession 
(PingusResource::load_plf(levelname)),
                                          true);
 }
 

Index: level_dot.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/level_dot.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- level_dot.hxx       27 Nov 2002 20:05:42 -0000      1.5
+++ level_dot.hxx       3 Mar 2003 20:32:18 -0000       1.6
@@ -21,10 +21,9 @@
 #define HEADER_PINGUS_WORLDMAP_LEVEL_DOT_HXX
 
 #include "../sprite.hxx"
+#include "../plf_handle.hxx"
 #include "dot.hxx"
 
-class PLF;
-
 namespace WorldMapNS {
 
 /** */
@@ -34,14 +33,14 @@
   Sprite green_dot_sur;
   Sprite red_dot_sur;
   std::string levelname;
-  PLF* plf;
+  PLFHandle plf;
 
 public:
   LevelDot(xmlDocPtr doc, xmlNodePtr cur);
 
   void draw(GraphicContext& gc);
   void update();
-  PLF* get_plf () const { return plf; }
+  PLFHandle get_plf () const { return plf; }
   void on_click(); 
 
 private:

Index: worldmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/worldmap.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- worldmap.cxx        18 Feb 2003 17:04:13 -0000      1.31
+++ worldmap.cxx        3 Mar 2003 20:32:18 -0000       1.32
@@ -40,6 +40,7 @@
 #include "dot.hxx"
 #include "level_dot.hxx"
 #include "path_graph.hxx"
+#include "../plf_handle.hxx"
 #include "../plf.hxx"
 #include "../math.hxx"
 
@@ -193,7 +194,7 @@
   if (pingus->get_node() != NoNode)
     {
       LevelDot* leveldot = 
dynamic_cast<LevelDot*>(path_graph->get_dot(pingus->get_node()));
-
+      
       if (leveldot)
         gc.print_center(Fonts::pingus_small, gc.get_width ()/2, 
gc.get_height() - 40,
                         
System::translate(leveldot->get_plf()->get_levelname()));
@@ -212,8 +213,10 @@
                           
System::translate(leveldot->get_plf()->get_levelname()));
 
           if (maintainer_mode)
-            gc.print_center(Fonts::pingus_small, mouse_x, mouse_y - 56,
-                            leveldot->get_plf()->get_filename());
+            {
+              gc.print_center(Fonts::pingus_small, mouse_x, mouse_y - 56,
+                              leveldot->get_plf()->get_filename());
+            }
         }
     }
 }