enigma-cvs
[Top][All Lists]
Advanced

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

[Enigma-cvs] enigma/src world.cc,1.72.2.9,1.72.2.10


From: Daniel Heck <address@hidden>
Subject: [Enigma-cvs] enigma/src world.cc,1.72.2.9,1.72.2.10
Date: Mon, 06 Oct 2003 19:27:47 +0000

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

Modified Files:
      Tag: enigma0_80_rc
        world.cc 
Log Message:
Call Stone::actor_hit() only when playing sound


Index: world.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/world.cc,v
retrieving revision 1.72.2.9
retrieving revision 1.72.2.10
diff -C2 -d -r1.72.2.9 -r1.72.2.10
*** world.cc    5 Oct 2003 13:34:49 -0000       1.72.2.9
--- world.cc    6 Oct 2003 19:27:44 -0000       1.72.2.10
***************
*** 641,650 ****
      if (sc.is_collision) {
          if (!sc.fake_collision && sc.response == STONE_REBOUND) {
- 
-             if (Stone *stone = world::GetStone(sc.stonepos))
-                 stone->actor_hit(sc);
- 
- //            ai.pos = ai.oldpos;
              if (length(ai.vel) > 0.1) {
                  display::AddEffect (sc.contact_point, "ring-anim");
                  sound::PlaySound(sc.sound.c_str(), sc.contact_point);
--- 641,648 ----
      if (sc.is_collision) {
          if (!sc.fake_collision && sc.response == STONE_REBOUND) {
              if (length(ai.vel) > 0.1) {
+               if (Stone *stone = world::GetStone(sc.stonepos))
+                   stone->actor_hit(sc);
+ 
                  display::AddEffect (sc.contact_point, "ring-anim");
                  sound::PlaySound(sc.sound.c_str(), sc.contact_point);





reply via email to

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