[Adonthell-commits] CVS: adonthell/src Makefile.am,1.96,1.97 event.cc,1.18,1.19

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv21978/src

Modified Files:
        Makefile.am event.cc 
Log Message:
FIXED compilation of tools
FIXED bug of events repeating although they shouldn't (I hope)


Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Makefile.am,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -r1.96 -r1.97
*** Makefile.am 21 Aug 2002 21:15:53 -0000      1.96
--- Makefile.am 2 Sep 2002 10:57:41 -0000       1.97
***************
*** 11,15 ****
  EXTRA_DIST = .indent.pro prefs.l py_adonthell.i
  
! CPPFLAGS += $(SDL_DEFS) $(OGG_DEFS) $(SDL_CFLAGS) $(OGG_CFLAGS) $(PY_CFLAGS)
  
  noinst_LIBRARIES = libadonthell.a
--- 11,15 ----
  EXTRA_DIST = .indent.pro prefs.l py_adonthell.i
  
! CPPFLAGS =$(SDL_DEFS) $(OGG_DEFS) $(SDL_CFLAGS) $(OGG_CFLAGS) $(PY_CFLAGS)
  
  noinst_LIBRARIES = libadonthell.a

Index: event.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/event.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** event.cc    20 Aug 2002 17:40:40 -0000      1.18
--- event.cc    2 Sep 2002 10:57:41 -0000       1.19
***************
*** 220,228 ****
  s_int32 event::do_repeat ()
  {
!     s_int32 count = -1;
      
!     if (Repeat > 0) count = --Repeat;
!     if (count == 0) delete this;
!     
!     return count;
  }
--- 220,234 ----
  s_int32 event::do_repeat ()
  {
!     if (Repeat >= 0) 
!     {
!         Repeat--;
!         
!         if (Repeat <= 0) 
!         {
!             delete this;
!             return 0;
!         }
!     }
      
!     return Repeat;
  }