[Enigma-cvs] enigma/src items.cc,1.87.2.5,1.87.2.6

[Daniel Heck <address@hidden>]

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

Modified Files:
      Tag: enigma0_80_rc
        items.cc 
Log Message:
* Explosions create pits only if floor destructible
* Dynamite: no special  handling for fl-floor


Index: items.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/items.cc,v
retrieving revision 1.87.2.5
retrieving revision 1.87.2.6
diff -C2 -d -r1.87.2.5 -r1.87.2.6
*** items.cc    10 Oct 2003 16:48:12 -0000      1.87.2.5
--- items.cc    11 Oct 2003 12:44:23 -0000      1.87.2.6
***************
*** 648,656 ****
          break;
      case MEDIUM:
!         SetItem(get_pos(), MakeItem("it-hollow"));
          break;
      case STRONG:
- //    SendMessage(GetFloor(get_pos()), "explode");
- //    world::KillItem(get_pos());
        if (Floor *fl = GetFloor(get_pos()))
            if (fl->is_destroyable())
--- 648,656 ----
          break;
      case MEDIUM:
!       if (Floor *fl = GetFloor(get_pos()))
!           if (fl->is_destroyable())
!                 SetItem(get_pos(), MakeItem("it-hollow"));
          break;
      case STRONG:
        if (Floor *fl = GetFloor(get_pos()))
            if (fl->is_destroyable())
***************
*** 666,690 ****
  //----------------------------------------
  
- /** \page it-document Document Item
- 
- This item looks like a piece of paper and contains text messages
- that can be displayed by activating the item.
- 
- \subsection documenta Attributes
- 
- \b text:     The message to be displayed.
- 
- \subsection documente Example
- \verbatim
- set_item("it-document", 1,1, {text="Hello World!"})
- \endverbatim
- 
- or, equivalently,
- \verbatim
- document(1,1, "Hello World")
- \endverbatim
- \image html it-document.png
- */
- 
  namespace
  {
--- 666,669 ----
***************
*** 750,759 ****
              play_sound("explosion2");
              SetItem(p, new Explosion(Explosion::MEDIUM));
-             if (Floor *fl=GetFloor(get_pos())) {
-                 const string &k = fl->get_kind();
-                 if (k == "fl-space") {
-                     SetItem(p, new Explosion(Explosion::STRONG));
-                 }
-             }
          }
  
--- 729,732 ----
***************
*** 1274,1278 ****
      if (near_center_p(actor)) {
          display::AddEffect (get_pos().center(), "ring-anim");
!         double x, y;
          if (double_attrib("targetx", &x) && double_attrib("targety", &y)) {
              play_sound("warp");
--- 1247,1251 ----
      if (near_center_p(actor)) {
          display::AddEffect (get_pos().center(), "ring-anim");
!         double x=0, y=0;
          if (double_attrib("targetx", &x) && double_attrib("targety", &y)) {
              play_sound("warp");