[Adonthell-commits] CVS: adonthell/src animation.cc,1.9.4.1,1.9.4.2 character_base.cc,1.10.2.1,1.10.2.2 event.cc,1.12.2.6,1.12.2.7 event_list.cc,1.1.2.3,1.1.2.4 event_list.h,1.1.2.3,1.1.2.4 image.cc,1.8.2.5,1.8.2.6 landmap.h,1.24.4.12,1.24.4.13 map_character_with_gfx.cc,1.1.2.11,1.1.2.12 map_coordinates.cc,1.1.2.3,1.1.2.4 map_object_with_gfx.cc,1.1.2.11,1.1.2.12 map_placeable_area_gfx.cc,1.1.2.3,1.1.2.4 map_placeable_model_gfx.cc,1.1.2.6,1.1.2.7 py_object.cc,1.10.2.3,1.10.2.4 screen.cc,1.12.2.3,1.12.2.4 storage.h,1.23.2.1,1.23.2.2 str_hash.h,1.3,1.3.2.1 surface.cc,1.9.2.4,1.9.2.5

[Alexandre Courbot <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv12035/src

Modified Files:
      Tag: Branch_road_to_0-4
        animation.cc character_base.cc event.cc event_list.cc 
        event_list.h image.cc landmap.h map_character_with_gfx.cc 
        map_coordinates.cc map_object_with_gfx.cc 
        map_placeable_area_gfx.cc map_placeable_model_gfx.cc 
        py_object.cc screen.cc storage.h str_hash.h surface.cc 
Log Message:
First cleanup for GCC 3.1 compliance


Index: animation.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/animation.cc,v
retrieving revision 1.9.4.1
retrieving revision 1.9.4.2
diff -C2 -r1.9.4.1 -r1.9.4.2
*** animation.cc        11 Apr 2002 14:08:42 -0000      1.9.4.1
--- animation.cc        25 Jun 2002 14:11:22 -0000      1.9.4.2
***************
*** 139,144 ****
  }
   
! void animation::draw (s_int16 x, s_int16 y, const drawing_area * da_opt = 
NULL, 
!                       surface *target = NULL) const
  {
      t_frame[frame[currentframe ()].image_nbr ()]->
--- 139,144 ----
  }
   
! void animation::draw (s_int16 x, s_int16 y, const drawing_area * da_opt, 
!                       surface *target) const
  {
      t_frame[frame[currentframe ()].image_nbr ()]->

Index: character_base.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/character_base.cc,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -r1.10.2.1 -r1.10.2.2
*** character_base.cc   11 Apr 2002 14:21:00 -0000      1.10.2.1
--- character_base.cc   25 Jun 2002 14:11:22 -0000      1.10.2.2
***************
*** 25,29 ****
  
  #include "character_base.h"
! #include <iostream.h>
  
  character_base::character_base ()
--- 25,29 ----
  
  #include "character_base.h"
! #include <iostream>
  
  character_base::character_base ()

Index: event.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/event.cc,v
retrieving revision 1.12.2.6
retrieving revision 1.12.2.7
diff -C2 -r1.12.2.6 -r1.12.2.7
*** event.cc    16 Jun 2002 20:55:38 -0000      1.12.2.6
--- event.cc    25 Jun 2002 14:11:22 -0000      1.12.2.7
***************
*** 72,76 ****
  
  // set a script as event's action
! void event::set_script (string filename, PyObject * args = NULL)
  {
      // cleanup
--- 72,76 ----
  
  // set a script as event's action
! void event::set_script (string filename, PyObject * args)
  {
      // cleanup

Index: event_list.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Attic/event_list.cc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** event_list.cc       10 Jun 2002 13:15:04 -0000      1.1.2.3
--- event_list.cc       25 Jun 2002 14:11:22 -0000      1.1.2.4
***************
*** 65,69 ****
  void event_list::put_state (ogzstream& out) const
  {
!     vector <event *>::iterator i;
      u_int32 nbr_events = events.size ();
      
--- 65,69 ----
  void event_list::put_state (ogzstream& out) const
  {
!     std::vector <event *>::iterator i;
      u_int32 nbr_events = events.size ();
      

Index: event_list.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Attic/event_list.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** event_list.h        10 Jun 2002 13:15:04 -0000      1.1.2.3
--- event_list.h        25 Jun 2002 14:11:22 -0000      1.1.2.4
***************
*** 107,111 ****
       * List of events.
       */ 
!     mutable vector<event*> events;
  
  private:
--- 107,111 ----
       * List of events.
       */ 
!     mutable std::vector<event*> events;
  
  private:

Index: image.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/image.cc,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -C2 -r1.8.2.5 -r1.8.2.6
*** image.cc    20 Apr 2002 16:54:10 -0000      1.8.2.5
--- image.cc    25 Jun 2002 14:11:22 -0000      1.8.2.6
***************
*** 248,252 ****
  }
   
! void image::zoom (const surface& src, u_int16 l, u_int16 h, u_int16 x = 0, 
u_int16 y = 0)
  { 
      // Calculate the step per pixel.
--- 248,252 ----
  }
   
! void image::zoom (const surface& src, u_int16 l, u_int16 h, u_int16 x, 
u_int16 y)
  { 
      // Calculate the step per pixel.
***************
*** 282,286 ****
  }
  
! void image::tile (const surface& src, u_int16 l, u_int16 h, u_int16 x = 0, 
u_int16 y = 0)
  {
      u_int16 posx;
--- 282,286 ----
  }
  
! void image::tile (const surface& src, u_int16 l, u_int16 h, u_int16 x, 
u_int16 y)
  {
      u_int16 posx;
***************
*** 296,300 ****
  }
  
! void image::brightness (const surface& src, u_int8 cont, bool proceed_mask = 
false)
  {
      u_int16 i, j;
--- 296,300 ----
  }
  
! void image::brightness (const surface& src, u_int8 cont, bool proceed_mask)
  {
      u_int16 i, j;

Index: landmap.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/landmap.h,v
retrieving revision 1.24.4.12
retrieving revision 1.24.4.13
diff -C2 -r1.24.4.12 -r1.24.4.13
*** landmap.h   9 Apr 2002 12:29:55 -0000       1.24.4.12
--- landmap.h   25 Jun 2002 14:11:22 -0000      1.24.4.13
***************
*** 105,114 ****
          {
              if(handle_gfx)
!                 for (vector<T *>::iterator i = objects.begin();
                       i != objects.end(); i++)
                      // FIXME: check whether it works or not.
                      delete ((T_gfx*)*i);
              else
!                 for (vector<T *>::iterator i = objects.begin();
                       i != objects.end(); i++)
                      delete *i;
--- 105,114 ----
          {
              if(handle_gfx)
!                 for (typename vector<T *>::iterator i = objects.begin();
                       i != objects.end(); i++)
                      // FIXME: check whether it works or not.
                      delete ((T_gfx*)*i);
              else
!                 for (typename vector<T *>::iterator i = objects.begin();
                       i != objects.end(); i++)
                      delete *i;
***************
*** 125,129 ****
          bool update_nogfx()
          {
!             for (vector<T *>::iterator i = objects.begin();
                   i != objects.end(); i++)
                  (*i)->update();
--- 125,129 ----
          bool update_nogfx()
          {
!             for (typename vector<T *>::iterator i = objects.begin();
                   i != objects.end(); i++)
                  (*i)->update();
***************
*** 134,138 ****
          bool update_gfx()
          {
!             for (vector<T *>::iterator i = objects.begin();
                   i != objects.end(); i++)
              {
--- 134,138 ----
          bool update_gfx()
          {
!             for (typename vector<T *>::iterator i = objects.begin();
                   i != objects.end(); i++)
              {

Index: map_character_with_gfx.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Attic/map_character_with_gfx.cc,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -r1.1.2.11 -r1.1.2.12
*** map_character_with_gfx.cc   9 Apr 2002 12:29:55 -0000       1.1.2.11
--- map_character_with_gfx.cc   25 Jun 2002 14:11:22 -0000      1.1.2.12
***************
*** 230,235 ****
  }
  
! void map_character_with_gfx::draw (s_int16 x, s_int16 y, const drawing_area * 
da_opt = NULL,
!                                    surface * target = NULL)
  {
      draw_shadow(x, y, da_opt, target);
--- 230,235 ----
  }
  
! void map_character_with_gfx::draw (s_int16 x, s_int16 y, const drawing_area * 
da_opt,
!                                    surface * target)
  {
      draw_shadow(x, y, da_opt, target);
***************
*** 238,243 ****
  }
  
! void map_character_with_gfx::draw_shadow (s_int16 x, s_int16 y, const 
drawing_area * da_opt = NULL,
!                                    surface * target = NULL)
  {
      shadow.draw(x, y + 25 - zground, da_opt, target);
--- 238,243 ----
  }
  
! void map_character_with_gfx::draw_shadow (s_int16 x, s_int16 y, const 
drawing_area * da_opt,
!                                    surface * target)
  {
      shadow.draw(x, y + 25 - zground, da_opt, target);

Index: map_coordinates.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Attic/map_coordinates.cc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** map_coordinates.cc  30 Mar 2002 17:06:25 -0000      1.1.2.3
--- map_coordinates.cc  25 Jun 2002 14:11:22 -0000      1.1.2.4
***************
*** 25,29 ****
  }
  
! map_coordinates::map_coordinates (u_int16 x, u_int16 y, u_int16 z, u_int16 ox 
= 0, u_int16 oy = 0)
  {
      X = x; 
--- 25,29 ----
  }
  
! map_coordinates::map_coordinates (u_int16 x, u_int16 y, u_int16 z, u_int16 
ox, u_int16 oy)
  {
      X = x; 

Index: map_object_with_gfx.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Attic/map_object_with_gfx.cc,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -r1.1.2.11 -r1.1.2.12
*** map_object_with_gfx.cc      2 Apr 2002 20:04:17 -0000       1.1.2.11
--- map_object_with_gfx.cc      25 Jun 2002 14:11:22 -0000      1.1.2.12
***************
*** 80,85 ****
  }
  
! void map_object_with_gfx::draw (s_int16 x, s_int16 y, const drawing_area * 
da_opt = NULL,
!                                    surface * target = NULL) const
  {
      map_placeable_model_gfx::draw(x, y, da_opt, target);
--- 80,85 ----
  }
  
! void map_object_with_gfx::draw (s_int16 x, s_int16 y, const drawing_area * 
da_opt,
!                                    surface * target) const
  {
      map_placeable_model_gfx::draw(x, y, da_opt, target);

Index: map_placeable_area_gfx.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Attic/map_placeable_area_gfx.cc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** map_placeable_area_gfx.cc   10 Mar 2002 18:42:07 -0000      1.1.2.3
--- map_placeable_area_gfx.cc   25 Jun 2002 14:11:22 -0000      1.1.2.4
***************
*** 26,31 ****
  }
  
! void map_placeable_area_gfx::draw(s_int16 x, s_int16 y, const drawing_area * 
da_opt = NULL,
!                                    surface * target = NULL) const
  {
      if(anim)
--- 26,31 ----
  }
  
! void map_placeable_area_gfx::draw(s_int16 x, s_int16 y, const drawing_area * 
da_opt,
!                                    surface * target) const
  {
      if(anim)

Index: map_placeable_model_gfx.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Attic/map_placeable_model_gfx.cc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** map_placeable_model_gfx.cc  28 Mar 2002 17:59:30 -0000      1.1.2.6
--- map_placeable_model_gfx.cc  25 Jun 2002 14:11:22 -0000      1.1.2.7
***************
*** 95,100 ****
  }
  
! void map_placeable_model_gfx::draw (s_int16 x, s_int16 y, const drawing_area 
* da_opt = NULL,
!                                     surface * target = NULL) const
  {
      if (Current_gfx != Gfxs.end ())
--- 95,100 ----
  }
  
! void map_placeable_model_gfx::draw (s_int16 x, s_int16 y, const drawing_area 
* da_opt,
!                                     surface * target) const
  {
      if (Current_gfx != Gfxs.end ())
***************
*** 115,120 ****
  
  void map_placeable_model_gfx::draw_walkable(s_int16 x, s_int16 y, 
!                                             const drawing_area * da_opt = 
NULL,
!                                             surface * target = NULL) const
  {
      image im(mapsquare_size, mapsquare_size);
--- 115,120 ----
  
  void map_placeable_model_gfx::draw_walkable(s_int16 x, s_int16 y, 
!                                             const drawing_area * da_opt,
!                                             surface * target) const
  {
      image im(mapsquare_size, mapsquare_size);
***************
*** 140,145 ****
  
  void map_placeable_model_gfx::draw_border(s_int16 x, s_int16 y, 
!                                           const drawing_area * da_opt = NULL,
!                                           surface * target = NULL) const
  {
      map_placeable_area * st = Target.current_state();
--- 140,145 ----
  
  void map_placeable_model_gfx::draw_border(s_int16 x, s_int16 y, 
!                                           const drawing_area * da_opt,
!                                           surface * target) const
  {
      map_placeable_area * st = Target.current_state();

Index: py_object.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/py_object.cc,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -C2 -r1.10.2.3 -r1.10.2.4
*** py_object.cc        14 Jun 2002 08:55:41 -0000      1.10.2.3
--- py_object.cc        25 Jun 2002 14:11:22 -0000      1.10.2.4
***************
*** 112,116 ****
  
  // Execute the body of the script
! void py_object::call_method (const string & name, PyObject * args = NULL)
  {
      if (Instance)
--- 112,116 ----
  
  // Execute the body of the script
! void py_object::call_method (const string & name, PyObject * args)
  {
      if (Instance)

Index: screen.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/screen.cc,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -C2 -r1.12.2.3 -r1.12.2.4
*** screen.cc   20 Apr 2002 16:54:10 -0000      1.12.2.3
--- screen.cc   25 Jun 2002 14:11:22 -0000      1.12.2.4
***************
*** 45,49 ****
  }
  
! void screen::set_video_mode (u_int16 nl, u_int16 nh, u_int8 depth = 0)
  {
      u_int8 bpp;
--- 45,49 ----
  }
  
! void screen::set_video_mode (u_int16 nl, u_int16 nh, u_int8 depth)
  {
      u_int8 bpp;

Index: storage.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/storage.h,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -C2 -r1.23.2.1 -r1.23.2.2
*** storage.h   11 Apr 2002 14:08:42 -0000      1.23.2.1
--- storage.h   25 Jun 2002 14:11:22 -0000      1.23.2.2
***************
*** 39,42 ****
--- 39,50 ----
  #include "types.h"
  
+ struct eqstr
+ {
+   bool operator()(const char* s1, const char* s2) const
+   {
+     return strcmp(s1, s2) == 0;
+   }
+ };
+ 
  using std::hash_map; 
  using std::map; 

Index: str_hash.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/str_hash.h,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** str_hash.h  31 Jan 2002 08:58:29 -0000      1.3
--- str_hash.h  25 Jun 2002 14:11:22 -0000      1.3.2.1
***************
*** 31,42 ****
  #include <string>
  
! namespace std 
  {
!       
! template<> struct hash<string> {
!     size_t operator()(const string& s) const {
!       return __stl_hash_string(s.c_str());
! }};
  
- }; // namespace std
  #endif
--- 31,51 ----
  #include <string>
  
! #if __GNUG__ > 2
! namespace __gnu_cxx
! #else
! namespace std
! #endif
  {
!     template<> struct hash<std::string>
!     {
!         size_t operator()(const std::string & __s) const { return 
__stl_hash_string(__s.c_str()); }
!     };
!     
!     
! };
! 
! #if __GNUG__ > 2
! namespace std { using namespace __gnu_cxx; };
! #endif
  
  #endif

Index: surface.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/surface.cc,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -C2 -r1.9.2.4 -r1.9.2.5
*** surface.cc  11 Apr 2002 14:08:42 -0000      1.9.2.4
--- surface.cc  25 Jun 2002 14:11:22 -0000      1.9.2.5
***************
*** 60,65 ****
   
  void surface::draw (s_int16 x, s_int16 y, s_int16 sx, s_int16 sy, u_int16 sl,
!                     u_int16 sh, const drawing_area * da_opt = NULL,
!                     surface * target = NULL) const
  { 
      if (target == NULL) target = &screen::display; 
--- 60,65 ----
   
  void surface::draw (s_int16 x, s_int16 y, s_int16 sx, s_int16 sy, u_int16 sl,
!                     u_int16 sh, const drawing_area * da_opt,
!                     surface * target) const
  { 
      if (target == NULL) target = &screen::display; 
***************
*** 87,91 ****
  
  void surface::fillrect (s_int16 x, s_int16 y, u_int16 l, u_int16 h, u_int32 
col, 
!                         drawing_area * da_opt = NULL)
  {
      if (da_opt) 
--- 87,91 ----
  
  void surface::fillrect (s_int16 x, s_int16 y, u_int16 l, u_int16 h, u_int32 
col, 
!                         drawing_area * da_opt)
  {
      if (da_opt) 
***************
*** 106,110 ****
  
  void surface::draw_line(const s_int16 x1, const s_int16 y1, const s_int16 x2, 
const s_int16 y2, 
!                         const u_int32 color, const drawing_area * da_opt = 
NULL)
  {
     int i;
--- 106,110 ----
  
  void surface::draw_line(const s_int16 x1, const s_int16 y1, const s_int16 x2, 
const s_int16 y2, 
!                         const u_int32 color, const drawing_area * da_opt)
  {
     int i;