[Enigma-cvs] enigma/src stones_complex.cc, 1.45.2.7, 1.45.2.8 items.cc, 1.87.2.6, 1.87.2.7

[Daniel Heck <address@hidden>]

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

Modified Files:
      Tag: enigma0_80_rc
        stones_complex.cc items.cc 
Log Message:
Fixed spelling: vulcano -> volcano


Index: stones_complex.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/stones_complex.cc,v
retrieving revision 1.45.2.7
retrieving revision 1.45.2.8
diff -C2 -d -r1.45.2.7 -r1.45.2.8
*** stones_complex.cc   11 Oct 2003 12:37:24 -0000      1.45.2.7
--- stones_complex.cc   11 Oct 2003 13:45:23 -0000      1.45.2.8
***************
*** 805,816 ****
  
  // ------------------------
! //      Vulcano
  // ------------------------
! namespace{
!     class VulcanoStone : public Stone {
!         CLONEOBJ(VulcanoStone);
      public:
          enum State {INACTIVE, ACTIVE, FINISHED, BREAKING};
!         VulcanoStone( State initstate=INACTIVE) : Stone("st-vulcano"), state( 
initstate) {}
      private:
          enum State state;
--- 805,817 ----
  
  // ------------------------
! //      Volcano
  // ------------------------
! namespace
! {
!     class VolcanoStone : public Stone {
!         CLONEOBJ(VolcanoStone);
      public:
          enum State {INACTIVE, ACTIVE, FINISHED, BREAKING};
!         VolcanoStone( State initstate=INACTIVE) : Stone("st-volcano"), state( 
initstate) {}
      private:
          enum State state;
***************
*** 855,859 ****
              Stone *st = GetStone(p);
              if( !st) {
!                 Item *it = MakeItem("it-seed_vulcano");
                  SetItem( p, it);
                  SendMessage( it, "grow");
--- 856,860 ----
              Stone *st = GetStone(p);
              if( !st) {
!                 Item *it = MakeItem("it-seed_volcano");
                  SetItem( p, it);
                  SendMessage( it, "grow");
***************
*** 3054,3060 ****
      Register (new PullStone);
  
!     Register( new VulcanoStone);
!     Register("st-vulcano_inactive", new VulcanoStone(VulcanoStone::INACTIVE));
!     Register("st-vulcano_active", new VulcanoStone(VulcanoStone::ACTIVE));
  
      // PerOxyd/Enigma compatible puzzle stones:
--- 3055,3061 ----
      Register (new PullStone);
  
!     Register( new VolcanoStone);
!     Register("st-volcano_inactive", new VolcanoStone(VolcanoStone::INACTIVE));
!     Register("st-volcano_active", new VolcanoStone(VolcanoStone::ACTIVE));
  
      // PerOxyd/Enigma compatible puzzle stones:

Index: items.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/items.cc,v
retrieving revision 1.87.2.6
retrieving revision 1.87.2.7
diff -C2 -d -r1.87.2.6 -r1.87.2.7
*** items.cc    11 Oct 2003 12:44:23 -0000      1.87.2.6
--- items.cc    11 Oct 2003 13:45:24 -0000      1.87.2.7
***************
*** 951,955 ****
          CLONEOBJ(Seed);
      public:
!         enum Type { WOOD, NOWOOD, VULCANO};
          Seed( Type inittype=WOOD) : Item ("it-seed"), state(IDLE), 
type(inittype) {}
  
--- 951,955 ----
          CLONEOBJ(Seed);
      public:
!         enum Type { WOOD, NOWOOD, VOLCANO };
          Seed( Type inittype=WOOD) : Item ("it-seed"), state(IDLE), 
type(inittype) {}
  
***************
*** 998,1002 ****
                  case WOOD:    model = "st-wood-growing"; break;
                  case NOWOOD:  model = "st-greenbrown-growing"; break;
!                 case VULCANO: model = "st-vulcano-growing"; break;
              }
  
--- 998,1002 ----
                  case WOOD:    model = "st-wood-growing"; break;
                  case NOWOOD:  model = "st-greenbrown-growing"; break;
!                 case VOLCANO: model = "st-volcano-growing"; break;
              }
  
***************
*** 2492,2496 ****
      Register("it-seed_wood", new Seed(Seed::WOOD));
      Register("it-seed_nowood", new Seed(Seed::NOWOOD));
!     Register("it-seed_vulcano", new Seed(Seed::VULCANO));
      Register(new Sensor);
      Register(new ShogunDot);
--- 2492,2496 ----
      Register("it-seed_wood", new Seed(Seed::WOOD));
      Register("it-seed_nowood", new Seed(Seed::NOWOOD));
!     Register("it-seed_volcano", new Seed(Seed::VOLCANO));
      Register(new Sensor);
      Register(new ShogunDot);