projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070318-1-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 95d9a1ca54493c4091d152fce4fc11673f87a3e1..7ec7446a70f767802e4cfd2c7ee51ecc72948443 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-167,7
+167,8
@@
static int getFontBitmapID(int font_nr)
{
int special = -1;
{
int special = -1;
- if (game_status >= GAME_MODE_TITLE && game_status <= GAME_MODE_PSEUDO_PREVIEW)
+ if (game_status >= GAME_MODE_TITLE_INITIAL &&
+ game_status <= GAME_MODE_PSEUDO_PREVIEW)
special = game_status;
else if (game_status == GAME_MODE_PSEUDO_TYPENAME)
special = GFX_SPECIAL_ARG_MAIN;
special = game_status;
else if (game_status == GAME_MODE_PSEUDO_TYPENAME)
special = GFX_SPECIAL_ARG_MAIN;
@@
-1287,7
+1288,9
@@
static void InitGraphicInfo()
IMG_BACKGROUND_ENVELOPE_4,
IMG_BACKGROUND,
IMG_BACKGROUND_ENVELOPE_4,
IMG_BACKGROUND,
+ IMG_BACKGROUND_TITLE_INITIAL,
IMG_BACKGROUND_TITLE,
IMG_BACKGROUND_TITLE,
+ IMG_BACKGROUND_MESSAGE_INITIAL,
IMG_BACKGROUND_MESSAGE,
IMG_BACKGROUND_MAIN,
IMG_BACKGROUND_LEVELS,
IMG_BACKGROUND_MESSAGE,
IMG_BACKGROUND_MAIN,
IMG_BACKGROUND_LEVELS,
@@
-1637,7
+1640,7
@@
static void set_sound_parameters(int sound, char **parameter_raw)
sound_info[sound].volume = parameter[SND_ARG_VOLUME];
/* sound priority to give certain sounds a higher or lower priority */
sound_info[sound].volume = parameter[SND_ARG_VOLUME];
/* sound priority to give certain sounds a higher or lower priority */
- sound_info[sound].
volume = parameter[SND_ARG_VOLUME
];
+ sound_info[sound].
priority = parameter[SND_ARG_PRIORITY
];
}
static void InitSoundInfo()
}
static void InitSoundInfo()