projects
/
shermanaquarium
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added icons and xml to livewp directory in debian rules
[shermanaquarium]
/
sherman-aquarium
/
shermans
/
fish.c
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
#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,
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){
if(fishes[i].is_dead == TRUE){
- fprintf(stderr,"ddddddddddddddddd33333333\n");
if(fish_settings.rebirth){
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...*/
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 */
/* 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);
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. */
/* 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;
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 {
}
} else {
-
fishes[i].tx +=
(fishes[i].speed[fishes[i].frame]) * (fishes[i].speed_mul * fish_settings.speed / 100);
fishes[i].tx +=
(fishes[i].speed[fishes[i].frame]) * (fishes[i].speed_mul * fish_settings.speed / 100);