[Enigma-cvs] enigma/src stones_complex.cc,1.45.2.5,1.45.2.6

[Daniel Heck <address@hidden>]

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

Modified Files:
      Tag: enigma0_80_rc
        stones_complex.cc 
Log Message:
* Use to_direction() where appropriate
* Change direction of BolderStone only if not already falling


Index: stones_complex.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/stones_complex.cc,v
retrieving revision 1.45.2.5
retrieving revision 1.45.2.6
diff -C2 -d -r1.45.2.5 -r1.45.2.6
*** stones_complex.cc   3 Oct 2003 22:22:59 -0000       1.45.2.5
--- stones_complex.cc   6 Oct 2003 19:31:33 -0000       1.45.2.6
***************
*** 358,363 ****
          void message(const string& msg, const Value &val) {
              if (msg == "direction" && val.get_type() == Value::DOUBLE) {
!                 Direction dir = static_cast<Direction>((int)val.get_double());
!                 set_orientation(dir);
                  init_model();
              }
--- 358,362 ----
          void message(const string& msg, const Value &val) {
              if (msg == "direction" && val.get_type() == Value::DOUBLE) {
!                 set_orientation(to_direction(val));
                  init_model();
              }
***************
*** 666,670 ****
                  return;
  
- //             if (impulse.sender && 0 == strncmp(impulse.sender->get_kind(), 
"st-rotator-", 11)) {
              if (impulse.sender && impulse.sender->is_kind("st-rotator")) {
                  set_dir(impulse.dir);
--- 665,668 ----
***************
*** 677,683 ****
  
          void message(const string& msg, const Value &val) {
!             if (msg == "direction" && val.get_type() == Value::DOUBLE) {
!                 Direction dir = static_cast<Direction>((int)val.get_double());
!                 set_dir(dir);
                  init_model();
              }
--- 675,680 ----
  
          void message(const string& msg, const Value &val) {
!             if (msg == "direction" && state != FALLING) {
!                 set_dir (to_direction(val));
                  init_model();
              }
***************
*** 1359,1363 ****
  
  void
! PuzzleStone::message(const string& msg, const Value &val) {
      if (msg == "scramble") {
          // oxyd levels contain explicit information on how to
--- 1356,1361 ----
  
  void
! PuzzleStone::message(const string& msg, const Value &val) 
! {
      if (msg == "scramble") {
          // oxyd levels contain explicit information on how to
***************
*** 1369,1373 ****
          // AddScramble() and SetScrambleIntensity()
  
!         Direction dir = static_cast<Direction>((int)val.get_double());
          Cluster   c;
          find_row_or_column_cluster(c, get_pos(), dir, oxyd1_compatible());
--- 1367,1371 ----
          // AddScramble() and SetScrambleIntensity()
  
!         Direction dir = to_direction(val);
          Cluster   c;
          find_row_or_column_cluster(c, get_pos(), dir, oxyd1_compatible());