projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed name of element 'polarisator' to 'polarizer'
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index 9184cc7cd62f4b9a2721ec3d290a07cc79210158..f99794b2dd5a37179f7be944b22517ace8977b5f 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-3749,7
+3749,6
@@
static void AdjustElementListScrollbar();
static void RedrawDrawingElements();
static void DrawDrawingWindowExt(boolean);
static void DrawDrawingWindow();
static void RedrawDrawingElements();
static void DrawDrawingWindowExt(boolean);
static void DrawDrawingWindow();
-static void DrawDrawingWindow_PlayfieldOnly();
static void DrawLevelInfoWindow();
static void DrawPropertiesWindow();
static void DrawPaletteWindow();
static void DrawLevelInfoWindow();
static void DrawPropertiesWindow();
static void DrawPaletteWindow();
@@
-3874,12
+3873,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
+3917,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
+3990,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
+4023,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
+4071,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
+4218,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,
@@
-4418,8
+4422,8
@@
static int editor_el_mirror_magic[] =
EL_MM_MIRROR_START,
EL_MM_MIRROR_FIXED_START,
EL_MM_MIRROR_START,
EL_MM_MIRROR_FIXED_START,
- EL_MM_POLARI
SATO
R_START,
- EL_MM_POLARI
SATO
R_CROSS_START,
+ EL_MM_POLARI
ZE
R_START,
+ EL_MM_POLARI
ZE
R_CROSS_START,
EL_MM_BEAMER_RED_START,
EL_MM_BEAMER_YELLOW_START,
EL_MM_BEAMER_RED_START,
EL_MM_BEAMER_YELLOW_START,
@@
-7559,10
+7563,13
@@
static void ResetUndoBuffer()
level.changed = FALSE;
}
level.changed = FALSE;
}
-static void DrawEditModeWindow
(
)
+static void DrawEditModeWindow
Ext(boolean remap_toolbox_gadgets
)
{
{
- ModifyEditorElementList();
- RedrawDrawingElements();
+ if (remap_toolbox_gadgets)
+ {
+ ModifyEditorElementList();
+ RedrawDrawingElements();
+ }
if (edit_mode == ED_MODE_INFO)
DrawLevelInfoWindow();
if (edit_mode == ED_MODE_INFO)
DrawLevelInfoWindow();
@@
-7571,7
+7578,17
@@
static void DrawEditModeWindow()
else if (edit_mode == ED_MODE_PALETTE)
DrawPaletteWindow();
else /* edit_mode == ED_MODE_DRAWING */
else if (edit_mode == ED_MODE_PALETTE)
DrawPaletteWindow();
else /* edit_mode == ED_MODE_DRAWING */
- DrawDrawingWindow();
+ DrawDrawingWindowExt(remap_toolbox_gadgets);
+}
+
+static void DrawEditModeWindow()
+{
+ DrawEditModeWindowExt(TRUE);
+}
+
+static void DrawEditModeWindow_PlayfieldOnly()
+{
+ DrawEditModeWindowExt(FALSE);
}
static void ChangeEditModeWindow(int new_edit_mode)
}
static void ChangeEditModeWindow(int new_edit_mode)
@@
-8302,7
+8319,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
+8333,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);
@@
-8496,7
+8517,7
@@
void DrawLevelEd()
UnmapAllGadgets();
UnmapAllGadgets();
- Draw
Drawing
Window_PlayfieldOnly();
+ Draw
EditMode
Window_PlayfieldOnly();
DrawMaskedBorder(fade_mask);
DrawMaskedBorder(fade_mask);
@@
-8843,11
+8864,6
@@
static void DrawDrawingWindow()
DrawDrawingWindowExt(TRUE);
}
DrawDrawingWindowExt(TRUE);
}
-static void DrawDrawingWindow_PlayfieldOnly()
-{
- DrawDrawingWindowExt(FALSE);
-}
-
static int getTabulatorBarWidth()
{
struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_PROPERTIES_INFO];
static int getTabulatorBarWidth()
{
struct GadgetInfo *gd_gi1 = level_editor_gadget[GADGET_ID_PROPERTIES_INFO];
@@
-11185,10
+11201,10
@@
static void SetElementIntelliDraw(int x, int y, int new_element,
EL_MM_WOODEN_GRID_FIXED_3
},
{
EL_MM_WOODEN_GRID_FIXED_3
},
{
- EL_MM_POLARI
SATO
R_CROSS_1,
- EL_MM_POLARI
SATO
R_CROSS_4,
- EL_MM_POLARI
SATO
R_CROSS_3,
- EL_MM_POLARI
SATO
R_CROSS_2
+ EL_MM_POLARI
ZE
R_CROSS_1,
+ EL_MM_POLARI
ZE
R_CROSS_4,
+ EL_MM_POLARI
ZE
R_CROSS_3,
+ EL_MM_POLARI
ZE
R_CROSS_2
},
{
EL_MM_PACMAN_UP,
},
{
EL_MM_PACMAN_UP,
@@
-11371,22
+11387,22
@@
static void SetElementIntelliDraw(int x, int y, int new_element,
EL_MM_BEAMER_BLUE_6
},
{
EL_MM_BEAMER_BLUE_6
},
{
- EL_MM_POLARI
SATO
R_1,
- EL_MM_POLARI
SATO
R_16,
- EL_MM_POLARI
SATO
R_15,
- EL_MM_POLARI
SATO
R_14,
- EL_MM_POLARI
SATO
R_13,
- EL_MM_POLARI
SATO
R_12,
- EL_MM_POLARI
SATO
R_11,
- EL_MM_POLARI
SATO
R_10,
- EL_MM_POLARI
SATO
R_9,
- EL_MM_POLARI
SATO
R_8,
- EL_MM_POLARI
SATO
R_7,
- EL_MM_POLARI
SATO
R_6,
- EL_MM_POLARI
SATO
R_5,
- EL_MM_POLARI
SATO
R_4,
- EL_MM_POLARI
SATO
R_3,
- EL_MM_POLARI
SATO
R_2
+ EL_MM_POLARI
ZE
R_1,
+ EL_MM_POLARI
ZE
R_16,
+ EL_MM_POLARI
ZE
R_15,
+ EL_MM_POLARI
ZE
R_14,
+ EL_MM_POLARI
ZE
R_13,
+ EL_MM_POLARI
ZE
R_12,
+ EL_MM_POLARI
ZE
R_11,
+ EL_MM_POLARI
ZE
R_10,
+ EL_MM_POLARI
ZE
R_9,
+ EL_MM_POLARI
ZE
R_8,
+ EL_MM_POLARI
ZE
R_7,
+ EL_MM_POLARI
ZE
R_6,
+ EL_MM_POLARI
ZE
R_5,
+ EL_MM_POLARI
ZE
R_4,
+ EL_MM_POLARI
ZE
R_3,
+ EL_MM_POLARI
ZE
R_2
},
{
EL_DF_MIRROR_1,
},
{
EL_DF_MIRROR_1,