[Enigma-cvs] enigma/src items.cc,1.87.2.3,1.87.2.4

[Daniel Heck <address@hidden>]

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

Modified Files:
      Tag: enigma0_80_rc
        items.cc 
Log Message:
* Fix explosion behaviour on water, swamp, abyss


Index: items.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/items.cc,v
retrieving revision 1.87.2.3
retrieving revision 1.87.2.4
diff -C2 -d -r1.87.2.3 -r1.87.2.4
*** items.cc    23 Sep 2003 22:46:20 -0000      1.87.2.3
--- items.cc    6 Oct 2003 19:33:26 -0000       1.87.2.4
***************
*** 651,657 ****
          break;
      case STRONG:
! //        SendMessage(GetFloor(get_pos()), "explode");
! //        world::KillItem(get_pos());
!         SetItem(get_pos(), MakeItem("it-debris"));
          break;
      }
--- 651,660 ----
          break;
      case STRONG:
! //    SendMessage(GetFloor(get_pos()), "explode");
! //    world::KillItem(get_pos());
!       if (Floor *fl = GetFloor(get_pos()))
!           if (fl->is_destroyable())
!               SetItem(get_pos(), MakeItem("it-debris"));
!       
          break;
      }
***************
*** 749,756 ****
              if (Floor *fl=GetFloor(get_pos())) {
                  const string &k = fl->get_kind();
!                 if (k == "fl-abyss" || k == "fl-water" || k == "fl-swamp") {
!                     SetItem(p, new Explosion(Explosion::WEAK));
!                 }
!                 else if (k == "fl-space") {
                      SetItem(p, new Explosion(Explosion::STRONG));
                  }
--- 752,756 ----
              if (Floor *fl=GetFloor(get_pos())) {
                  const string &k = fl->get_kind();
!                 if (k == "fl-space") {
                      SetItem(p, new Explosion(Explosion::STRONG));
                  }
***************
*** 1679,1683 ****
              if (Floor *fl = GetFloor(p)) {
                  string k = fl->get_kind();
!                 if (k != "fl-abyss" && k != "fl-water" && k != "fl-swamp") {
                      if (Item *it = GetItem(p))
                          SendMessage (it, "crack");
--- 1679,1683 ----
              if (Floor *fl = GetFloor(p)) {
                  string k = fl->get_kind();
!                 if (fl->is_destroyable()) {
                      if (Item *it = GetItem(p))
                          SendMessage (it, "crack");