[Enigma-cvs] enigma/src items.cc,1.94,1.95

[Daniel Heck <address@hidden>]

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

Modified Files:
        items.cc 
Log Message:
Adapt to new options code.


Index: items.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/items.cc,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** items.cc    9 Nov 2003 11:45:06 -0000       1.94
--- items.cc    16 Nov 2003 19:28:01 -0000      1.95
***************
*** 1175,1180 ****
          }
          void on_removal() {
!             world::RemoveForceField(&ff);
              Item::on_removal();
          }
          bool actor_hit(Actor */*a*/) { return false; }
--- 1175,1181 ----
          }
          void on_removal() {
!             cout << "removing magnet at " << get_pos() << endl;
              Item::on_removal();
+             world::RemoveForceField(&ff);
          }
          bool actor_hit(Actor */*a*/) { return false; }
***************
*** 2299,2303 ****
                  // does not work in on_creation() because items are created
                  // before stones are created.
!                 if (options::Difficulty == DIFFICULTY_EASY) {
                      KillStone(get_pos());
                  }
--- 2300,2304 ----
                  // does not work in on_creation() because items are created
                  // before stones are created.
!                 if (GetDifficulty() == DIFFICULTY_EASY) {
                      KillStone(get_pos());
                  }