projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved code for separate touch controls to separate functions (cleanup)
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index 9184cc7cd62f4b9a2721ec3d290a07cc79210158..c716bdae8d8dea9452f885036a85d5585fd57778 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-3874,12
+3874,12
@@
static int editor_el_emerald_mine[] =
EL_NUT,
EL_BOMB,
EL_NUT,
EL_BOMB,
- EL_
WALL_EMERALD
,
- EL_
WALL_DIAMOND
,
- EL_
DYNAMITE
,
- EL_
DYNAMITE_ACTIVE
,
+ EL_
EM_DYNAMITE
,
+ EL_
EM_DYNAMITE_ACTIVE
,
+ EL_
EM_EXIT_CLOSED
,
+ EL_
EM_EXIT_OPEN
,
- EL_YAMYAM,
+ EL_YAMYAM
_UP
,
EL_BUG_UP,
EL_SPACESHIP_UP,
EL_ROBOT,
EL_BUG_UP,
EL_SPACESHIP_UP,
EL_ROBOT,
@@
-3918,11
+3918,6
@@
static int editor_el_emerald_mine[] =
EL_EM_GATE_2_GRAY,
EL_EM_GATE_3_GRAY,
EL_EM_GATE_4_GRAY,
EL_EM_GATE_2_GRAY,
EL_EM_GATE_3_GRAY,
EL_EM_GATE_4_GRAY,
-
- EL_EM_EXIT_CLOSED,
- EL_EM_EXIT_OPEN,
- EL_EM_STEEL_EXIT_CLOSED,
- EL_EM_STEEL_EXIT_OPEN,
};
static int *editor_hl_emerald_mine_ptr = editor_hl_emerald_mine;
static int *editor_el_emerald_mine_ptr = editor_el_emerald_mine;
};
static int *editor_hl_emerald_mine_ptr = editor_hl_emerald_mine;
static int *editor_el_emerald_mine_ptr = editor_el_emerald_mine;
@@
-3996,8
+3991,8
@@
static int editor_el_emerald_mine_club[] =
EL_EMC_LENSES,
EL_EMC_MAGNIFIER,
EL_EMC_LENSES,
EL_EMC_MAGNIFIER,
- EL_EM
_DYNAMITE
,
- EL_EM
_DYNAMITE_ACTIVE
,
+ EL_EM
PTY
,
+ EL_EM
PTY
,
EL_BALLOON,
EL_YAMYAM_UP,
EL_BALLOON,
EL_YAMYAM_UP,
@@
-4029,6
+4024,11
@@
static int editor_hl_rnd[] =
static int editor_el_rnd[] =
{
static int editor_el_rnd[] =
{
+ EL_DYNAMITE, /* RND */
+ EL_DYNAMITE_ACTIVE, /* RND */
+ EL_EMPTY,
+ EL_EMPTY,
+
EL_KEY_1,
EL_KEY_2,
EL_KEY_3,
EL_KEY_1,
EL_KEY_2,
EL_KEY_3,
@@
-4072,7
+4072,7
@@
static int editor_el_rnd[] =
EL_PACMAN_LEFT,
EL_DARK_YAMYAM,
EL_PACMAN_RIGHT,
EL_PACMAN_LEFT,
EL_DARK_YAMYAM,
EL_PACMAN_RIGHT,
- EL_
EMPTY,
+ EL_
YAMYAM, /* RND */
EL_BLACK_ORB,
EL_PACMAN_DOWN,
EL_BLACK_ORB,
EL_PACMAN_DOWN,
@@
-4219,6
+4219,11
@@
static int editor_hl_diamond_caves[] =
static int editor_el_diamond_caves[] =
{
static int editor_el_diamond_caves[] =
{
+ EL_EM_STEEL_EXIT_CLOSED, /* DC2 */
+ EL_EM_STEEL_EXIT_OPEN, /* DC2 */
+ EL_WALL_EMERALD, /* DC2 */
+ EL_WALL_DIAMOND, /* DC2 */
+
EL_PEARL,
EL_CRYSTAL,
EL_WALL_PEARL,
EL_PEARL,
EL_CRYSTAL,
EL_WALL_PEARL,
@@
-8302,7
+8307,9
@@
static int getMaxEdFieldY(boolean has_scrollbar)
void InitZoomLevelSettings(int zoom_tilesize)
{
void InitZoomLevelSettings(int zoom_tilesize)
{
- if (zoom_tilesize == -1)
+ static int last_game_engine_type = GAME_ENGINE_TYPE_UNKNOWN;
+
+ if (zoom_tilesize == -1 && level.game_engine_type != last_game_engine_type)
{
ed_tilesize = setup.auto_setup.editor_zoom_tilesize;
ed_tilesize_default = DEFAULT_EDITOR_TILESIZE;
{
ed_tilesize = setup.auto_setup.editor_zoom_tilesize;
ed_tilesize_default = DEFAULT_EDITOR_TILESIZE;
@@
-8314,6
+8321,8
@@
void InitZoomLevelSettings(int zoom_tilesize)
}
}
}
}
+ last_game_engine_type = level.game_engine_type;
+
// limit zoom tilesize by upper and lower bound
ed_tilesize = MIN(MAX(MICRO_TILESIZE, ed_tilesize), TILESIZE);
// limit zoom tilesize by upper and lower bound
ed_tilesize = MIN(MAX(MICRO_TILESIZE, ed_tilesize), TILESIZE);