[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.84,1.85 input_event.hxx,1.4,1.5

[grumbel]

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

Modified Files:
        Makefile.am input_event.hxx 
Log Message:
- some cleanup
- added object valid checks for GUI

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- Makefile.am 3 Jul 2002 16:55:39 -0000       1.84
+++ Makefile.am 3 Jul 2002 17:14:25 -0000       1.85
@@ -31,6 +31,7 @@
        editor              \
        entrances           \
        generic             \
+        input               \
        particles           \
        traps               \
         worldobjs           \
@@ -63,7 +64,7 @@
         backgrounds/libpingus_backgrounds.a       \
         worldmap/libpingus_worldmap.a \
         generic/libpingus_generic.a \
-        generic/libpingus_input.a
+        input/libpingus_input.a
 
 pingus_SOURCES = \
 action_button.cxx \

Index: input_event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input_event.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- input_event.hxx     2 Jul 2002 16:06:51 -0000       1.4
+++ input_event.hxx     3 Jul 2002 17:14:25 -0000       1.5
@@ -34,6 +34,9 @@
       press and cursor movement */
   SCROLL_MOVE,
 
+  /** The button that turns the MOUSE_MOVE into a SCROLL_MOVE */
+  SCROLL_MODIFIER,
+
   /*** Generic button events (pos contains position) */
   PRIMARY_BUTTON_PRESSED,
   SECONDARY_BUTTON_PRESSED,
@@ -43,7 +46,8 @@
   
   /** 'p' or 'Pause' got pressed */
   PAUSE_PRESSED,
-  
+  FASTFORWARD_TRIGGERED
+
   /** Buttons for switching to the next/previous Action */
   ACTION_UP,
   ACTION_DOWN,