[Pingus-CVS] CVS: Games/Pingus/src/worldmap manager.cxx,1.5,1.6 manager.hxx,1.4,1.5 worldmap.cxx,1.4,1.5 worldmap.hxx,1.3,1.4

[grumbel]

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

Modified Files:
        manager.cxx manager.hxx worldmap.cxx worldmap.hxx 
Log Message:
cleaned up the forward/pause/armageddon button mess a bit
on_button_press to on_primary_button_press  rename
added on_secondary_press


Index: manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/manager.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- manager.cxx 1 Aug 2002 21:40:02 -0000       1.5
+++ manager.cxx 2 Aug 2002 22:55:19 -0000       1.6
@@ -100,10 +100,10 @@
 }
 
 void 
-WorldMapManager::WorldMapComponent::on_button_press (int x, int y)
+WorldMapManager::WorldMapComponent::on_primary_button_press (int x, int y)
 {
   std::cout << "Buton press" << std::endl;
-  WorldMapManager::instance ()->worldmap->on_button_press (x, y);
+  WorldMapManager::instance ()->worldmap->on_primary_button_press (x, y);
 }
 
 void 

Index: manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/manager.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- manager.hxx 1 Aug 2002 21:40:02 -0000       1.4
+++ manager.hxx 2 Aug 2002 22:55:19 -0000       1.5
@@ -43,7 +43,7 @@
     class WorldMapComponent : public GUI::Component
     {
     public:
-      void on_button_press (int x, int y);
+      void on_primary_button_press (int x, int y);
 
       void draw ();
       void update (float delta);

Index: worldmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/worldmap.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- worldmap.cxx        1 Aug 2002 21:40:02 -0000       1.4
+++ worldmap.cxx        2 Aug 2002 22:55:19 -0000       1.5
@@ -152,7 +152,7 @@
 }
 
 void 
-WorldMap::on_button_press (int x, int y)
+WorldMap::on_primary_button_press (int x, int y)
 {
   if (!catch_input) return;
 

Index: worldmap.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldmap/worldmap.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- worldmap.hxx        1 Aug 2002 21:40:02 -0000       1.3
+++ worldmap.hxx        2 Aug 2002 22:55:19 -0000       1.4
@@ -80,7 +80,7 @@
          - calculate which level was clicked
          - calculate the shortest path
          - let the pingu walk */
-      void on_button_press (int x, int y);
+      void on_primary_button_press (int x, int y);
  
       /** Disable all event catching */
       void disable_button_events ();