projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20031205-B-src
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 8233ac5141d754d86f69495d33444cac798ee880..5ff8c06a873f0d0f14adc23d7e2258f92e36ed3d 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-1032,7
+1032,7
@@
static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
int element = EL_CUSTOM_START + i;
/* order of checking and copying events to be mapped is important */
int element = EL_CUSTOM_START + i;
/* order of checking and copying events to be mapped is important */
- for (j = CE_BY_OTHER_ACTION; j >= CE_BY_PLAYER; j--)
+ for (j = CE_BY_OTHER_ACTION; j >= CE_BY_PLAYER
_OBSOLETE
; j--)
{
if (HAS_CHANGE_EVENT(element, j - 2))
{
{
if (HAS_CHANGE_EVENT(element, j - 2))
{
@@
-1042,7
+1042,7
@@
static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
}
/* order of checking and copying events to be mapped is important */
}
/* order of checking and copying events to be mapped is important */
- for (j = CE_OTHER_GETS_COLLECTED; j >= CE_COLLISION; j--)
+ for (j = CE_OTHER_GETS_COLLECTED; j >= CE_COLLISION
_ACTIVE
; j--)
{
if (HAS_CHANGE_EVENT(element, j - 1))
{
{
if (HAS_CHANGE_EVENT(element, j - 1))
{
@@
-1058,11
+1058,11
@@
static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
{
int element = EL_CUSTOM_START + i;
{
int element = EL_CUSTOM_START + i;
- if (HAS_CHANGE_EVENT(element, CE_BY_PLAYER) ||
- HAS_CHANGE_EVENT(element, CE_BY_COLLISION))
+ if (HAS_CHANGE_EVENT(element, CE_BY_PLAYER
_OBSOLETE
) ||
+ HAS_CHANGE_EVENT(element, CE_BY_COLLISION
_OBSOLETE
))
{
{
- SET_CHANGE_EVENT(element, CE_BY_PLAYER, FALSE);
- SET_CHANGE_EVENT(element, CE_BY_COLLISION, FALSE);
+ SET_CHANGE_EVENT(element, CE_BY_PLAYER
_OBSOLETE
, FALSE);
+ SET_CHANGE_EVENT(element, CE_BY_COLLISION
_OBSOLETE
, FALSE);
SET_CHANGE_EVENT(element, CE_BY_DIRECT_ACTION, TRUE);
}
SET_CHANGE_EVENT(element, CE_BY_DIRECT_ACTION, TRUE);
}
@@
-2945,10
+2945,19
@@
void LoadMusicInfo()
new = &music_file_info;
new = &music_file_info;
+ printf("::: num_music == %d\n", num_music);
+
for (i = 0; i < num_music; i++)
{
music = getMusicListEntry(i);
for (i = 0; i < num_music; i++)
{
music = getMusicListEntry(i);
+#if 0
+ printf("::: %d [%08x]\n", i, music->filename);
+#endif
+
+ if (music->filename == NULL)
+ continue;
+
if (strcmp(music->filename, UNDEFINED_FILENAME) == 0)
continue;
if (strcmp(music->filename, UNDEFINED_FILENAME) == 0)
continue;
@@
-2981,6
+2990,9
@@
void LoadMusicInfo()
{
music = getMusicListEntry(i);
{
music = getMusicListEntry(i);
+ if (music->filename == NULL)
+ continue;
+
if (strcmp(basename, music->filename) == 0)
{
music_already_used = TRUE;
if (strcmp(basename, music->filename) == 0)
{
music_already_used = TRUE;