[Enigma-cvs] enigma/src enigma.cc, 1.27, 1.28 options.cc, 1.26, 1.27 sound.cc, 1.19, 1.20

[Ralf Westram <address@hidden>]

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

Modified Files:
        enigma.cc options.cc sound.cc 
Log Message:
minor changes


Index: sound.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/sound.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** sound.cc    20 Oct 2003 08:05:46 -0000      1.19
--- sound.cc    27 Oct 2003 11:53:17 -0000      1.20
***************
*** 22,26 ****
  #include "oxyd.hh"
  #include "sound.hh"
- #include "system.hh"
  #include "SDL.h"
  #include "SDL_mixer.h"
--- 22,25 ----

Index: options.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/options.cc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** options.cc  22 Oct 2003 21:36:45 -0000      1.26
--- options.cc  27 Oct 2003 11:53:17 -0000      1.27
***************
*** 24,30 ****
  #include "lua.hh"
  #include "options.hh"
- #include "system.hh"
  #include "game.hh"
  #include "px/dict.hh"
  
  #include <cassert>
--- 24,30 ----
  #include "lua.hh"
  #include "options.hh"
  #include "game.hh"
  #include "px/dict.hh"
+ #include "px/system.hh"
  
  #include <cassert>
***************
*** 186,190 ****
  
      if (getenv ("HOME") != 0)
!         fname = sysdep::expand_path ("~/.enigmarc");
  
      return fname;
--- 186,190 ----
  
      if (getenv ("HOME") != 0)
!         fname = px::sysdep::expand_path ("~/.enigmarc");
  
      return fname;

Index: enigma.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/enigma.cc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** enigma.cc   18 Oct 2003 13:49:07 -0000      1.27
--- enigma.cc   27 Oct 2003 11:53:17 -0000      1.28
***************
*** 20,24 ****
  #include "config.h"             // for DEFAULT_DATA_PATH
  #include "enigma.hh"
- #include "system.hh"
  #include "px/px.hh"
  
--- 20,23 ----
***************
*** 87,91 ****
  
  Direction
! direction_fromto(GridPos source, GridPos target) 
  {
      // source and target have to be adjacent
--- 86,90 ----
  
  Direction
! direction_fromto(GridPos source, GridPos target)
  {
      // source and target have to be adjacent
***************
*** 122,126 ****
  
  DirectionBits
! enigma::rotate(DirectionBits d, bool clockwise) 
  {
      if (clockwise) {
--- 121,125 ----
  
  DirectionBits
! enigma::rotate(DirectionBits d, bool clockwise)
  {
      if (clockwise) {
***************
*** 285,289 ****
  }
  
! Direction 
  enigma::to_direction (const Value &v)
  {
--- 284,288 ----
  }
  
! Direction
  enigma::to_direction (const Value &v)
  {
***************
*** 442,446 ****
          bool find_file(const string &filename, string &dest) const;
  
!       std::list <string> find_files (const string &folder, 
                                       const string &filename) const;
  
--- 441,445 ----
          bool find_file(const string &filename, string &dest) const;
  
!       std::list <string> find_files (const string &folder,
                                       const string &filename) const;
  
***************
*** 459,463 ****
  }
  
! void 
  DataPathList::set_path(const string &pathspec)
  {
--- 458,462 ----
  }
  
! void
  DataPathList::set_path(const string &pathspec)
  {
***************
*** 471,480 ****
  
  const string &
! DataPathList::get_path() const 
! { 
!     return path; 
  }
  
! bool 
  DataPathList::find_file(const string &filename, string &dest) const
  {
--- 470,479 ----
  
  const string &
! DataPathList::get_path() const
! {
!     return path;
  }
  
! bool
  DataPathList::find_file(const string &filename, string &dest) const
  {
***************
*** 490,494 ****
  }
  
! std::list <string> 
  DataPathList::find_files(const string &folder, const string &filename) const
  {
--- 489,493 ----
  }
  
! std::list <string>
  DataPathList::find_files(const string &folder, const string &filename) const
  {
***************
*** 505,509 ****
                if( strcmp( entry->d_name, ".") != 0 && strcmp( entry->d_name, 
"..") != 0)
                {
!                   string tmp_name = complete_name + sysdep::path_separator 
                        + string(entry->d_name) + sysdep::path_separator + 
filename;
                    if (sysdep::FileExists (tmp_name))
--- 504,508 ----
                if( strcmp( entry->d_name, ".") != 0 && strcmp( entry->d_name, 
"..") != 0)
                {
!                   string tmp_name = complete_name + sysdep::path_separator
                        + string(entry->d_name) + sysdep::path_separator + 
filename;
                    if (sysdep::FileExists (tmp_name))
***************
*** 517,526 ****
  }
  
! string enigma::GetDataPath() 
  {
      return datapaths.get_path();
  }
  
! void enigma::SetDataPath(const string &p) 
  {
      datapaths.set_path(p);
--- 516,525 ----
  }
  
! string enigma::GetDataPath()
  {
      return datapaths.get_path();
  }
  
! void enigma::SetDataPath(const string &p)
  {
      datapaths.set_path(p);