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 c716bdae8d8dea9452f885036a85d5585fd57778..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();
@@
-4423,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,
@@
-7564,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();
@@
-7576,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)
@@
-8505,7
+8517,7
@@
void DrawLevelEd()
UnmapAllGadgets();
UnmapAllGadgets();
- Draw
Drawing
Window_PlayfieldOnly();
+ Draw
EditMode
Window_PlayfieldOnly();
DrawMaskedBorder(fade_mask);
DrawMaskedBorder(fade_mask);
@@
-8852,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];
@@
-11194,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,
@@
-11380,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,