Merge branch 'master' of https://vcs.maemo.org/git/shermanaquarium

diff --git a/sherman-aquarium/debian/control b/sherman-aquarium/debian/control
index 983c188..8cf07d9 100644 (file)
--- a/sherman-aquarium/debian/control
+++ b/sherman-aquarium/debian/control
@@ -2,7 +2,7 @@ Source: shermans-aquarium
 Section: gnome
 Priority: optional
 Maintainer: Jose M. Moya <josem@debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs, libsdl1.2-dev, libgai-dev (>= 0.5.3), autotools-dev, libsdl1.2-dev
+Build-Depends: debhelper (>= 4.1.0), cdbs, libsdl1.2-dev, autotools-dev
 Standards-Version: 3.7.3
 Homepage: http://aquariumapplet.sourceforge.net/
 

diff --git a/sherman-aquarium/shermans/fish.c b/sherman-aquarium/shermans/fish.c
index c935ab6..a23ca9c 100644 (file)
--- a/sherman-aquarium/shermans/fish.c
+++ b/sherman-aquarium/shermans/fish.c
@@ -564,8 +564,7 @@ void fish_update(void)
 #ifdef DEBUG
     printf("\t\t - Done special hits.\n");
 #endif
-
-
+    
     for(i = 0;i < fish_settings.num_fish; i++){
        aquarium_clean_image((int) fishes[i].tx,
                             fishes[i].y - ad->viewpoint_start_y,
@@ -649,9 +648,7 @@ void fish_update(void)
 
        if(fishes[i].is_dead == TRUE){
 
-               fprintf(stderr,"ddddddddddddddddd33333333\n");
            if(fish_settings.rebirth){
-               fprintf(stderr,"ddddddddddddddddd\n");
                if(g_rand_int_range(ad->rnd, 0, 100) < 20){
                    //              printf("Rebirth and salvation..\n");
                    /* Salvation and rebirth...*/
@@ -693,8 +690,8 @@ void fish_update(void)
 
        /* move fish in horizontal direction, left or right */
        /* Large aquarium, the fishes are shown more seldom */
-
-       if (!fishes[i].rev) {
+       
+    if (!fishes[i].rev) {
 
            fishes[i].tx -=
                (fishes[i].speed[fishes[i].frame]) * (fishes[i].speed_mul * fish_settings.speed / 100);
@@ -703,6 +700,7 @@ void fish_update(void)
                /* we moved out of bounds. change direction,
                 * position, speed. */
 
+
                fishes[i].travel = g_rand_int_range(ad->rnd, 0, (ad->virtual_aquarium_x - ad->xmax) / 2) +
                    fishes[i].width;
                fishes[i].tx = -fishes[i].width - fishes[i].travel;
@@ -721,7 +719,6 @@ void fish_update(void)
            }
        } else {
 
-
            fishes[i].tx +=
                (fishes[i].speed[fishes[i].frame]) * (fishes[i].speed_mul * fish_settings.speed / 100);
 

diff --git a/sherman-aquarium/shermans/screensaver.c b/sherman-aquarium/shermans/screensaver.c
index 2e80812..3a5aff9 100644 (file)
--- a/sherman-aquarium/shermans/screensaver.c
+++ b/sherman-aquarium/shermans/screensaver.c
@@ -581,7 +581,8 @@ void screensaver_init()
        screen_height = win_attr.height;
        screen_width = win_attr.width;
        fullscreen = 0;
-       ad.proximity = 1;                       /* No sound effects */
+       //ad.proximity = 1;                     /* No sound effects */
+    ad.proximity = 0;
        window = gdk_window_foreign_new((Window)window_id);
        gdk_window_show(window);
        gc = gdk_gc_new(window);
@@ -982,12 +983,10 @@ int main(int argc, char **argv)
     screensaver_init(0);
 
     if(window_id==-1){
-       fprintf(stderr, "screensaver_main_sdl\n");
-       screensaver_main_sdl();
+           screensaver_main_sdl();
     }
     else{
-        fprintf(stderr, "screensaver_main_GDK\n");
-       screensaver_main_gdk();
+           screensaver_main_gdk();
     }
     return 0;
 }