[Enigma-cvs] enigma/src stones_simple.cc, 1.55, 1.56 objects.hh, 1.51, 1.52 main.cc, 1.22, 1.23 levels.hh, 1.1, 1.2 gui.hh, 1.14, 1.15 floors.cc, 1.1, 1.2

[Daniel Heck <address@hidden>]

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

Modified Files:
        stones_simple.cc objects.hh main.cc levels.hh gui.hh floors.cc 
Log Message:
Many small fixes


Index: stones_simple.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/stones_simple.cc,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** stones_simple.cc    20 Oct 2003 08:05:46 -0000      1.55
--- stones_simple.cc    20 Oct 2003 16:21:41 -0000      1.56
***************
*** 2264,2268 ****
                                         display::TEXT_5SECONDS,
                                         true);
!                             }
                      init_model();
                  } else {
--- 2264,2268 ----
                                         display::TEXT_5SECONDS,
                                         true);
!                   }
                      init_model();
                  } else {

Index: gui.hh
===================================================================
RCS file: /cvsroot/enigma/enigma/src/gui.hh,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** gui.hh      20 Oct 2003 08:05:45 -0000      1.14
--- gui.hh      20 Oct 2003 16:21:41 -0000      1.15
***************
*** 247,251 ****
          virtual int get_value() const              = 0;
          virtual void set_value(int value)          = 0;
!         virtual string build_text(int value) const = 0;
  
          bool inc_value(int offset);
--- 247,251 ----
          virtual int get_value() const              = 0;
          virtual void set_value(int value)          = 0;
!         virtual std::string build_text(int value) const = 0;
  
          bool inc_value(int offset);

Index: main.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/main.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** main.cc     20 Oct 2003 08:05:45 -0000      1.22
--- main.cc     20 Oct 2003 16:21:41 -0000      1.23
***************
*** 48,57 ****
      Nulbuf* nullbuffer = new Nulbuf;
  }
- 
- 
  
! //======================================================================
! // APPLICATION DATA
! //======================================================================
  namespace enigma
  {
--- 48,54 ----
      Nulbuf* nullbuffer = new Nulbuf;
  }
  
! /* -------------------- Variables -------------------- */
! 
  namespace enigma
  {
***************
*** 72,78 ****
  static std::fstream logfile;
  
! //----------------------------------------------------------------------
! // Startup
! //----------------------------------------------------------------------
  
  static void usage()
--- 69,74 ----
  static std::fstream logfile;
  
! 
! /* -------------------- Functions -------------------- */
  
  static void usage()
***************
*** 94,100 ****
      public:
          enum {
!             OPT_NOSOUND, OPT_NOMUSIC, OPT_VERSION, OPT_HELP,
!             OPT_WINDOW, OPT_WIZARD, OPT_NOGRAB, OPT_ZOOM, OPT_LOG,
!             OPT_GAME, OPT_DUMPINFO
          };
  
--- 90,94 ----
      public:
          enum {
!             OPT_WINDOW, OPT_ZOOM, OPT_GAME
          };
  
***************
*** 105,119 ****
              gamename = "";
  
!             def (OPT_NOSOUND,   0,   "nosound");
!             def (OPT_NOMUSIC,   0,   "nomusic");
!             def (OPT_VERSION,   0,  "version");
!             def (OPT_HELP,      'h', "help");
!             def (OPT_WINDOW,    'w', "window");
!             def (OPT_WIZARD,    0,   "wizard");
!             def (OPT_NOGRAB,    0,   "nograb");
!             def (OPT_ZOOM,      0,   "zoom");
!             def (OPT_LOG,       'l', "log");
!             def (OPT_GAME,      'g', "game", true);
!             def (OPT_DUMPINFO,  0,   "dumpinfo");
          }
  
--- 99,113 ----
              gamename = "";
  
!             def (&nosound,            "nosound");
!             def (&nomusic,            "nomusic");
!             def (&show_version,       "version");
!             def (&show_help,          "help", 'h');
!             def (&options::WizardMode,        "wizard");
!             def (&options::Nograb,    "nograb");
!             def (&do_log,             "log", 'l');
!             def (&dumpinfo,           "dumpinfo");
!             def (OPT_WINDOW,          "window",  'w');
!             def (OPT_ZOOM,            "zoom");
!             def (OPT_GAME,            "game", 'l', true);
          }
  
***************
*** 126,140 ****
          void on_option (int id, const string &param) {
              switch (id) {
-             case OPT_NOSOUND: nosound=true; break;
-             case OPT_NOMUSIC: nomusic=true; break;
-             case OPT_VERSION: show_version=true; break;
-             case OPT_HELP:    show_help=true; break;
              case OPT_WINDOW:  options::FullScreen=false; break;
-             case OPT_WIZARD:  options::WizardMode=true; break;
-             case OPT_NOGRAB:  options::Nograb=true; break;
              case OPT_ZOOM:    options::Nozoom=false; break;
              case OPT_GAME:    gamename = param; break;
-             case OPT_LOG:     do_log = true; break;
-             case OPT_DUMPINFO:dumpinfo = true; break;
              }
          }
--- 120,126 ----

Index: objects.hh
===================================================================
RCS file: /cvsroot/enigma/enigma/src/objects.hh,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** objects.hh  20 Oct 2003 08:05:46 -0000      1.51
--- objects.hh  20 Oct 2003 16:21:41 -0000      1.52
***************
*** 131,139 ****
          virtual const ObjectTraits *get_traits() const { return 0; }
          virtual void warning(const char *format, ...) const;
!     private:
          typedef px::AssocList<std::string, Value> AttribMap;
-         AttribMap                                 attribs;
-     public:
          const AttribMap &get_attribs() const { return attribs; }
      };
  }
--- 131,139 ----
          virtual const ObjectTraits *get_traits() const { return 0; }
          virtual void warning(const char *format, ...) const;
! 
          typedef px::AssocList<std::string, Value> AttribMap;
          const AttribMap &get_attribs() const { return attribs; }
+     private:
+         AttribMap                                 attribs;
      };
  }

Index: floors.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/floors.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** floors.cc   20 Oct 2003 08:10:09 -0000      1.1
--- floors.cc   20 Oct 2003 16:21:42 -0000      1.2
***************
*** 23,26 ****
--- 23,28 ----
  #include "object_mixins.hh"
  
+ #include <ostream>
+ 
  using namespace world;
  using namespace std;
***************
*** 182,186 ****
      int t=int_attrib("type");
      if (t < MINTYPE || t>MAXTYPE) {
!         enigma::Log << "Gradient: Illegal type="<< int(t) << endl;
          t=MINTYPE;
      }
--- 184,188 ----
      int t=int_attrib("type");
      if (t < MINTYPE || t>MAXTYPE) {
!         enigma::Log << "Gradient: Illegal type="<< int(t) << std::endl;
          t=MINTYPE;
      }

Index: levels.hh
===================================================================
RCS file: /cvsroot/enigma/enigma/src/levels.hh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** levels.hh   20 Oct 2003 08:10:09 -0000      1.1
--- levels.hh   20 Oct 2003 16:21:41 -0000      1.2
***************
*** 21,26 ****
--- 21,30 ----
  #define LEVELS_HH
  
+ #include <string>
+ 
  namespace levels
  {
+     using std::string;
+ 
      /* Enigma can run its own levels but also emulate various versions
         of Oxyd.  All these games behave similarly, but there are also