#include "tools.h"
#include "files.h"
#include "game.h"
+#include "init.h"
#include "tape.h"
#define ED_AREA_ELEM_CONTENT4_YPOS (ED_SETTINGS_YPOS(12) + \
ED_GADGET_DISTANCE - MINI_TILEY)
/* custom change trigger element */
-#define ED_AREA_ELEM_CONTENT5_XPOS (30 * MINI_TILEX + MINI_TILEX / 2)
+#define ED_AREA_ELEM_CONTENT5_XPOS (28 * MINI_TILEX)
#define ED_AREA_ELEM_CONTENT5_YPOS (ED_SETTINGS_YPOS(7) + \
ED_GADGET_DISTANCE)
/* extended custom change target */
static struct ValueTextInfo options_change_other_action[] =
{
- { CE_OTHER_COLLECTING, "collecting" },
- { CE_OTHER_TOUCHING, "touching" },
- { CE_OTHER_PRESSING, "pressing" },
- { CE_OTHER_PUSHING, "pushing" },
- { CE_OTHER_CHANGING, "change of" },
- { CE_OTHER_EXPLODING, "explosion of" },
- { -1, NULL }
+ { CE_OTHER_IS_TOUCHING, "touching" },
+ { CE_OTHER_IS_CHANGING, "change of" },
+ { CE_OTHER_IS_EXPLODING, "explosion of" },
+ { CE_OTHER_GETS_TOUCHED, "player touches" },
+ { CE_OTHER_GETS_PRESSED, "player presses" },
+ { CE_OTHER_GETS_PUSHED, "player pushes" },
+ { CE_OTHER_GETS_COLLECTED, "player collects" },
+ { -1, NULL }
};
static int value_change_other_action = 0;
-1,
options_change_other_action,
&value_change_other_action,
- NULL, "other element:", "type of other element action"
+ NULL, "element:", "type of other element action"
},
{
ED_SETTINGS_XPOS(2), ED_SETTINGS_YPOS(10),
}
};
+static boolean can_explode_by_fire = FALSE;
+static boolean can_explode_smashed = FALSE;
+static boolean can_explode_impact = FALSE;
+
static struct
{
int x, y;
{
ED_SETTINGS_XPOS(1), ED_SETTINGS_YPOS(13),
GADGET_ID_CUSTOM_EXPLODE_FIRE,
- &custom_element_properties[EP_CAN_EXPLODE_BY_FIRE],
+ &can_explode_by_fire,
"by fire", "element can explode by fire/explosion"
},
{
ED_SETTINGS_XPOS(7), ED_SETTINGS_YPOS(13),
GADGET_ID_CUSTOM_EXPLODE_SMASH,
- &custom_element_properties[EP_CAN_EXPLODE_SMASHED],
+ &can_explode_smashed,
"smashed", "element can explode when smashed"
},
{
ED_SETTINGS_XPOS(13), ED_SETTINGS_YPOS(13),
GADGET_ID_CUSTOM_EXPLODE_IMPACT,
- &custom_element_properties[EP_CAN_EXPLODE_IMPACT],
+ &can_explode_impact,
"impact", "element can explode on impact"
},
{
ED_SETTINGS_XPOS(0), ED_SETTINGS_YPOS(13),
GADGET_ID_CUSTOM_USE_TEMPLATE,
- &custom_element.use_template,
+ &level.use_custom_template,
"use template", "use template for custom properties"
},
};
{
int i;
+ /* needed here to initialize combined element properties */
+ InitElementPropertiesEngine(level.game_version);
+
custom_element = element_info[properties_element];
for (i=0; i < NUM_ELEMENT_PROPERTIES; i++)
for (i=0; i < NUM_CHANGE_EVENTS; i++)
custom_element_change_events[i] = HAS_CHANGE_EVENT(element, i);
+ /* ---------- element settings: configure (custom elements) ------------- */
+
+ /* set accessible layer selectbox help value */
+ value_access_type =
+ (IS_WALKABLE(element) ? EP_WALKABLE :
+ IS_PASSABLE(element) ? EP_PASSABLE :
+ value_access_type);
+ value_access_layer =
+ (IS_ACCESSIBLE_OVER(element) ? EP_ACCESSIBLE_OVER :
+ IS_ACCESSIBLE_INSIDE(element) ? EP_ACCESSIBLE_INSIDE :
+ IS_ACCESSIBLE_UNDER(element) ? EP_ACCESSIBLE_UNDER :
+ value_access_layer);
+ custom_element_properties[EP_ACCESSIBLE] =
+ (IS_ACCESSIBLE_OVER(element) ||
+ IS_ACCESSIBLE_INSIDE(element) ||
+ IS_ACCESSIBLE_UNDER(element));
+
/* set walk-to-object action selectbox help value */
value_walk_to_action =
(IS_DIGGABLE(element) ? EP_DIGGABLE :
IS_COLLECTIBLE(element) ? EP_COLLECTIBLE :
IS_PUSHABLE(element) ? EP_PUSHABLE :
- EP_DIGGABLE);
+ value_walk_to_action);
custom_element_properties[EP_WALK_TO_OBJECT] =
(IS_DIGGABLE(element) ||
IS_COLLECTIBLE(element) ||
IS_PUSHABLE(element));
- /* set consistency selectbox help value */
- value_consistency =
- (CAN_EXPLODE(element) ? EP_CAN_EXPLODE :
- IS_INDESTRUCTIBLE(element) ? EP_INDESTRUCTIBLE :
- EP_CAN_EXPLODE);
- custom_element_properties[EP_EXPLODE_RESULT] =
- (CAN_EXPLODE(element) ||
- IS_INDESTRUCTIBLE(element));
+ /* set smash targets selectbox help value */
+ value_smash_targets =
+ (CAN_SMASH_EVERYTHING(element) ? EP_CAN_SMASH_EVERYTHING :
+ CAN_SMASH_ENEMIES(element) ? EP_CAN_SMASH_ENEMIES :
+ CAN_SMASH_PLAYER(element) ? EP_CAN_SMASH_PLAYER :
+ value_smash_targets);
+ custom_element_properties[EP_CAN_SMASH] =
+ (CAN_SMASH_EVERYTHING(element) ||
+ CAN_SMASH_ENEMIES(element) ||
+ CAN_SMASH_PLAYER(element));
/* set deadliness selectbox help value */
value_deadliness =
(DONT_TOUCH(element) ? EP_DONT_TOUCH :
DONT_COLLIDE_WITH(element) ? EP_DONT_COLLIDE_WITH :
DONT_RUN_INTO(element) ? EP_DONT_RUN_INTO :
- EP_DONT_RUN_INTO);
+ value_deadliness);
custom_element_properties[EP_DEADLY] =
(DONT_TOUCH(element) ||
DONT_COLLIDE_WITH(element) ||
DONT_RUN_INTO(element));
- /* set smash targets selectbox help value */
- value_smash_targets =
- (CAN_SMASH_EVERYTHING(element) ? EP_CAN_SMASH_EVERYTHING :
- CAN_SMASH_ENEMIES(element) ? EP_CAN_SMASH_ENEMIES :
- CAN_SMASH_PLAYER(element) ? EP_CAN_SMASH_PLAYER :
- EP_CAN_SMASH_PLAYER);
- custom_element_properties[EP_CAN_SMASH] =
- (CAN_SMASH_EVERYTHING(element) ||
- CAN_SMASH_ENEMIES(element) ||
- CAN_SMASH_PLAYER(element));
+ /* set consistency selectbox help value */
+ value_consistency =
+ (IS_INDESTRUCTIBLE(element) ? EP_INDESTRUCTIBLE :
+ CAN_EXPLODE(element) ? EP_CAN_EXPLODE :
+ value_consistency);
+ custom_element_properties[EP_EXPLODE_RESULT] =
+ (IS_INDESTRUCTIBLE(element) ||
+ CAN_EXPLODE(element));
- /* set accessible layer selectbox help value */
- value_access_type =
- (IS_WALKABLE(element) ? EP_WALKABLE :
- IS_PASSABLE(element) ? EP_PASSABLE :
- EP_WALKABLE);
- value_access_layer =
- (IS_ACCESSIBLE_OVER(element) ? EP_ACCESSIBLE_OVER :
- IS_ACCESSIBLE_INSIDE(element) ? EP_ACCESSIBLE_INSIDE :
- IS_ACCESSIBLE_UNDER(element) ? EP_ACCESSIBLE_UNDER :
- EP_ACCESSIBLE_OVER);
- custom_element_properties[EP_ACCESSIBLE] =
- (IS_ACCESSIBLE_OVER(element) ||
- IS_ACCESSIBLE_INSIDE(element) ||
- IS_ACCESSIBLE_UNDER(element));
+ /* special case: sub-settings dependent from main setting */
+ if (CAN_EXPLODE(element))
+ {
+ can_explode_by_fire = CAN_EXPLODE_BY_FIRE(element);
+ can_explode_smashed = CAN_EXPLODE_SMASHED(element);
+ can_explode_impact = CAN_EXPLODE_IMPACT(element);
+ };
+
+ /* ---------- element settings: advanced (custom elements) --------------- */
/* set change by player selectbox help value */
value_change_player_action =
(HAS_CHANGE_EVENT(element, CE_PUSHED_BY_PLAYER) ? CE_PUSHED_BY_PLAYER :
HAS_CHANGE_EVENT(element, CE_PRESSED_BY_PLAYER) ? CE_PRESSED_BY_PLAYER :
HAS_CHANGE_EVENT(element, CE_TOUCHED_BY_PLAYER) ? CE_TOUCHED_BY_PLAYER :
- CE_PRESSED_BY_PLAYER);
+ value_change_player_action);
- /* set change by impact/smash selectbox help value */
+ /* set change by collision selectbox help value */
value_change_collide_action =
(HAS_CHANGE_EVENT(element, CE_SMASHED) ? CE_SMASHED :
HAS_CHANGE_EVENT(element, CE_IMPACT) ? CE_IMPACT :
HAS_CHANGE_EVENT(element, CE_COLLISION) ? CE_COLLISION :
- CE_COLLISION);
+ value_change_collide_action);
/* set change by other element action selectbox help value */
value_change_other_action =
- (HAS_CHANGE_EVENT(element, CE_OTHER_EXPLODING) ? CE_OTHER_EXPLODING :
- HAS_CHANGE_EVENT(element, CE_OTHER_CHANGING) ? CE_OTHER_CHANGING :
- HAS_CHANGE_EVENT(element, CE_OTHER_PUSHING) ? CE_OTHER_PUSHING :
- HAS_CHANGE_EVENT(element, CE_OTHER_PRESSING) ? CE_OTHER_PRESSING :
- HAS_CHANGE_EVENT(element, CE_OTHER_TOUCHING) ? CE_OTHER_TOUCHING :
- HAS_CHANGE_EVENT(element, CE_OTHER_COLLECTING) ? CE_OTHER_COLLECTING :
- CE_OTHER_COLLECTING);
+ (HAS_CHANGE_EVENT(element, CE_OTHER_GETS_COLLECTED) ? CE_OTHER_GETS_COLLECTED :
+ HAS_CHANGE_EVENT(element, CE_OTHER_GETS_PUSHED) ? CE_OTHER_GETS_PUSHED :
+ HAS_CHANGE_EVENT(element, CE_OTHER_GETS_PRESSED) ? CE_OTHER_GETS_PRESSED :
+ HAS_CHANGE_EVENT(element, CE_OTHER_GETS_TOUCHED) ? CE_OTHER_GETS_TOUCHED :
+ HAS_CHANGE_EVENT(element, CE_OTHER_IS_EXPLODING) ? CE_OTHER_IS_EXPLODING :
+ HAS_CHANGE_EVENT(element, CE_OTHER_IS_CHANGING) ? CE_OTHER_IS_CHANGING :
+ HAS_CHANGE_EVENT(element, CE_OTHER_IS_TOUCHING) ? CE_OTHER_IS_TOUCHING :
+ value_change_other_action);
}
static void CopyCustomElementPropertiesToGame(int element)
element_info[properties_element] = custom_element;
+ /* ---------- element settings: configure (custom elements) ------------- */
+
+ /* set accessible property from checkbox and selectbox */
+ custom_element_properties[EP_WALKABLE_OVER] = FALSE;
+ custom_element_properties[EP_WALKABLE_INSIDE] = FALSE;
+ custom_element_properties[EP_WALKABLE_UNDER] = FALSE;
+ custom_element_properties[EP_PASSABLE_OVER] = FALSE;
+ custom_element_properties[EP_PASSABLE_INSIDE] = FALSE;
+ custom_element_properties[EP_PASSABLE_UNDER] = FALSE;
+ custom_element_properties[((value_access_type == EP_WALKABLE ?
+ EP_WALKABLE_OVER : EP_PASSABLE_OVER) +
+ (value_access_layer - EP_ACCESSIBLE_OVER))] =
+ custom_element_properties[EP_ACCESSIBLE];
+
/* set walk-to-object property from checkbox and selectbox */
custom_element_properties[EP_DIGGABLE] = FALSE;
custom_element_properties[EP_COLLECTIBLE] = FALSE;
custom_element_properties[value_walk_to_action] =
custom_element_properties[EP_WALK_TO_OBJECT];
- /* set consistency property from checkbox and selectbox */
- custom_element_properties[EP_CAN_EXPLODE] = FALSE;
- custom_element_properties[EP_INDESTRUCTIBLE] = FALSE;
- custom_element_properties[value_consistency] =
- custom_element_properties[EP_EXPLODE_RESULT];
+ /* set smash property from checkbox and selectbox */
+ custom_element_properties[EP_CAN_SMASH_PLAYER] = FALSE;
+ custom_element_properties[EP_CAN_SMASH_ENEMIES] = FALSE;
+ custom_element_properties[EP_CAN_SMASH_EVERYTHING] = FALSE;
+ custom_element_properties[value_smash_targets] =
+ custom_element_properties[EP_CAN_SMASH];
/* set deadliness property from checkbox and selectbox */
custom_element_properties[EP_DONT_RUN_INTO] = FALSE;
custom_element_properties[value_deadliness] =
custom_element_properties[EP_DEADLY];
- /* set smash property from checkbox and selectbox */
- custom_element_properties[EP_CAN_SMASH_PLAYER] = FALSE;
- custom_element_properties[EP_CAN_SMASH_ENEMIES] = FALSE;
- custom_element_properties[EP_CAN_SMASH_EVERYTHING] = FALSE;
- custom_element_properties[value_smash_targets] =
- custom_element_properties[EP_CAN_SMASH];
+ /* set consistency property from checkbox and selectbox */
+ custom_element_properties[EP_INDESTRUCTIBLE] = FALSE;
+ custom_element_properties[EP_CAN_EXPLODE] = FALSE;
+ custom_element_properties[EP_CAN_EXPLODE_BY_FIRE] = FALSE;
+ custom_element_properties[EP_CAN_EXPLODE_SMASHED] = FALSE;
+ custom_element_properties[EP_CAN_EXPLODE_IMPACT] = FALSE;
+ custom_element_properties[value_consistency] =
+ custom_element_properties[EP_EXPLODE_RESULT];
- /* set accessible property from checkbox and selectbox */
- custom_element_properties[EP_WALKABLE_OVER] = FALSE;
- custom_element_properties[EP_WALKABLE_INSIDE] = FALSE;
- custom_element_properties[EP_WALKABLE_UNDER] = FALSE;
- custom_element_properties[EP_PASSABLE_OVER] = FALSE;
- custom_element_properties[EP_PASSABLE_INSIDE] = FALSE;
- custom_element_properties[EP_PASSABLE_UNDER] = FALSE;
- custom_element_properties[((value_access_type == EP_WALKABLE ?
- EP_WALKABLE_OVER : EP_PASSABLE_OVER) +
- (value_access_layer - EP_ACCESSIBLE_OVER))] =
- custom_element_properties[EP_ACCESSIBLE];
+ /* special case: sub-settings dependent from main setting */
+ if (custom_element_properties[EP_CAN_EXPLODE])
+ {
+ custom_element_properties[EP_CAN_EXPLODE_BY_FIRE] = can_explode_by_fire;
+ custom_element_properties[EP_CAN_EXPLODE_SMASHED] = can_explode_smashed;
+ custom_element_properties[EP_CAN_EXPLODE_IMPACT] = can_explode_impact;
+ }
+
+ /* ---------- element settings: advanced (custom elements) --------------- */
/* set player change event from checkbox and selectbox */
custom_element_change_events[CE_TOUCHED_BY_PLAYER] = FALSE;
custom_element_change_events[value_change_player_action] =
custom_element_change_events[CE_BY_PLAYER];
- /* set player change event from checkbox and selectbox */
+ /* set collision change event from checkbox and selectbox */
custom_element_change_events[CE_COLLISION] = FALSE;
custom_element_change_events[CE_IMPACT] = FALSE;
custom_element_change_events[CE_SMASHED] = FALSE;
custom_element_change_events[CE_BY_COLLISION];
/* set other element action change event from checkbox and selectbox */
- custom_element_change_events[CE_OTHER_COLLECTING] = FALSE;
- custom_element_change_events[CE_OTHER_TOUCHING] = FALSE;
- custom_element_change_events[CE_OTHER_PRESSING] = FALSE;
- custom_element_change_events[CE_OTHER_PUSHING] = FALSE;
- custom_element_change_events[CE_OTHER_CHANGING] = FALSE;
- custom_element_change_events[CE_OTHER_EXPLODING] = FALSE;
+ custom_element_change_events[CE_OTHER_IS_TOUCHING] = FALSE;
+ custom_element_change_events[CE_OTHER_IS_CHANGING] = FALSE;
+ custom_element_change_events[CE_OTHER_IS_EXPLODING] = FALSE;
+ custom_element_change_events[CE_OTHER_GETS_TOUCHED] = FALSE;
+ custom_element_change_events[CE_OTHER_GETS_PRESSED] = FALSE;
+ custom_element_change_events[CE_OTHER_GETS_PUSHED] = FALSE;
+ custom_element_change_events[CE_OTHER_GETS_COLLECTED] = FALSE;
custom_element_change_events[value_change_other_action] =
custom_element_change_events[CE_BY_OTHER];
redraw_mask |= REDRAW_ALL;
ReinitializeElementListButtons(); /* only needed after setup changes */
+ ModifyEditorElementList(); /* may be needed for custom elements */
UnmapTapeButtons();
MapControlButtons();
DrawElementBorder(area_sx, area_sy, MINI_TILEX, MINI_TILEY, TRUE);
DrawMiniGraphicExt(drawto, gi->x, gi->y,
- el2edimg(custom_element.change.trigger));
+ el2edimg(custom_element.change.trigger_element));
MapDrawingArea(GADGET_ID_CUSTOM_CHANGE_TRIGGER);
}
}
}
+static void DrawPropertiesAdvancedDrawingAreas()
+{
+ DrawCustomGraphicElementArea();
+ DrawCustomChangeTargetArea();
+ DrawCustomChangeTriggerArea();
+ DrawCustomChangeContentArea();
+
+ redraw_mask |= REDRAW_FIELD;
+}
+
static void DrawPropertiesAdvanced()
{
int i;
MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE);
/* draw drawing area gadgets */
- DrawCustomGraphicElementArea();
- DrawCustomChangeTargetArea();
- DrawCustomChangeContentArea();
- DrawCustomChangeTriggerArea();
+ DrawPropertiesAdvancedDrawingAreas();
}
static void DrawElementName(int x, int y, int element)
}
else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
{
- custom_element.change.trigger = new_element;
+ custom_element.change.trigger_element = new_element;
element_info[properties_element] = custom_element;
}
else if (id == GADGET_ID_RANDOM_BACKGROUND)
else if (id == GADGET_ID_CUSTOM_CHANGE_CONTENT)
PickDrawingElement(button, custom_element.change.content[sx][sy]);
else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
- PickDrawingElement(button, custom_element.change.trigger);
+ PickDrawingElement(button, custom_element.change.trigger_element);
else if (id == GADGET_ID_RANDOM_BACKGROUND)
PickDrawingElement(button, random_placement_background_element);
else if (id >= GADGET_ID_ELEMENT_CONTENT_0 &&
{
ModifyEditorElementList();
RedrawDrawingElements();
+
+ DrawPropertiesAdvancedDrawingAreas();
}
}
getElementInfoText(custom_element.change.content[sx][sy]));
else if (id == GADGET_ID_CUSTOM_CHANGE_TRIGGER)
DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s",
- getElementInfoText(custom_element.change.trigger));
+ getElementInfoText(custom_element.change.trigger_element));
else if (id == GADGET_ID_RANDOM_BACKGROUND)
DrawTextF(INFOTEXT_XPOS - SX, INFOTEXT_YPOS - SY, FONT_TEXT_2, "%s",
getElementInfoText(random_placement_background_element));
projects / rocksndiamonds.git / blobdiff