[Adonthell-commits] CVS: adonthell/src main.cc,1.48,1.49 prefs.cc,1.22,1.23 screen.cc,1.17,1.18 surface.cc,1.12,1.13

[Alexandre Courbot <address@hidden>]

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

Modified Files:
        main.cc prefs.cc screen.cc surface.cc 
Log Message:
ADDED changes that make the game working on the Sharp Zaurus
REMOVED all trace of gfx hw acceleration, for the Windows port


Index: main.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/main.cc,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** main.cc     15 Jun 2002 08:37:25 -0000      1.48
--- main.cc     29 Jul 2002 13:00:49 -0000      1.49
***************
*** 91,94 ****
--- 91,95 ----
   * 
   */
+ extern "C"
  int main(int argc, char * argv[])
  {
***************
*** 133,137 ****
--- 134,140 ----
      screen::set_video_mode (320, 240, 0, myconfig.double_screen, 
myconfig.screen_mode);
  
+ #ifdef DEBUG
      printf("%s\n", screen::info().c_str());
+ #endif
       
      // init audio subsystem

Index: prefs.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/prefs.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** prefs.cc    28 Jun 2002 12:15:20 -0000      1.22
--- prefs.cc    29 Jul 2002 13:00:49 -0000      1.23
***************
*** 44,48 ****
--- 44,52 ----
      // set some default values where possible
      screen_mode = 0;                // Fullscreen
+ #ifdef QTOPIA
+     double_screen = 0;              // Double screen
+ #else
      double_screen = 1;              // Double screen
+ #endif
      quick_load = 1;                 // Quick-load enabled
      audio_channels = 1;             // Stereo

Index: screen.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/screen.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** screen.cc   30 Jun 2002 19:11:08 -0000      1.17
--- screen.cc   29 Jul 2002 13:00:49 -0000      1.18
***************
*** 39,43 ****
  {
      u_int8 bpp;
!     u_int32 SDL_flags = SDL_HWSURFACE | SDL_DOUBLEBUF;
      u_int8 emulated = depth; 
      
--- 39,43 ----
  {
      u_int8 bpp;
!     u_int32 SDL_flags = SDL_DOUBLEBUF;
      u_int8 emulated = depth; 
      

Index: surface.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/surface.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** surface.cc  28 Jun 2002 12:15:21 -0000      1.12
--- surface.cc  29 Jul 2002 13:00:49 -0000      1.13
***************
*** 39,43 ****
      set_height (h); 
  
!     vis = SDL_CreateRGBSurface (SDL_HWSURFACE | SDL_SRCCOLORKEY | 
SDL_SRCALPHA | SDL_ASYNCBLIT,
                                  l, h,
                                  screen::bytes_per_pixel () * 8,
--- 39,43 ----
      set_height (h); 
  
!     vis = SDL_CreateRGBSurface (SDL_SRCCOLORKEY | SDL_SRCALPHA | 
SDL_ASYNCBLIT,
                                  l, h,
                                  screen::bytes_per_pixel () * 8,
***************
*** 419,423 ****
      }
  
!     vis = SDL_CreateRGBSurface (SDL_HWSURFACE | SDL_SRCCOLORKEY | 
SDL_SRCALPHA | SDL_ASYNCBLIT,
                                  l, h,
                                  screen::bytes_per_pixel () * 8,
--- 419,423 ----
      }
  
!     vis = SDL_CreateRGBSurface (SDL_SRCCOLORKEY | SDL_SRCALPHA | 
SDL_ASYNCBLIT,
                                  l, h,
                                  screen::bytes_per_pixel () * 8,