projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replaced glib function calls to g_file_get_contents()
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index 3bed979da4aaff0c642f24bc6e27b1e6883048cf..ac2bb22020495f36f4cd2d40783eaf2e3ee05867 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-1794,6
+1794,7
@@
static struct ValueTextInfo options_time_score_base[] =
static struct ValueTextInfo options_game_engine_type[] =
{
{ GAME_ENGINE_TYPE_RND, "Rocks'n'Diamonds" },
static struct ValueTextInfo options_game_engine_type[] =
{
{ GAME_ENGINE_TYPE_RND, "Rocks'n'Diamonds" },
+ { GAME_ENGINE_TYPE_BD, "Boulder Dash" },
{ GAME_ENGINE_TYPE_EM, "Emerald Mine" },
{ GAME_ENGINE_TYPE_SP, "Supaplex" },
{ GAME_ENGINE_TYPE_MM, "Mirror Magic" },
{ GAME_ENGINE_TYPE_EM, "Emerald Mine" },
{ GAME_ENGINE_TYPE_SP, "Supaplex" },
{ GAME_ENGINE_TYPE_MM, "Mirror Magic" },
@@
-4059,21
+4060,101
@@
static int editor_hl_boulderdash_native[] =
static int editor_el_boulderdash_native[] =
{
static int editor_el_boulderdash_native[] =
{
+ EL_EMPTY,
+ EL_BD_SAND,
+ EL_BD_ROCK,
+ EL_BD_DIAMOND,
+
+ EL_BD_STEELWALL,
+ EL_BD_WALL,
+ EL_EMPTY,
+ EL_BD_MAGIC_WALL,
+
+ EL_BD_AMOEBA,
+ EL_BD_BUTTERFLY_UP,
+ EL_BD_FIREFLY_UP,
+ EL_EXIT_CLOSED,
+
+ EL_BD_BUTTERFLY_LEFT,
+ EL_BD_FIREFLY_LEFT,
+ EL_BD_BUTTERFLY_RIGHT,
+ EL_BD_FIREFLY_RIGHT,
+
+ EL_BD_INBOX,
+ EL_BD_BUTTERFLY_DOWN,
+ EL_BD_FIREFLY_DOWN,
+ EL_EXIT_OPEN,
+
+ EL_BD_AMOEBA_2,
+ EL_BD_BUTTERFLY_2_UP,
+ EL_BD_FIREFLY_2_UP,
+ EL_EMPTY,
+
+ EL_BD_BUTTERFLY_2_LEFT,
+ EL_BD_FIREFLY_2_LEFT,
+ EL_BD_BUTTERFLY_2_RIGHT,
+ EL_BD_FIREFLY_2_RIGHT,
+
+ EL_EMPTY,
+ EL_BD_BUTTERFLY_2_DOWN,
+ EL_BD_FIREFLY_2_DOWN,
+ EL_EMPTY,
+
+ EL_EMPTY,
+ EL_BD_DRAGONFLY_UP,
+ EL_BD_STONEFLY_UP,
+ EL_EMPTY,
+
+ EL_BD_DRAGONFLY_LEFT,
+ EL_BD_STONEFLY_LEFT,
+ EL_BD_DRAGONFLY_RIGHT,
+ EL_BD_STONEFLY_RIGHT,
+
+ EL_EMPTY,
+ EL_BD_DRAGONFLY_DOWN,
+ EL_BD_STONEFLY_DOWN,
+ EL_EMPTY,
+
+ EL_EMPTY,
+ EL_BD_BITER_UP,
+ EL_BD_COW_UP,
+ EL_EMPTY,
+
+ EL_BD_BITER_LEFT,
+ EL_BD_COW_LEFT,
+ EL_BD_BITER_RIGHT,
+ EL_BD_COW_RIGHT,
+
+ EL_EMPTY,
+ EL_BD_BITER_DOWN,
+ EL_BD_COW_DOWN,
+ EL_EMPTY,
+
EL_EMPTY,
EL_BD_SAND,
EL_BD_SAND_BALL,
EL_BD_SAND_LOOSE,
EL_EMPTY,
EL_BD_SAND,
EL_BD_SAND_BALL,
EL_BD_SAND_LOOSE,
- EL_BD_SAND_SLOPED_UP_RIGHT,
EL_BD_SAND_SLOPED_UP_LEFT,
EL_BD_SAND_SLOPED_UP_LEFT,
+ EL_BD_SAND_SLOPED_UP_RIGHT,
+ EL_BD_WALL_SLOPED_UP_LEFT,
+ EL_BD_WALL_SLOPED_UP_RIGHT,
+
EL_BD_SAND_SLOPED_DOWN_LEFT,
EL_BD_SAND_SLOPED_DOWN_RIGHT,
EL_BD_SAND_SLOPED_DOWN_LEFT,
EL_BD_SAND_SLOPED_DOWN_RIGHT,
-
- EL_BD_WALL_SLOPED_UP_RIGHT,
- EL_BD_WALL_SLOPED_UP_LEFT,
EL_BD_WALL_SLOPED_DOWN_LEFT,
EL_BD_WALL_SLOPED_DOWN_RIGHT,
EL_BD_WALL_SLOPED_DOWN_LEFT,
EL_BD_WALL_SLOPED_DOWN_RIGHT,
+ EL_BD_FLYING_DIAMOND,
+ EL_BD_FLYING_ROCK,
+ EL_BD_STEELWALL_SLOPED_UP_LEFT,
+ EL_BD_STEELWALL_SLOPED_UP_RIGHT,
+
+ EL_BD_NUT,
+ EL_BD_MEGA_ROCK,
+ EL_BD_STEELWALL_SLOPED_DOWN_LEFT,
+ EL_BD_STEELWALL_SLOPED_DOWN_RIGHT,
+
EL_BD_SAND_2,
EL_BD_WALL_NON_SLOPED,
EL_BD_WALL,
EL_BD_SAND_2,
EL_BD_WALL_NON_SLOPED,
EL_BD_WALL,
@@
-4084,26
+4165,11
@@
static int editor_el_boulderdash_native[] =
EL_BD_INVISIBLE_EXIT_CLOSED,
EL_BD_INVISIBLE_EXIT_OPEN,
EL_BD_INVISIBLE_EXIT_CLOSED,
EL_BD_INVISIBLE_EXIT_OPEN,
- EL_BD_STEELWALL_SLOPED_UP_RIGHT,
- EL_BD_STEELWALL_SLOPED_UP_LEFT,
- EL_BD_STEELWALL_SLOPED_DOWN_LEFT,
- EL_BD_STEELWALL_SLOPED_DOWN_RIGHT,
-
EL_BD_STEELWALL,
EL_BD_STEELWALL_EXPLODABLE,
EL_BD_STEELWALL_DIGGABLE,
EL_BD_WALL_DIGGABLE,
EL_BD_STEELWALL,
EL_BD_STEELWALL_EXPLODABLE,
EL_BD_STEELWALL_DIGGABLE,
EL_BD_WALL_DIGGABLE,
- EL_BD_ROCK,
- EL_BD_FLYING_ROCK,
- EL_BD_MEGA_ROCK,
- EL_BD_DIAMOND,
-
- EL_BD_FLYING_DIAMOND,
- EL_BD_NUT,
- EL_BD_BLADDER_SPENDER,
- EL_BD_INBOX,
-
EL_BD_EXPANDABLE_WALL_HORIZONTAL,
EL_BD_EXPANDABLE_WALL_VERTICAL,
EL_BD_EXPANDABLE_WALL_ANY,
EL_BD_EXPANDABLE_WALL_HORIZONTAL,
EL_BD_EXPANDABLE_WALL_VERTICAL,
EL_BD_EXPANDABLE_WALL_ANY,
@@
-4157,7
+4223,7
@@
static int editor_el_boulderdash_native[] =
EL_BD_AMOEBA,
EL_BD_AMOEBA_2,
EL_BD_REPLICATOR,
EL_BD_AMOEBA,
EL_BD_AMOEBA_2,
EL_BD_REPLICATOR,
- EL_
EMPTY
,
+ EL_
BD_BLADDER_SPENDER
,
EL_BD_CONVEYOR_LEFT,
EL_BD_CONVEYOR_RIGHT,
EL_BD_CONVEYOR_LEFT,
EL_BD_CONVEYOR_RIGHT,
@@
-4174,46
+4240,6
@@
static int editor_el_boulderdash_native[] =
EL_BD_CHASING_ROCK,
EL_BD_GHOST,
EL_BD_CHASING_ROCK,
EL_BD_GHOST,
- EL_BD_COW_LEFT,
- EL_BD_COW_UP,
- EL_BD_COW_RIGHT,
- EL_BD_COW_DOWN,
-
- EL_BD_FIREFLY_LEFT,
- EL_BD_FIREFLY_UP,
- EL_BD_FIREFLY_RIGHT,
- EL_BD_FIREFLY_DOWN,
-
- EL_BD_FIREFLY_2_LEFT,
- EL_BD_FIREFLY_2_UP,
- EL_BD_FIREFLY_2_RIGHT,
- EL_BD_FIREFLY_2_DOWN,
-
- EL_BD_BUTTERFLY_LEFT,
- EL_BD_BUTTERFLY_UP,
- EL_BD_BUTTERFLY_RIGHT,
- EL_BD_BUTTERFLY_DOWN,
-
- EL_BD_BUTTERFLY_2_LEFT,
- EL_BD_BUTTERFLY_2_UP,
- EL_BD_BUTTERFLY_2_RIGHT,
- EL_BD_BUTTERFLY_2_DOWN,
-
- EL_BD_STONEFLY_LEFT,
- EL_BD_STONEFLY_UP,
- EL_BD_STONEFLY_RIGHT,
- EL_BD_STONEFLY_DOWN,
-
- EL_BD_BITER_UP,
- EL_BD_BITER_RIGHT,
- EL_BD_BITER_DOWN,
- EL_BD_BITER_LEFT,
-
- EL_BD_DRAGONFLY_LEFT,
- EL_BD_DRAGONFLY_UP,
- EL_BD_DRAGONFLY_RIGHT,
- EL_BD_DRAGONFLY_DOWN,
-
EL_BD_PLAYER,
EL_BD_PLAYER_WITH_BOMB,
EL_BD_PLAYER_GLUED,
EL_BD_PLAYER,
EL_BD_PLAYER_WITH_BOMB,
EL_BD_PLAYER_GLUED,
@@
-6046,6
+6072,7
@@
static void ReinitializeElementList_EnableSections(void)
}
else if (level.game_engine_type == GAME_ENGINE_TYPE_BD)
{
}
else if (level.game_engine_type == GAME_ENGINE_TYPE_BD)
{
+ setup_editor_el_players = FALSE;
setup_editor_el_boulderdash = FALSE;
setup_editor_el_emerald_mine = FALSE;
setup_editor_el_emerald_mine_club = FALSE;
setup_editor_el_boulderdash = FALSE;
setup_editor_el_emerald_mine = FALSE;
setup_editor_el_emerald_mine_club = FALSE;