projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added new, topic-related headlines for info screens
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index 6c992e9883206ec9d66772c242482c6171788bcf..671f6bf9385c9d7caa22b4692feb17b5e50920a3 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-9492,7
+9492,7
@@
static void DrawMagicBallContentAreas(void)
DrawText(x, y + 2 * tilesize, "active", font_nr);
}
DrawText(x, y + 2 * tilesize, "active", font_nr);
}
-static void DrawAndroidElementArea(
int element
)
+static void DrawAndroidElementArea(
void
)
{
int id = ED_DRAWING_ID_ANDROID_CONTENT;
int num_elements = level.num_android_clone_elements;
{
int id = ED_DRAWING_ID_ANDROID_CONTENT;
int num_elements = level.num_android_clone_elements;
@@
-9520,7
+9520,7
@@
static void DrawAndroidElementArea(int element)
MapDrawingArea(id);
}
MapDrawingArea(id);
}
-static void DrawGroupElementArea(
int element
)
+static void DrawGroupElementArea(
void
)
{
int id = ED_DRAWING_ID_GROUP_CONTENT;
int num_elements = group_element_info.num_elements;
{
int id = ED_DRAWING_ID_GROUP_CONTENT;
int num_elements = group_element_info.num_elements;
@@
-10059,7
+10059,7
@@
static void DrawPropertiesConfig(void)
MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INITIAL_BALL_ACTIVE);
}
else if (properties_element == EL_EMC_ANDROID)
MapCheckbuttonGadget(ED_CHECKBUTTON_ID_INITIAL_BALL_ACTIVE);
}
else if (properties_element == EL_EMC_ANDROID)
- DrawAndroidElementArea(
properties_element
);
+ DrawAndroidElementArea();
}
if (IS_PLAYER_ELEMENT(properties_element))
}
if (IS_PLAYER_ELEMENT(properties_element))
@@
-10314,7
+10314,7
@@
static void DrawPropertiesConfig(void)
MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1);
// draw drawing area gadgets
MapTextbuttonGadget(ED_TEXTBUTTON_ID_SAVE_AS_TEMPLATE_1);
// draw drawing area gadgets
- DrawGroupElementArea(
properties_element
);
+ DrawGroupElementArea();
// draw text input gadgets
MapTextInputGadget(ED_TEXTINPUT_ID_ELEMENT_NAME);
// draw text input gadgets
MapTextInputGadget(ED_TEXTINPUT_ID_ELEMENT_NAME);
@@
-13313,11
+13313,11
@@
static void HandleCounterButtons(struct GadgetInfo *gi)
break;
case ED_COUNTER_ID_ANDROID_CONTENT:
break;
case ED_COUNTER_ID_ANDROID_CONTENT:
- DrawAndroidElementArea(
properties_element
);
+ DrawAndroidElementArea();
break;
case ED_COUNTER_ID_GROUP_CONTENT:
break;
case ED_COUNTER_ID_GROUP_CONTENT:
- DrawGroupElementArea(
properties_element
);
+ DrawGroupElementArea();
CopyGroupElementPropertiesToGame(properties_element);
break;
CopyGroupElementPropertiesToGame(properties_element);
break;
@@
-14219,7
+14219,8
@@
static void HandleControlButtons(struct GadgetInfo *gi)
id <= GADGET_ID_ELEMENTLIST_LAST)
{
int element_position = id - GADGET_ID_ELEMENTLIST_FIRST;
id <= GADGET_ID_ELEMENTLIST_LAST)
{
int element_position = id - GADGET_ID_ELEMENTLIST_FIRST;
- int new_element = editor_elements[element_position + element_shift];
+
+ new_element = editor_elements[element_position + element_shift];
if (IS_EDITOR_CASCADE(new_element))
{
if (IS_EDITOR_CASCADE(new_element))
{