projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040615-1-src
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 3989a22a83fc62557b4bf434be9e29b9e287b87b..7280860bbe8fd48029be0765ed5dbe0375f9170d 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-2235,10
+2235,14
@@
static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename)
}
}
}
}
-#if 1
+#if 1
/* USE_NEW_BLOCK_STYLE */
/* blocking the last field when moving was corrected in version 3.1.1 */
if (level->game_version < VERSION_IDENT(3,1,1,0))
{
/* blocking the last field when moving was corrected in version 3.1.1 */
if (level->game_version < VERSION_IDENT(3,1,1,0))
{
+#if 0
+ printf("::: %d\n", level->block_last_field);
+#endif
+
/* even "not blocking" was blocking the last field for one frame */
level->block_delay = (level->block_last_field ? 7 : 1);
level->sp_block_delay = (level->sp_block_last_field ? 7 : 1);
/* even "not blocking" was blocking the last field for one frame */
level->block_delay = (level->block_last_field ? 7 : 1);
level->sp_block_delay = (level->sp_block_last_field ? 7 : 1);
@@
-2488,8
+2492,13
@@
void LoadLevelTemplate(int nr)
LoadLevelFromFilename_RND(&level_template, filename);
#endif
LoadLevelFromFilename_RND(&level_template, filename);
#endif
+#if 1
+ LoadLevel_InitVersion(&level_template, filename);
+ LoadLevel_InitElements(&level_template, filename);
+#else
LoadLevel_InitVersion(&level, filename);
LoadLevel_InitElements(&level, filename);
LoadLevel_InitVersion(&level, filename);
LoadLevel_InitElements(&level, filename);
+#endif
ActivateLevelTemplate();
}
ActivateLevelTemplate();
}