pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pingus-CVS] CVS: Games/Pingus/src/worldmap manager.cxx,1.33,1.34 worldm


From: grumbel
Subject: [Pingus-CVS] CVS: Games/Pingus/src/worldmap manager.cxx,1.33,1.34 worldmap.cxx,1.41,1.42 worldmap.hxx,1.25,1.26
Date: 6 Apr 2003 12:40:49 -0000

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

Modified Files:
        manager.cxx worldmap.cxx worldmap.hxx 
Log Message:
- added next button to story screen

Index: manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/manager.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- manager.cxx 5 Apr 2003 20:24:16 -0000       1.33
+++ manager.cxx 6 Apr 2003 12:40:47 -0000       1.34
@@ -211,11 +211,6 @@
   is_init = false;
   exit_worldmap = false;
  
-  // FIXME: The default startup map should be configurable by some file
-
-
-  //worldmap->on_startup ();
-
   // FIXME: a bit ugly because of the proteced member, but should work
   // FIXME: well enough. GUIScreen could also use multi-inheritage,
   // FIXME: but that could lead to member function name conflicts
@@ -253,6 +248,9 @@
     {
       load(path_manager.complete("worldmaps/tutorial.xml"));
     }
+  
+  if (worldmap)
+    worldmap->on_startup ();
 }
 
 WorldMapManager::~WorldMapManager ()

Index: worldmap.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/worldmap.cxx,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- worldmap.cxx        5 Apr 2003 20:59:38 -0000       1.41
+++ worldmap.cxx        6 Apr 2003 12:40:47 -0000       1.42
@@ -262,6 +262,11 @@
     {
       (*i)->update ();
     }
+}
+
+void
+WorldMap::on_startup()
+{
   update_locked_nodes();
 }
 

Index: worldmap.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/worldmap/worldmap.hxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- worldmap.hxx        1 Apr 2003 13:21:20 -0000       1.25
+++ worldmap.hxx        6 Apr 2003 12:40:47 -0000       1.26
@@ -85,6 +85,8 @@
 
   Pingus* get_pingus() { return pingus; }
 
+  void on_startup();
+
   void draw (GraphicContext& gc);
   void update ();
   





reply via email to

[Prev in Thread] Current Thread [Next in Thread]