projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020903-1-src
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index bc31c194de0672b1a07164c40710502c6d7562ca..f64d25931c19c3860f4e13126d5532ccefb0703a 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-153,7
+153,7
@@
static struct
{ NULL, 0, 0 },
};
static int element_action_sound[NUM_LEVEL_ELEMENTS][NUM_SND_ACTIONS];
{ NULL, 0, 0 },
};
static int element_action_sound[NUM_LEVEL_ELEMENTS][NUM_SND_ACTIONS];
-static boolean is_loop_sound[NUM_SOUND_
EFFECT
S];
+static boolean is_loop_sound[NUM_SOUND_
CONFIG_ENTRIE
S];
#define IS_LOOP_SOUND(x) (is_loop_sound[x])
#define IS_LOOP_SOUND(x) (is_loop_sound[x])
@@
-507,7
+507,7
@@
void DrawGameDoorValues()
void InitGameSound()
{
void InitGameSound()
{
- int sound_effect_properties[NUM_SOUND_
EFFECT
S];
+ int sound_effect_properties[NUM_SOUND_
CONFIG_ENTRIE
S];
int i, j;
#if 0
int i, j;
#if 0
@@
-518,9
+518,9
@@
void InitGameSound()
for (j=0; j<NUM_LEVEL_ELEMENTS; j++)
element_action_sound[j][i] = -1;
for (j=0; j<NUM_LEVEL_ELEMENTS; j++)
element_action_sound[j][i] = -1;
- for (i=0; i<NUM_SOUND_
EFFECT
S; i++)
+ for (i=0; i<NUM_SOUND_
CONFIG_ENTRIE
S; i++)
{
{
- int len_effect_text = strlen(sound_
effects[i].text
);
+ int len_effect_text = strlen(sound_
config[i].token
);
sound_effect_properties[i] = SND_ACTION_UNKNOWN;
is_loop_sound[i] = FALSE;
sound_effect_properties[i] = SND_ACTION_UNKNOWN;
is_loop_sound[i] = FALSE;
@@
-533,7
+533,7
@@
void InitGameSound()
int len_action_text = strlen(sound_action_properties[j].text);
if (len_action_text < len_effect_text &&
int len_action_text = strlen(sound_action_properties[j].text);
if (len_action_text < len_effect_text &&
- strcmp(&sound_
effects[i].text
[len_effect_text - len_action_text],
+ strcmp(&sound_
config[i].token
[len_effect_text - len_action_text],
sound_action_properties[j].text) == 0)
{
sound_effect_properties[i] = sound_action_properties[j].value;
sound_action_properties[j].text) == 0)
{
sound_effect_properties[i] = sound_action_properties[j].value;
@@
-554,9
+554,9
@@
void InitGameSound()
int len_class_text = strlen(element_info[j].sound_class_name);
if (len_class_text + 1 < len_effect_text &&
int len_class_text = strlen(element_info[j].sound_class_name);
if (len_class_text + 1 < len_effect_text &&
- strncmp(sound_
effects[i].text
,
+ strncmp(sound_
config[i].token
,
element_info[j].sound_class_name, len_class_text) == 0 &&
element_info[j].sound_class_name, len_class_text) == 0 &&
- sound_
effects[i].text
[len_class_text] == '.')
+ sound_
config[i].token
[len_class_text] == '.')
{
int sound_action_value = sound_effect_properties[i];
{
int sound_action_value = sound_effect_properties[i];
@@
-6482,8
+6482,8
@@
boolean PlaceBomb(struct PlayerInfo *player)
void PlaySoundLevel(int x, int y, int nr)
{
void PlaySoundLevel(int x, int y, int nr)
{
- static int loop_sound_frame[NUM_SOUND_
EFFECT
S];
- static int loop_sound_volume[NUM_SOUND_
EFFECT
S];
+ static int loop_sound_frame[NUM_SOUND_
CONFIG_ENTRIE
S];
+ static int loop_sound_volume[NUM_SOUND_
CONFIG_ENTRIE
S];
int sx = SCREENX(x), sy = SCREENY(y);
int volume, stereo_position;
int max_distance = 8;
int sx = SCREENX(x), sy = SCREENY(y);
int volume, stereo_position;
int max_distance = 8;