projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040927-3-src
[rocksndiamonds.git]
/
src
/
game_em
/
synchro_2.c
diff --git
a/src/game_em/synchro_2.c
b/src/game_em/synchro_2.c
index c8a50916fac0e25fa3848bab0a02397d4478d503..d8f7913ce534e5efba868acf402f11338ea0ba8e 100644
(file)
--- a/
src/game_em/synchro_2.c
+++ b/
src/game_em/synchro_2.c
@@
-27,10
+27,13
@@
void synchro_2(void)
unsigned int temp = 0; /* initialized to make compilers happy */
unsigned int dx; /* only needed to find closest player */
unsigned int dy;
unsigned int temp = 0; /* initialized to make compilers happy */
unsigned int dx; /* only needed to find closest player */
unsigned int dy;
+ int element;
loop:
loop:
- switch (cave_cache[++x])
+ element = cave_cache[++x];
+
+ switch (element)
{
default:
goto loop;
{
default:
goto loop;
@@
-746,7
+749,7
@@
void synchro_2(void)
}
Next[y][x] = Xblank;
}
Next[y][x] = Xblank;
- play_
sound(x, y, SAMPLE_squash
);
+ play_
element_sound(x, y, SAMPLE_wonderfall, Xstone
);
goto loop;
}
goto loop;
}
@@
-2858,7
+2861,7
@@
void synchro_2(void)
{
Cave[y][x+1] = Ydiamond_eat;
Next[y][x+1] = Xblank;
{
Cave[y][x+1] = Ydiamond_eat;
Next[y][x+1] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-2866,7
+2869,7
@@
void synchro_2(void)
{
Cave[y+1][x] = Ydiamond_eat;
Next[y+1][x] = Xblank;
{
Cave[y+1][x] = Ydiamond_eat;
Next[y+1][x] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-2874,7
+2877,7
@@
void synchro_2(void)
{
Cave[y][x-1] = Ydiamond_eat;
Next[y][x-1] = Xblank;
{
Cave[y][x-1] = Ydiamond_eat;
Next[y][x-1] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-2882,7
+2885,7
@@
void synchro_2(void)
{
Cave[y-1][x] = Ydiamond_eat;
Next[y-1][x] = Xblank;
{
Cave[y-1][x] = Ydiamond_eat;
Next[y-1][x] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-2930,7
+2933,7
@@
void synchro_2(void)
{
Cave[y+1][x] = Ydiamond_eat;
Next[y+1][x] = Xblank;
{
Cave[y+1][x] = Ydiamond_eat;
Next[y+1][x] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-2938,7
+2941,7
@@
void synchro_2(void)
{
Cave[y][x-1] = Ydiamond_eat;
Next[y][x-1] = Xblank;
{
Cave[y][x-1] = Ydiamond_eat;
Next[y][x-1] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-2946,7
+2949,7
@@
void synchro_2(void)
{
Cave[y-1][x] = Ydiamond_eat;
Next[y-1][x] = Xblank;
{
Cave[y-1][x] = Ydiamond_eat;
Next[y-1][x] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-2954,7
+2957,7
@@
void synchro_2(void)
{
Cave[y][x+1] = Ydiamond_eat;
Next[y][x+1] = Xblank;
{
Cave[y][x+1] = Ydiamond_eat;
Next[y][x+1] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-3002,7
+3005,7
@@
void synchro_2(void)
{
Cave[y][x-1] = Ydiamond_eat;
Next[y][x-1] = Xblank;
{
Cave[y][x-1] = Ydiamond_eat;
Next[y][x-1] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-3010,7
+3013,7
@@
void synchro_2(void)
{
Cave[y-1][x] = Ydiamond_eat;
Next[y-1][x] = Xblank;
{
Cave[y-1][x] = Ydiamond_eat;
Next[y-1][x] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-3018,7
+3021,7
@@
void synchro_2(void)
{
Cave[y][x+1] = Ydiamond_eat;
Next[y][x+1] = Xblank;
{
Cave[y][x+1] = Ydiamond_eat;
Next[y][x+1] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-3026,7
+3029,7
@@
void synchro_2(void)
{
Cave[y+1][x] = Ydiamond_eat;
Next[y+1][x] = Xblank;
{
Cave[y+1][x] = Ydiamond_eat;
Next[y+1][x] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-3074,7
+3077,7
@@
void synchro_2(void)
{
Cave[y-1][x] = Ydiamond_eat;
Next[y-1][x] = Xblank;
{
Cave[y-1][x] = Ydiamond_eat;
Next[y-1][x] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-3082,7
+3085,7
@@
void synchro_2(void)
{
Cave[y][x+1] = Ydiamond_eat;
Next[y][x+1] = Xblank;
{
Cave[y][x+1] = Ydiamond_eat;
Next[y][x+1] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-3090,7
+3093,7
@@
void synchro_2(void)
{
Cave[y+1][x] = Ydiamond_eat;
Next[y+1][x] = Xblank;
{
Cave[y+1][x] = Ydiamond_eat;
Next[y+1][x] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-3098,7
+3101,7
@@
void synchro_2(void)
{
Cave[y][x-1] = Ydiamond_eat;
Next[y][x-1] = Xblank;
{
Cave[y][x-1] = Ydiamond_eat;
Next[y][x-1] = Xblank;
- play_
sound(x, y, SAMPLE_eater
);
+ play_
element_sound(x, y, SAMPLE_eater, Xdiamond
);
goto loop;
}
goto loop;
}
@@
-3548,14
+3551,14
@@
void synchro_2(void)
}
Next[y][x] = Xblank;
}
Next[y][x] = Xblank;
- play_
sound(x, y, SAMPLE_squash
);
+ play_
element_sound(x, y, SAMPLE_wonderfall, Xemerald
);
goto loop;
}
default:
Cave[y][x] = Xemerald;
Next[y][x] = Xemerald;
goto loop;
}
default:
Cave[y][x] = Xemerald;
Next[y][x] = Xemerald;
- play_
sound(x, y, SAMPLE_diamon
d);
+ play_
element_sound(x, y, SAMPLE_diamond, Xemeral
d);
goto loop;
}
goto loop;
}
@@
-3775,14
+3778,14
@@
void synchro_2(void)
}
Next[y][x] = Xblank;
}
Next[y][x] = Xblank;
- play_
sound(x, y, SAMPLE_squash
);
+ play_
element_sound(x, y, SAMPLE_wonderfall, Xdiamond
);
goto loop;
}
default:
Cave[y][x] = Xdiamond;
Next[y][x] = Xdiamond;
goto loop;
}
default:
Cave[y][x] = Xdiamond;
Next[y][x] = Xdiamond;
- play_
sound(x, y, SAMPLE_
diamond);
+ play_
element_sound(x, y, SAMPLE_diamond, X
diamond);
goto loop;
}
goto loop;
}
@@
-4282,7
+4285,7
@@
void synchro_2(void)
ball_common:
ball_common:
- play_
sound(x, y, SAMPLE_ball
);
+ play_
element_sound(x, y, SAMPLE_ball, element
);
if (lev.ball_random)
{
switch (RANDOM & 7)
if (lev.ball_random)
{
switch (RANDOM & 7)