projects
/
fishladder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed flow reverse flag incorrectly being set
[fishladder.git]
/
fishladder.c
diff --git
a/fishladder.c
b/fishladder.c
index 372f21e2a7e780b1e1a2ae846900cdeb3ffec50b..eb56b5a3fd2cab8bb7505e3aea5232a3ec4217d3 100644
(file)
--- a/
fishladder.c
+++ b/
fishladder.c
@@
-1459,7
+1459,12
@@
void vg_update(void)
struct cell_description *desc = &cell_descriptions[ cell_next->config ];
if( cell_next->config == k_cell_type_merge )
struct cell_description *desc = &cell_descriptions[ cell_next->config ];
if( cell_next->config == k_cell_type_merge )
- fish->flow_reversed = 0;
+ {
+ if( fish->dir[0] == 0 )
+ fish->state = k_fish_state_dead;
+ else
+ fish->flow_reversed = 0;
+ }
else
{
if( cell_next->config == k_cell_type_split )
else
{
if( cell_next->config == k_cell_type_split )
@@
-1468,6
+1473,8
@@
void vg_update(void)
{
sfx_set_playrnd( &audio_splitter, &audio_system_balls_important, 0, 1 );
cell_next->state |= FLAG_FLIP_ROTATING;
{
sfx_set_playrnd( &audio_splitter, &audio_system_balls_important, 0, 1 );
cell_next->state |= FLAG_FLIP_ROTATING;
+
+ fish->flow_reversed = 0;
}
else
fish->state = k_fish_state_dead;
}
else
fish->state = k_fish_state_dead;