projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with deriving game data directory from default 'setup.conf'
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index c716bdae8d8dea9452f885036a85d5585fd57778..bcb57abc861ad5ced43efcc88e490ac57850fa26 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();
@@
-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];