[Enigma-cvs] enigma/src stones_simple.cc,1.53.2.4,1.53.2.5

[Daniel Heck <address@hidden>]

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

Modified Files:
      Tag: enigma0_80_rc
        stones_simple.cc 
Log Message:
* Fixed spelling: vulcano -> volcano
* Slight improvements to st-window


Index: stones_simple.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/stones_simple.cc,v
retrieving revision 1.53.2.4
retrieving revision 1.53.2.5
diff -C2 -d -r1.53.2.4 -r1.53.2.5
*** stones_simple.cc    3 Oct 2003 13:44:29 -0000       1.53.2.4
--- stones_simple.cc    11 Oct 2003 13:48:06 -0000      1.53.2.5
***************
*** 529,551 ****
              if (state == IDLE)
              {
!                 if (a->get_vel() * sc.normal < -25 ) {
!                     play_sound("shatter");
!                     state = BREAK;
!                     set_anim("st-window-anim");
!                 }
!             }
!             {
!                 if (a->get_vel() * sc.normal < -28 ) {
                      play_sound("shatter");
                      state = BREAK;
                      set_anim("st-window-anim");
-                     SendMessage(a, "shatter");
                  }
              }
          }
          void animcb() {
!             if (state == BREAK) {
!                 KillStone(get_pos());
!             }
          }
      };
--- 529,546 ----
              if (state == IDLE)
              {
!               double impulse = -(a->get_vel() * sc.normal) * a->get_mass();
!               if (impulse > 30) {
!                   SendMessage(a, "shatter");
!               }
!                 
!               if (impulse > 25) {
                      play_sound("shatter");
                      state = BREAK;
                      set_anim("st-window-anim");
                  }
              }
          }
          void animcb() {
!             KillStone(get_pos());
          }
      };
***************
*** 1060,1071 ****
      };
  
!     class VulcanoStone_Growing : public Stone {
!         CLONEOBJ(VulcanoStone_Growing);
      public:
!         VulcanoStone_Growing() : Stone("st-vulcano-growing") {}
      private:
!         void init_model() { set_anim("st-vulcano-growing"); }
          void animcb() {
!             Stone *st = world::MakeStone("st-vulcano_active");
              world::ReplaceStone(get_pos(), st);
              st->floor_change(); // instantly builds a bridge on fl-swamp etc
--- 1055,1066 ----
      };
  
!     class VolcanoStone_Growing : public Stone {
!         CLONEOBJ(VolcanoStone_Growing);
      public:
!         VolcanoStone_Growing() : Stone("st-volcano-growing") {}
      private:
!         void init_model() { set_anim("st-volcano-growing"); }
          void animcb() {
!             Stone *st = world::MakeStone("st-volcano_active");
              world::ReplaceStone(get_pos(), st);
              st->floor_change(); // instantly builds a bridge on fl-swamp etc
***************
*** 2376,2380 ****
      Register(new WoodenStone_Growing);
      Register(new GreenbrownStone_Growing);
!     Register(new VulcanoStone_Growing);
  
      Register(new YinYangStone1);
--- 2371,2375 ----
      Register(new WoodenStone_Growing);
      Register(new GreenbrownStone_Growing);
!     Register(new VolcanoStone_Growing);
  
      Register(new YinYangStone1);