[Enigma-cvs] enigma/src world.cc, 1.72.2.11, 1.72.2.12 objects.hh, 1.49.2.4, 1.49.2.5 actors.cc, 1.41.2.7, 1.41.2.8

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv23106/src

Modified Files:
      Tag: enigma0_80_rc
        world.cc objects.hh actors.cc 
Log Message:
Fixed the infamous "level always resets" bug


Index: world.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/world.cc,v
retrieving revision 1.72.2.11
retrieving revision 1.72.2.12
diff -C2 -d -r1.72.2.11 -r1.72.2.12
*** world.cc    8 Oct 2003 20:00:18 -0000       1.72.2.11
--- world.cc    9 Oct 2003 16:32:09 -0000       1.72.2.12
***************
*** 708,712 ****
                actor2->on_hit(actor1);
  
!                 bool reboundp = (!actor1->is_dead() && !actor2->is_dead() &&
                                   (actor1->is_on_floor() == 
actor2->is_on_floor()));
  
--- 708,712 ----
                actor2->on_hit(actor1);
  
!                 bool reboundp = (actor1->is_movable() && actor2->is_movable() 
&& 
                                   (actor1->is_on_floor() == 
actor2->is_on_floor()));
  

Index: actors.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/actors.cc,v
retrieving revision 1.41.2.7
retrieving revision 1.41.2.8
diff -C2 -d -r1.41.2.7 -r1.41.2.8
*** actors.cc   6 Oct 2003 19:15:50 -0000       1.41.2.7
--- actors.cc   9 Oct 2003 16:32:09 -0000       1.41.2.8
***************
*** 349,352 ****
--- 349,353 ----
  
          bool is_dead();
+       bool is_movable() { return (state!=DEAD && state!=RESURRECTED); }
          bool is_flying()        { return state == JUMPING; }
          bool is_on_floor();
***************
*** 398,402 ****
  bool BasicBall::is_dead()
  { 
!     return state == DEAD || state==RESURRECTED; 
  }
  
--- 399,403 ----
  bool BasicBall::is_dead()
  { 
!     return state == DEAD; 
  }
  

Index: objects.hh
===================================================================
RCS file: /cvsroot/enigma/enigma/src/objects.hh,v
retrieving revision 1.49.2.4
retrieving revision 1.49.2.5
diff -C2 -d -r1.49.2.4 -r1.49.2.5
*** objects.hh  6 Oct 2003 19:30:16 -0000       1.49.2.4
--- objects.hh  9 Oct 2003 16:32:09 -0000       1.49.2.5
***************
*** 380,383 ****
--- 380,384 ----
  
          virtual bool is_dead() = 0;
+       virtual bool is_movable() { return true; }
          virtual bool is_flying() { return false; }
          virtual bool is_on_floor() { return true; }