pingus-cvs
[Top][All Lists]
Advanced

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

[Pingus-CVS] CVS: Games/Pingus/src/input controller.cxx,1.7,1.8 controll


From: grumbel
Subject: [Pingus-CVS] CVS: Games/Pingus/src/input controller.cxx,1.7,1.8 controller.hxx,1.6,1.7
Date: 29 Jul 2002 10:41:20 -0000

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

Modified Files:
        controller.cxx controller.hxx 
Log Message:
little bug fix

Index: controller.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/controller.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- controller.cxx      12 Jul 2002 15:19:09 -0000      1.7
+++ controller.cxx      29 Jul 2002 10:41:17 -0000      1.8
@@ -39,7 +39,8 @@
 
 namespace Input
 {
-  Controller::Controller (const std::string& configfile) : 
standard_pointer(0), scroller(0), buttons(16), action_axis(0),
+  Controller::Controller (const std::string& configfile) : 
standard_pointer(0), 
+                                                          scroller(0), 
action_axis(0),
                                                           std_pointer_x(0), 
std_pointer_y(0)
   {
 
@@ -148,6 +149,9 @@
   void
   Controller::update (float delta)
   {
+    // FIXME: Memory leak
+    events.clear ();
+
     scroller        ->update(delta);
     standard_pointer->update(delta);
     action_axis     ->update(delta);

Index: controller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/controller.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- controller.hxx      12 Jul 2002 15:09:47 -0000      1.6
+++ controller.hxx      29 Jul 2002 10:41:17 -0000      1.7
@@ -53,7 +53,7 @@
     public:
       explicit Controller (const std::string& configfile);
       
-      std::list<Event*>& get_events ();
+      std::list<Event*>& get_events () { return events; }
       
       void update(float delta);
 




reply via email to

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