X-Git-Url: http://git.maemo.org/git/?p=shermanaquarium;a=blobdiff_plain;f=sherman-aquarium%2Fshermans%2Ffish.c;h=a23ca9cea627ecf87b088192a543efb5335a897f;hp=c935ab637e8b57c028fa7f8c944575c323b0f52f;hb=4004c3380e0102fb80cb8cc5d6333a3708063e9c;hpb=882cf8ed52d7dffe3c026d8b6dd4023079d97de3 diff --git a/sherman-aquarium/shermans/fish.c b/sherman-aquarium/shermans/fish.c index c935ab6..a23ca9c 100644 --- 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);