[Enigma-cvs] enigma/src oxyd.cc,1.72,1.73

[Ralf Westram <address@hidden>]

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

Modified Files:
        oxyd.cc 
Log Message:
- added get_preview_version
- info about unknown oxyd items goes to log



Index: oxyd.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/oxyd.cc,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** oxyd.cc     27 Oct 2003 13:28:28 -0000      1.72
--- oxyd.cc     30 Oct 2003 19:06:34 -0000      1.73
***************
*** 89,93 ****
          const LevelInfo *get_info (size_t index) const;
  
!         int get_revision_number(size_t /*index*/) const { return 1; } // 
revision is always 1
  
          int get_default_SoundSet() const { return m_version+2; }
--- 89,98 ----
          const LevelInfo *get_info (size_t index) const;
  
!         // revision is always 1 (never DECREASE the revision number! )
!         int get_revision_number(size_t /*index*/) const { return 1; }
! 
!         // increment this to invalidate auto-saved previews for oxyd level 
packs
!         // never DECREASE the preview version!
!         int get_preview_version() const { return 1; }
  
          int get_default_SoundSet() const { return m_version+2; }
***************
*** 376,395 ****
  
          if (!stones.empty()) {
!             fprintf(stderr, "Unknown stones:");
              for (set<int>::iterator i = stones.begin(); i != stones.end(); 
++i)
!                 fprintf(stderr, " %i", *i);
!             fprintf(stderr, "\n");
          }
          if (!items.empty()) {
!             fprintf(stderr, "Unknown items:");
              for (set<int>::iterator i = items.begin(); i != items.end(); ++i)
!                 fprintf(stderr, " %i", *i);
!             fprintf(stderr, "\n");
          }
          if (!floors.empty()) {
!             fprintf(stderr, "Unknown floors:");
              for (set<int>::iterator i = floors.begin(); i != floors.end(); 
++i)
!                 fprintf(stderr, " %i", *i);
!             fprintf(stderr, "\n");
          }
      }
--- 381,400 ----
  
          if (!stones.empty()) {
!             enigma::Log << "Unknown stones:";
              for (set<int>::iterator i = stones.begin(); i != stones.end(); 
++i)
!                 enigma::Log << ' ' << *i;
!             enigma::Log << endl;
          }
          if (!items.empty()) {
!             enigma::Log << "Unknown items:";
              for (set<int>::iterator i = items.begin(); i != items.end(); ++i)
!                 enigma::Log << ' ' << *i;
!             enigma::Log << endl;
          }
          if (!floors.empty()) {
!             enigma::Log << "Unknown floors:";
              for (set<int>::iterator i = floors.begin(); i != floors.end(); 
++i)
!                 enigma::Log << ' ' << *i;
!             enigma::Log << endl;
          }
      }
***************
*** 457,461 ****
                  }
                  else {
!                     fprintf(stderr, "Error in MarbleInfo: missing closing 
parenthesis\n");
                  }
              }
--- 462,466 ----
                  }
                  else {
!                     Log << "Error in MarbleInfo: missing closing parenthesis" 
<< endl;
                  }
              }
***************
*** 472,476 ****
          for (int idx = 0; idx<MAX_MARBLE_INFO_FIELDS; ++idx) {
              if (!interpreted[idx] && !is_default(idx)) {
!                 fprintf(stderr, "MarbleInfo[%i]=%i is not used yet.\n", idx, 
get_value(idx));
              }
          }
--- 477,481 ----
          for (int idx = 0; idx<MAX_MARBLE_INFO_FIELDS; ++idx) {
              if (!interpreted[idx] && !is_default(idx)) {
!                 enigma::Log << "MarbleInfo[" << idx << "]=" << get_value(idx) 
<< " is not used yet." << endl;
              }
          }
***************
*** 527,536 ****
                  double force = minfo.get_value(MI_FORCE) / 10.0 * 2.0; // 
just a guess
                  ac->set_attrib("force", Value(force) );
!                 fprintf(stderr, "Set jack force to %f\n", force);
              }
              if (!minfo.is_default(MI_RANGE)) {
                  double range = minfo.get_value(MI_RANGE) / 32.0; // value 
seems to contain distance in pixels
                  ac->set_attrib("range", Value(range) );
!                 fprintf(stderr, "Set jack range to %f\n", range);
              }
              break;
--- 532,541 ----
                  double force = minfo.get_value(MI_FORCE) / 10.0 * 2.0; // 
just a guess
                  ac->set_attrib("force", Value(force) );
!                 enigma::Log << "Set jack force to " << force << endl;
              }
              if (!minfo.is_default(MI_RANGE)) {
                  double range = minfo.get_value(MI_RANGE) / 32.0; // value 
seems to contain distance in pixels
                  ac->set_attrib("range", Value(range) );
!                 enigma::Log << "Set jack range to " << range << endl;
              }
              break;
***************
*** 540,549 ****
                  double force = minfo.get_value(MI_FORCE) / 10.0 * 2.0; // 
just a guess
                  ac->set_attrib("force", Value(force) );
!                 fprintf(stderr, "Set rotor force to %f\n", force);
              }
              if (!minfo.is_default(MI_RANGE)) {
                  double range = minfo.get_value(MI_RANGE) / 32.0; // value 
seems to contain distance in pixels
                  ac->set_attrib("range", Value(range) );
!                 fprintf(stderr, "Set rotor range to %f\n", range);
              }
              break;
--- 545,554 ----
                  double force = minfo.get_value(MI_FORCE) / 10.0 * 2.0; // 
just a guess
                  ac->set_attrib("force", Value(force) );
!                 enigma::Log << "Set rotor force to " << force << endl;
              }
              if (!minfo.is_default(MI_RANGE)) {
                  double range = minfo.get_value(MI_RANGE) / 32.0; // value 
seems to contain distance in pixels
                  ac->set_attrib("range", Value(range) );
!                 enigma::Log << "Set rotor range to " << range << endl;
              }
              break;
***************
*** 556,560 ****
              break;
          default:
!             fprintf(stderr, "Unhandled actor type %i\n", 
int(marble.getMarbleType()));
              break;
  //         case MarbleType_LifeSpitter:
--- 561,565 ----
              break;
          default:
!             enigma::Log << "Unhandled actor type " << 
int(marble.getMarbleType()) << endl;
              break;
  //         case MarbleType_LifeSpitter: