[Feuerkraft-CVS] rev 331 - trunk/src/input

[Ingo Ruhnke]

Author: grumbel
Date: 2004-01-10 21:49:29 +0100 (Sat, 10 Jan 2004)
New Revision: 331

Modified:
   trunk/src/input/axis_button.cxx
   trunk/src/input/button_factory.cxx
Log:
- a patch

Modified: trunk/src/input/axis_button.cxx
===================================================================
--- trunk/src/input/axis_button.cxx     2004-01-10 15:50:05 UTC (rev 330)
+++ trunk/src/input/axis_button.cxx     2004-01-10 20:49:29 UTC (rev 331)
@@ -17,6 +17,7 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <iostream>
 #include "input_axis.hxx"
 #include "axis_button.hxx"
 
@@ -45,12 +46,12 @@
       if (down && pos < 0.5f)
         {
           down = false;
-          on_key_up();
+          button_up();
         }
       else if (!down && pos > 0.5f)
         {
           down = true;
-          on_key_down();
+          button_down();
         }
     }
   else
@@ -58,12 +59,12 @@
       if (down && pos > -0.5f)
         {
           down = false;
-          on_key_up();
+          button_up();
         }
       else if (!down && pos < -0.5f)
         {
           down = true;
-          on_key_down();
+          button_down();
         }
     }
 }

Modified: trunk/src/input/button_factory.cxx
===================================================================
--- trunk/src/input/button_factory.cxx  2004-01-10 15:50:05 UTC (rev 330)
+++ trunk/src/input/button_factory.cxx  2004-01-10 20:49:29 UTC (rev 331)
@@ -58,7 +58,6 @@
 InputButton*
 ButtonFactory::create_axis_button(SCM lst)
 {
-  std::cout << "ButtonFactory::create_axis_button: " << Guile::scm2string(lst) 
<< std::endl;
   InputAxis* axis = AxisFactory::create(gh_car(lst));
   bool top = gh_scm2bool(gh_cadr(lst));