[Pingus-CVS] CVS: Games/Pingus/src/input axis_event.hxx,NONE,1.1 pointer_event.hxx,NONE,1.1 button_event.hxx,1.1,1.2 event.hxx,1.1,1.2

[torangan]

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

Modified Files:
        button_event.hxx event.hxx 
Added Files:
        axis_event.hxx pointer_event.hxx 
Log Message:
bugfixes


--- NEW FILE: axis_event.hxx ---
//  $Id: axis_event.hxx,v 1.1 2002/07/10 17:22:11 torangan Exp $
// 
//  Pingus - A free Lemmings clone
//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
//  This program is free software; you can redistribute it and/or
//  modify it under the terms of the GNU General Public License
//  as published by the Free Software Foundation; either version 2
//  of the License, or (at your option) any later version.
//
//  This program is distributed in the hope that it will be useful,
//  but WITHOUT ANY WARRANTY; without even the implied warranty of
//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
//  GNU General Public License for more details.
// 
//  You should have received a copy of the GNU General Public License
//  along with this program; if not, write to the Free Software
//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

#ifndef HEADER_PINGUS_INPUT_AXIS_EVENT_HXX
#define HEADER_PINGUS_INPUT_AXIS_EVENT_HXX

#include "event.hxx"

namespace Input {

  enum Direction { up, down };
  enum AxisName  { action };

  class AxisEvent : public Event {
  
    public:
      Direction dir;
      AxisName  name;
                 
    public:
      AxisEvent (Direction dir_, AxisName name_=action) : dir(dir_), 
name(name_) { }
      
      EventType get_type () { return AxisEventType; }
  };

}

#endif

/* EOF */

--- NEW FILE: pointer_event.hxx ---
//  $Id: pointer_event.hxx,v 1.1 2002/07/10 17:22:11 torangan Exp $
// 
//  Pingus - A free Lemmings clone
//  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
//
//  This program is free software; you can redistribute it and/or
//  modify it under the terms of the GNU General Public License
//  as published by the Free Software Foundation; either version 2
//  of the License, or (at your option) any later version.
//
//  This program is distributed in the hope that it will be useful,
//  but WITHOUT ANY WARRANTY; without even the implied warranty of
//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
//  GNU General Public License for more details.
// 
//  You should have received a copy of the GNU General Public License
//  along with this program; if not, write to the Free Software
//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

#ifndef HEADER_PINGUS_INPUT_POINTER_EVENT_HXX
#define HEADER_PINGUS_INPUT_POINTER_EVENT_HXX

#include "event.hxx"

namespace Input {

  enum Type { standard, scroll };

  class PointerEvent : public Event {
  
    public:
      Type  type;
      float x, y;
           
    public:
      PointerEvent (Type type_, float x_, float y_) : type(type_), x(x_), y(y_) 
{ }
      
      EventType get_type () { return PointerEventType; }
  };

}

#endif

/* EOF */

Index: button_event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/button_event.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- button_event.hxx    10 Jul 2002 16:15:28 -0000      1.1
+++ button_event.hxx    10 Jul 2002 17:22:11 -0000      1.2
@@ -37,7 +37,7 @@
     public:
       ButtonEvent (ButtonName name_, State state_) : name(name_), 
state(state_) { }
       
-      EventType get_type () { return Input::ButtonEvent; }
+      EventType get_type () { return ButtonEventType; }
   };
 
 }

Index: event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/event.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- event.hxx   10 Jul 2002 16:15:28 -0000      1.1
+++ event.hxx   10 Jul 2002 17:22:11 -0000      1.2
@@ -22,7 +22,7 @@
 
 namespace Input {
 
-  enum EventType { ButtonEvent, MoveEvent, ActionAxisEvent };
+  enum EventType { ButtonEventType, PointerEventType, AxisEventType };
 
   class Event {
     public: