projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added function to get envelope request center position
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index 091bbd7c4faa47fc49e933fd4193846773a1f554..3512218ee6bbb0fd3c4d1372c5b3d5fa53810bab 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-1055,7
+1055,7
@@
static struct
{
IMG_EDITOR_BUTTON_GFX_ZOOM_LEVEL, GADGET_ID_ZOOM,
&editor.button.zoom_level, GD_TYPE_NORMAL_BUTTON,
{
IMG_EDITOR_BUTTON_GFX_ZOOM_LEVEL, GADGET_ID_ZOOM,
&editor.button.zoom_level, GD_TYPE_NORMAL_BUTTON,
- "zoom level tile size", '
-
'
+ "zoom level tile size", '
+
'
},
{
IMG_EDITOR_BUTTON_GFX_ROTATE_RIGHT, GADGET_ID_WRAP_RIGHT,
},
{
IMG_EDITOR_BUTTON_GFX_ROTATE_RIGHT, GADGET_ID_WRAP_RIGHT,
@@
-3424,10
+3424,6
@@
static int new_element3 = EL_SAND;
#define BUTTON_ELEMENT(button) ((button) == 1 ? new_element1 : \
(button) == 2 ? new_element2 : \
(button) == 3 ? new_element3 : EL_EMPTY)
#define BUTTON_ELEMENT(button) ((button) == 1 ? new_element1 : \
(button) == 2 ? new_element2 : \
(button) == 3 ? new_element3 : EL_EMPTY)
-#define BUTTON_STEPSIZE(button) ((button) == 1 ? 1 : \
- (button) == 2 ? 5 : \
- (button) == 3 ? 10 : \
- (button))
/* forward declaration for internal use */
static void ModifyEditorCounterValue(int, int);
/* forward declaration for internal use */
static void ModifyEditorCounterValue(int, int);
@@
-5221,9
+5217,9
@@
void PrintEditorElementList()
int cascade_element_show = EL_CASCADE_INACTIVE(cascade_element);
char *headline = element_info[cascade_element_show].editor_description;
int cascade_element_show = EL_CASCADE_INACTIVE(cascade_element);
char *headline = element_info[cascade_element_show].editor_description;
-
printf_line_with_p
refix("# ", "-", 77);
-
printf
("# %s\n", headline);
-
printf_line_with_p
refix("# ", "-", 77);
+
PrintLineWithP
refix("# ", "-", 77);
+
Print
("# %s\n", headline);
+
PrintLineWithP
refix("# ", "-", 77);
}
for (j = 0; j < *editor_elements_info[i].headline_list_size; j++)
}
for (j = 0; j < *editor_elements_info[i].headline_list_size; j++)
@@
-5233,21
+5229,21
@@
void PrintEditorElementList()
if (IS_EDITOR_CASCADE(element))
element = EL_CHAR_MINUS;
if (IS_EDITOR_CASCADE(element))
element = EL_CHAR_MINUS;
-
printf
("# %s\n", element_info[element].token_name);
+
Print
("# %s\n", element_info[element].token_name);
}
if (j > 0)
}
if (j > 0)
-
printf
("#\n");
+
Print
("#\n");
for (j = 0; j < *editor_elements_info[i].element_list_size; j++)
{
int element = (*editor_elements_info[i].element_list)[j];
for (j = 0; j < *editor_elements_info[i].element_list_size; j++)
{
int element = (*editor_elements_info[i].element_list)[j];
-
printf
("# %s\n", element_info[element].token_name);
+
Print
("# %s\n", element_info[element].token_name);
}
if (j > 0)
}
if (j > 0)
-
printf
("#\n");
+
Print
("#\n");
}
}
}
}
@@
-11987,12
+11983,12
@@
void HandleLevelEditorKeyInput(Key key)
ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
else if (letter == 'U')
ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
ClickOnGadget(level_editor_gadget[GADGET_ID_SINGLE_ITEMS], button);
else if (letter == 'U')
ClickOnGadget(level_editor_gadget[GADGET_ID_UNDO], 3);
- else if (key == KSYM_KP_Subtract)
- ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM],
1
);
+ else if (key == KSYM_KP_Subtract
|| letter == '-'
)
+ ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM],
3
);
else if (key == KSYM_KP_0 || letter == '0')
ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
else if (key == KSYM_KP_0 || letter == '0')
ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM], 2);
- else if (key == KSYM_KP_Add
|| letter == '+'
)
- ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM],
3
);
+ else if (key == KSYM_KP_Add)
+ ClickOnGadget(level_editor_gadget[GADGET_ID_ZOOM],
1
);
else if (key == KSYM_Return ||
key == KSYM_space ||
key == setup.shortcut.toggle_pause)
else if (key == KSYM_Return ||
key == KSYM_space ||
key == setup.shortcut.toggle_pause)