projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
319723c
)
fixed bug with not warning when editing GEs when using level template
author
Holger Schemel
<info@artsoft.org>
Thu, 26 Jan 2017 14:29:12 +0000
(15:29 +0100)
committer
Holger Schemel
<info@artsoft.org>
Thu, 26 Jan 2017 20:41:53 +0000
(21:41 +0100)
src/editor.c
patch
|
blob
|
history
diff --git
a/src/editor.c
b/src/editor.c
index 6aa8b8d67222e6ede4a6641b5fc1eaac425fe987..081e134d692628c9aa3ab8a4f801c3b23ad72acd 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-7516,6
+7516,23
@@
static void CopyElementPropertiesToEditor(int element)
CopyClassicElementPropertiesToEditor(element);
}
CopyClassicElementPropertiesToEditor(element);
}
+static void AskToCopyAndModifyLevelTemplate()
+{
+ if (Request("Copy and modify level template?", REQ_ASK))
+ {
+ level.use_custom_template = FALSE;
+
+ ModifyGadget(level_editor_gadget[GADGET_ID_CUSTOM_USE_TEMPLATE],
+ GDI_CHECKED, FALSE, GDI_END);
+ }
+ else
+ {
+ LoadLevelTemplate(-1); /* this resets all element modifications ... */
+
+ DrawEditModeWindow(); /* ... and copies them to 'custom_element' */
+ }
+}
+
static void CopyCustomElementPropertiesToGame(int element)
{
int i;
static void CopyCustomElementPropertiesToGame(int element)
{
int i;
@@
-7526,20
+7543,7
@@
static void CopyCustomElementPropertiesToGame(int element)
level.changed = TRUE;
if (level.use_custom_template)
level.changed = TRUE;
if (level.use_custom_template)
- {
- if (Request("Copy and modify level template?", REQ_ASK))
- {
- level.use_custom_template = FALSE;
- ModifyGadget(level_editor_gadget[GADGET_ID_CUSTOM_USE_TEMPLATE],
- GDI_CHECKED, FALSE, GDI_END);
- }
- else
- {
- LoadLevelTemplate(-1); /* this resets all element modifications ... */
-
- DrawEditModeWindow(); /* ... and copies them to 'custom_element' */
- }
- }
+ AskToCopyAndModifyLevelTemplate();
element_info[element] = custom_element;
*element_info[element].change = custom_element_change;
element_info[element] = custom_element;
*element_info[element].change = custom_element_change;
@@
-7650,12
+7654,15
@@
static void CopyCustomElementPropertiesToGame(int element)
static void CopyGroupElementPropertiesToGame(int element)
{
static void CopyGroupElementPropertiesToGame(int element)
{
- element_info[element] = custom_element;
- *element_info[element].group = group_element_info;
-
/* mark that this group element has been modified */
/* mark that this group element has been modified */
-
element_info[element]
.modified_settings = TRUE;
+
custom_element
.modified_settings = TRUE;
level.changed = TRUE;
level.changed = TRUE;
+
+ if (level.use_custom_template)
+ AskToCopyAndModifyLevelTemplate();
+
+ element_info[element] = custom_element;
+ *element_info[element].group = group_element_info;
}
static void CopyClassicElementPropertiesToGame(int element)
}
static void CopyClassicElementPropertiesToGame(int element)