projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restricted slippery walls option to R'n'D engine in level editor
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 8e04c423a08aff5483a69d0921e9480c0d011a6b..e0225dc2deded68ce3c9297a7ff41dbc61314deb 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-576,6
+576,12
@@
static struct LevelFileConfigInfo chunk_config_ELEM[] =
&li.bd_diagonal_movements, FALSE
},
&li.bd_diagonal_movements, FALSE
},
+ {
+ EL_BD_DIAMOND, -1,
+ TYPE_INTEGER, CONF_VALUE_16_BIT(1),
+ &li.score[SC_DIAMOND_EXTRA], 20
+ },
+
// (the following values are related to various game elements)
{
// (the following values are related to various game elements)
{
@@
-958,14
+964,6
@@
static struct LevelFileConfigInfo chunk_config_ELEM[] =
&li.score[SC_ELEM_BONUS], 10
},
&li.score[SC_ELEM_BONUS], 10
},
- // ---------- unused values -------------------------------------------------
-
- {
- EL_UNKNOWN, SAVE_CONF_NEVER,
- TYPE_INTEGER, CONF_VALUE_16_BIT(1),
- &li.score[SC_UNKNOWN_15], 10
- },
-
{
-1, -1,
-1, -1,
{
-1, -1,
-1, -1,
@@
-3720,8
+3718,8
@@
static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level)
cave->level_timevalue[i] = level->score[SC_TIME_BONUS];
}
cave->level_timevalue[i] = level->score[SC_TIME_BONUS];
}
- cave->diamond_value = level->score[SC_
DIAMON
D];
- cave->extra_diamond_value = level->score[SC_DIAMOND];
+ cave->diamond_value = level->score[SC_
EMERAL
D];
+ cave->extra_diamond_value = level->score[SC_DIAMOND
_EXTRA
];
cave->level_speed[0] = 160; // set cave speed
cave->level_speed[0] = 160; // set cave speed
@@
-3746,15
+3744,16
@@
static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level)
level->fieldx = MIN(cave->w, MAX_LEV_FIELDX);
level->fieldy = MIN(cave->h, MAX_LEV_FIELDY);
level->fieldx = MIN(cave->w, MAX_LEV_FIELDX);
level->fieldy = MIN(cave->h, MAX_LEV_FIELDY);
- level->time = cave->level_time[bd_level_nr];
- level->gems_needed = cave->level_diamonds[bd_level_nr];
- level->time_magic_wall = cave->level_magic_wall_time[bd_level_nr];
+ level->time
= cave->level_time[bd_level_nr];
+ level->gems_needed
= cave->level_diamonds[bd_level_nr];
+ level->time_magic_wall
= cave->level_magic_wall_time[bd_level_nr];
- level->score[SC_TIME_BONUS] = cave->level_timevalue[bd_level_nr];
- level->score[SC_DIAMOND] = cave->diamond_value;
+ level->score[SC_TIME_BONUS] = cave->level_timevalue[bd_level_nr];
+ level->score[SC_EMERALD] = cave->diamond_value;
+ level->score[SC_DIAMOND_EXTRA] = cave->extra_diamond_value;
- level->bd_intermission = cave->intermission;
- level->bd_diagonal_movements = cave->diagonal_movements;
+ level->bd_intermission
= cave->intermission;
+ level->bd_diagonal_movements
= cave->diagonal_movements;
strncpy(level->name, cave->name, MAX_LEVEL_NAME_LEN);
level->name[MAX_LEVEL_NAME_LEN] = '\0';
strncpy(level->name, cave->name, MAX_LEVEL_NAME_LEN);
level->name[MAX_LEVEL_NAME_LEN] = '\0';