projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed compiler warning
[rocksndiamonds.git]
/
src
/
game_em
/
synchro_3.c
diff --git
a/src/game_em/synchro_3.c
b/src/game_em/synchro_3.c
index f094ceebc3684c42cbed64fe4d229c82acc52472..ca83a820d2fdcad18834058d06a166dbabf2ba36 100644
(file)
--- a/
src/game_em/synchro_3.c
+++ b/
src/game_em/synchro_3.c
@@
-5,33
+5,21
@@
* this should be spread over the frames for reduced cpu load.
*/
* this should be spread over the frames for reduced cpu load.
*/
-#include "tile.h"
-#include "level.h"
-#include "sample.h"
+#include "main_em.h"
void synchro_3(void)
{
void synchro_3(void)
{
-
register unsigned
int x;
-
register unsigned
int y;
-
register unsigned
int count;
-
register unsigned long
random;
+ int x;
+ int y;
+ int count;
+
unsigned int
random;
/* update variables */
if (lev.score > 9999)
lev.score = 9999;
/* update variables */
if (lev.score > 9999)
lev.score = 9999;
-#if 1
- if (lev.time_initial == 0)
- lev.time++;
- else if (lev.time)
- lev.time--;
-#else
- if (lev.time)
- lev.time--;
-#endif
-
if (lev.android_move_cnt-- == 0)
lev.android_move_cnt = lev.android_move_time;
if (lev.android_clone_cnt-- == 0)
if (lev.android_move_cnt-- == 0)
lev.android_move_cnt = lev.android_move_time;
if (lev.android_clone_cnt-- == 0)
@@
-50,16
+38,12
@@
void synchro_3(void)
if (lev.wonderwall_time && lev.wonderwall_state)
lev.wonderwall_time--;
if (lev.wonderwall_time && lev.wonderwall_state)
lev.wonderwall_time--;
- if (lev.time_initial > 0 &&
- lev.time > 0 && lev.time <= 50 && lev.time % 5 == 0)
- play_sound(-1, -1, SAMPLE_time);
-
if (lev.wheel_cnt)
if (lev.wheel_cnt)
- play_
sound(-1, -1, SAMPLE_
wheel);
+ play_
element_sound(lev.wheel_x, lev.wheel_y, SAMPLE_wheel, X
wheel);
/* grow amoeba */
/* grow amoeba */
- random = Random;
+ random = Random
EM
;
for (count = lev.amoeba_time; count--;)
{
for (count = lev.amoeba_time; count--;)
{
@@
-85,7
+69,7
@@
void synchro_3(void)
random = random * 129 + 1;
}
random = random * 129 + 1;
}
- Random = random;
+ Random
EM
= random;
/* handle explosions */
/* handle explosions */