projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070426-1-src
[rocksndiamonds.git]
/
src
/
game_em
/
init.c
diff --git
a/src/game_em/init.c
b/src/game_em/init.c
index 42117321e902bf5a0cf88236b7dd1e02fce73cb5..6e7fe94823bd6b751396b4600958eeaba964cc1f 100644
(file)
--- a/
src/game_em/init.c
+++ b/
src/game_em/init.c
@@
-3,19
+3,15
@@
* open X11 display and sound
*/
* open X11 display and sound
*/
+#include "main_em.h"
+
+
#include <signal.h>
#if !defined(TARGET_SDL)
#include <sys/wait.h>
#endif
#include <signal.h>
#if !defined(TARGET_SDL)
#include <sys/wait.h>
#endif
-#include "main_em.h"
-
-#include "global.h"
-#include "display.h"
-#include "sample.h"
-#include "level.h"
-
Bitmap *objBitmap;
Bitmap *sprBitmap;
Bitmap *objBitmap;
Bitmap *sprBitmap;
@@
-44,6
+40,7
@@
int play_element[SAMPLE_MAX];
static boolean use_native_em_sound = 0;
struct GlobalInfo_EM global_em_info;
static boolean use_native_em_sound = 0;
struct GlobalInfo_EM global_em_info;
+struct GameInfo_EM game_em;
#if defined(AUDIO_UNIX_NATIVE)
static int sound_pid = -1;
#if defined(AUDIO_UNIX_NATIVE)
static int sound_pid = -1;
@@
-61,9
+58,11
@@
static const char *sound_names[SAMPLE_MAX] =
"05.bug.au",
"06.tank.au",
"07.android.au",
"05.bug.au",
"06.tank.au",
"07.android.au",
+ "06.tank.au", /* android moving */
"08.spring.au",
"09.slurp.au",
"10.eater.au",
"08.spring.au",
"09.slurp.au",
"10.eater.au",
+ "10.eater.au", /* eater eating */
"11.alien.au",
"12.collect.au",
"13.diamond.au",
"11.alien.au",
"12.collect.au",
"13.diamond.au",
@@
-78,6
+77,7
@@
static const char *sound_names[SAMPLE_MAX] =
"21.wonder.au",
"22.door.au",
"23.exit.au",
"21.wonder.au",
"22.door.au",
"23.exit.au",
+ "23.exit.au",
"24.dynamite.au",
"25.tick.au",
"26.press.au",
"24.dynamite.au",
"25.tick.au",
"26.press.au",
@@
-96,9
+96,11
@@
static const int sound_volume[SAMPLE_MAX] =
20,
20,
100,
20,
20,
100,
+ 20,
100,
100,
50,
100,
100,
50,
+ 50,
100,
100,
100,
100,
100,
100,
@@
-116,6
+118,7
@@
static const int sound_volume[SAMPLE_MAX] =
100,
100,
100,
100,
100,
100,
+ 100,
20,
100,
100,
20,
100,
100,
@@
-293,18
+296,18
@@
void em_close_all(void)
/* ---------------------------------------------------------------------- */
/* ---------------------------------------------------------------------- */
-extern
unsigned
int screen_x;
-extern
unsigned
int screen_y;
+extern int screen_x;
+extern int screen_y;
void play_element_sound(int x, int y, int sample, int element)
{
#if 0
void play_element_sound(int x, int y, int sample, int element)
{
#if 0
-
unsigned
int left = screen_x / TILEX;
-
unsigned
int top = screen_y / TILEY;
+ int left = screen_x / TILEX;
+ int top = screen_y / TILEY;
if ((x == -1 && y == -1) || /* play sound in the middle of the screen */
if ((x == -1 && y == -1) || /* play sound in the middle of the screen */
- ((
unsigned
int)(y - top) <= SCR_FIELDY &&
- (
unsigned
int)(x - left) <= SCR_FIELDX))
+ ((int)(y - top) <= SCR_FIELDY &&
+ (int)(x - left) <= SCR_FIELDX))
#endif
{
#if 1
#endif
{
#if 1
@@
-363,23
+366,23
@@
void sound_play(void)
#endif
#endif
-
memset(play, 0
, sizeof(play));
+
clear_mem(play
, sizeof(play));
}
}
-unsigned int InitEngineR
ND
_EM(long seed)
+unsigned int InitEngineR
andom
_EM(long seed)
{
if (seed == NEW_RANDOMIZE)
{
{
if (seed == NEW_RANDOMIZE)
{
- int simple_rnd =
SimpleRND
(1000);
+ int simple_rnd =
GetSimpleRandom
(1000);
int i;
int i;
- for (i = 0; i < simple_rnd || Random == NEW_RANDOMIZE; i++)
- Random
= Random
* 129 + 1;
+ for (i = 0; i < simple_rnd || Random
EM
== NEW_RANDOMIZE; i++)
+ Random
EM = RandomEM
* 129 + 1;
- seed = Random;
+ seed = Random
EM
;
}
}
- Random = seed;
+ Random
EM
= seed;
return (unsigned int) seed;
}
return (unsigned int) seed;
}