projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup of BD style game elements in level editor
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index 2d945fb5df484200f418cfdeb465197f03c31507..14c5d86c88accd68a93fa004846995767b35e066 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-4613,7
+4613,7
@@
static int editor_el_boulderdash_native[] =
EL_BD_STEELWALL,
EL_BD_WALL,
EL_BD_STEELWALL,
EL_BD_WALL,
- EL_
EMPTY
,
+ EL_
BD_SAND_2
,
EL_BD_MAGIC_WALL,
EL_BD_AMOEBA,
EL_BD_MAGIC_WALL,
EL_BD_AMOEBA,
@@
-4634,34
+4634,34
@@
static int editor_el_boulderdash_native[] =
EL_BD_AMOEBA_2,
EL_BD_BUTTERFLY_2_UP,
EL_BD_FIREFLY_2_UP,
EL_BD_AMOEBA_2,
EL_BD_BUTTERFLY_2_UP,
EL_BD_FIREFLY_2_UP,
- EL_
EMPTY
,
+ EL_
BD_SLIME
,
EL_BD_BUTTERFLY_2_LEFT,
EL_BD_FIREFLY_2_LEFT,
EL_BD_BUTTERFLY_2_RIGHT,
EL_BD_FIREFLY_2_RIGHT,
EL_BD_BUTTERFLY_2_LEFT,
EL_BD_FIREFLY_2_LEFT,
EL_BD_BUTTERFLY_2_RIGHT,
EL_BD_FIREFLY_2_RIGHT,
- EL_
EMPTY
,
+ EL_
BD_BOMB
,
EL_BD_BUTTERFLY_2_DOWN,
EL_BD_FIREFLY_2_DOWN,
EL_BD_BUTTERFLY_2_DOWN,
EL_BD_FIREFLY_2_DOWN,
- EL_
EMPTY
,
+ EL_
BD_FLYING_DIAMOND
,
- EL_
EMPTY
,
+ EL_
BD_NITRO_PACK
,
EL_BD_DRAGONFLY_UP,
EL_BD_STONEFLY_UP,
EL_BD_DRAGONFLY_UP,
EL_BD_STONEFLY_UP,
- EL_
EMPTY
,
+ EL_
BD_DIAMOND_GLUED
,
EL_BD_DRAGONFLY_LEFT,
EL_BD_STONEFLY_LEFT,
EL_BD_DRAGONFLY_RIGHT,
EL_BD_STONEFLY_RIGHT,
EL_BD_DRAGONFLY_LEFT,
EL_BD_STONEFLY_LEFT,
EL_BD_DRAGONFLY_RIGHT,
EL_BD_STONEFLY_RIGHT,
- EL_
EMPTY
,
+ EL_
BD_NUT
,
EL_BD_DRAGONFLY_DOWN,
EL_BD_STONEFLY_DOWN,
EL_EMPTY,
EL_BD_DRAGONFLY_DOWN,
EL_BD_STONEFLY_DOWN,
EL_EMPTY,
- EL_
EMPTY
,
+ EL_
BD_BITER_SWITCH_1
,
EL_BD_BITER_UP,
EL_BD_COW_UP,
EL_EMPTY,
EL_BD_BITER_UP,
EL_BD_COW_UP,
EL_EMPTY,
@@
-4671,15
+4671,15
@@
static int editor_el_boulderdash_native[] =
EL_BD_BITER_RIGHT,
EL_BD_COW_RIGHT,
EL_BD_BITER_RIGHT,
EL_BD_COW_RIGHT,
- EL_
EMPTY
,
+ EL_
BD_VOODOO_DOLL
,
EL_BD_BITER_DOWN,
EL_BD_COW_DOWN,
EL_BD_BITER_DOWN,
EL_BD_COW_DOWN,
- EL_
EMPTY
,
+ EL_
BD_GHOST
,
- EL_EMPTY,
- EL_BD_SAND,
+ EL_BD_SAND_GLUED,
EL_BD_SAND_BALL,
EL_BD_SAND_LOOSE,
EL_BD_SAND_BALL,
EL_BD_SAND_LOOSE,
+ EL_BD_WALL_NON_SLOPED,
EL_BD_SAND_SLOPED_UP_LEFT,
EL_BD_SAND_SLOPED_UP_RIGHT,
EL_BD_SAND_SLOPED_UP_LEFT,
EL_BD_SAND_SLOPED_UP_RIGHT,
@@
-4691,100
+4691,75
@@
static int editor_el_boulderdash_native[] =
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_FLYING_ROCK,
+ EL_BD_ROCK_GLUED,
EL_BD_STEELWALL_SLOPED_UP_LEFT,
EL_BD_STEELWALL_SLOPED_UP_RIGHT,
EL_BD_STEELWALL_SLOPED_UP_LEFT,
EL_BD_STEELWALL_SLOPED_UP_RIGHT,
- EL_BD_
NUT
,
- EL_BD_
MEGA
_ROCK,
+ EL_BD_
WAITING_ROCK
,
+ EL_BD_
CHASING
_ROCK,
EL_BD_STEELWALL_SLOPED_DOWN_LEFT,
EL_BD_STEELWALL_SLOPED_DOWN_RIGHT,
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_MAGIC_WALL,
-
- EL_BD_EXIT_CLOSED,
- EL_BD_EXIT_OPEN,
+ EL_BD_MEGA_ROCK,
+ EL_BD_SWEET,
EL_BD_INVISIBLE_EXIT_CLOSED,
EL_BD_INVISIBLE_EXIT_OPEN,
EL_BD_INVISIBLE_EXIT_CLOSED,
EL_BD_INVISIBLE_EXIT_OPEN,
- EL_BD_STEELWALL,
EL_BD_STEELWALL_EXPLODABLE,
EL_BD_STEELWALL_DIGGABLE,
EL_BD_WALL_DIGGABLE,
EL_BD_STEELWALL_EXPLODABLE,
EL_BD_STEELWALL_DIGGABLE,
EL_BD_WALL_DIGGABLE,
+ EL_BD_FALLING_WALL,
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,
- EL_BD_
CREATURE_SWITCH
,
+ EL_BD_
EXPANDABLE_WALL_SWITCH_HORIZONTAL
,
EL_BD_EXPANDABLE_STEELWALL_HORIZONTAL,
EL_BD_EXPANDABLE_STEELWALL_VERTICAL,
EL_BD_EXPANDABLE_STEELWALL_ANY,
EL_BD_EXPANDABLE_STEELWALL_HORIZONTAL,
EL_BD_EXPANDABLE_STEELWALL_VERTICAL,
EL_BD_EXPANDABLE_STEELWALL_ANY,
- EL_BD_
EXPANDABLE_WALL_SWITCH_HORIZONTAL
,
+ EL_BD_
CREATURE_SWITCH
,
- EL_BD_BITER_SWITCH_1,
+ EL_BD_BLADDER,
+ EL_BD_BLADDER_SPENDER,
+ EL_BD_REPLICATOR,
EL_BD_REPLICATOR_SWITCH,
EL_BD_REPLICATOR_SWITCH,
+
+ EL_BD_CONVEYOR_LEFT,
+ EL_BD_CONVEYOR_RIGHT,
EL_BD_CONVEYOR_SWITCH,
EL_BD_CONVEYOR_DIR_SWITCH_RIGHT,
EL_BD_CONVEYOR_SWITCH,
EL_BD_CONVEYOR_DIR_SWITCH_RIGHT,
- EL_BD_ACID,
- EL_BD_FALLING_WALL,
- EL_BD_BOX,
+ EL_BD_CLOCK,
EL_BD_TIME_PENALTY,
EL_BD_TIME_PENALTY,
-
EL_BD_GRAVESTONE,
EL_BD_GRAVESTONE,
- EL_BD_ROCK_GLUED,
- EL_BD_DIAMOND_GLUED,
- EL_BD_DIAMOND_KEY,
+ EL_BD_SKELETON,
- EL_BD_TRAPPED_DIAMOND,
- EL_BD_CLOCK,
- EL_BD_SAND_GLUED,
EL_BD_WATER,
EL_BD_WATER,
+ EL_BD_ACID,
+ EL_BD_LAVA,
+ EL_BD_BOX,
+
+ EL_BD_GATE_1,
+ EL_BD_GATE_2,
+ EL_BD_GATE_3,
+ EL_BD_TRAPPED_DIAMOND,
EL_BD_KEY_1,
EL_BD_KEY_2,
EL_BD_KEY_3,
EL_BD_KEY_1,
EL_BD_KEY_2,
EL_BD_KEY_3,
- EL_
EMPT
Y,
+ EL_
BD_DIAMOND_KE
Y,
EL_BD_WALL_KEY_1,
EL_BD_WALL_KEY_2,
EL_BD_WALL_KEY_3,
EL_BD_WALL_DIAMOND,
EL_BD_WALL_KEY_1,
EL_BD_WALL_KEY_2,
EL_BD_WALL_KEY_3,
EL_BD_WALL_DIAMOND,
- EL_BD_GATE_1,
- EL_BD_GATE_2,
- EL_BD_GATE_3,
- EL_BD_POT,
-
EL_BD_GRAVITY_SWITCH,
EL_BD_PNEUMATIC_HAMMER,
EL_BD_TELEPORTER,
EL_BD_GRAVITY_SWITCH,
EL_BD_PNEUMATIC_HAMMER,
EL_BD_TELEPORTER,
- EL_BD_SKELETON,
-
- EL_BD_AMOEBA,
- EL_BD_AMOEBA_2,
- EL_BD_REPLICATOR,
- EL_BD_BLADDER_SPENDER,
-
- EL_BD_CONVEYOR_LEFT,
- EL_BD_CONVEYOR_RIGHT,
- EL_BD_BOMB,
- EL_BD_NITRO_PACK,
-
- EL_BD_LAVA,
- EL_BD_SWEET,
- EL_BD_VOODOO_DOLL,
- EL_BD_SLIME,
-
- EL_BD_BLADDER,
- EL_BD_WAITING_ROCK,
- EL_BD_CHASING_ROCK,
- EL_BD_GHOST,
+ EL_BD_POT,
EL_BD_PLAYER,
EL_BD_PLAYER_WITH_BOMB,
EL_BD_PLAYER,
EL_BD_PLAYER_WITH_BOMB,