projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030404-2-src
[rocksndiamonds.git]
/
src
/
editor.c
diff --git
a/src/editor.c
b/src/editor.c
index 00cda340cc0053cedec3e928c13be96f5f673a6e..893617eaccb51b3613b81301ccb68b5dd9cd2a5d 100644
(file)
--- a/
src/editor.c
+++ b/
src/editor.c
@@
-573,7
+573,8
@@
static char *test_values[] =
"test 1",
"test 2",
"dieser test-text ist viel zu lang fuer die selectbox",
"test 1",
"test 2",
"dieser test-text ist viel zu lang fuer die selectbox",
- "letzter text"
+ "letzter text",
+ NULL
};
static int test_index = 0;
};
static int test_index = 0;
@@
-2216,7
+2217,8
@@
static void CreateSelectboxGadgets()
char infotext[MAX_OUTPUT_LINESIZE + 1];
int id = selectbox_info[i].gadget_id;
char infotext[MAX_OUTPUT_LINESIZE + 1];
int id = selectbox_info[i].gadget_id;
- event_mask = GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
+ event_mask = GD_EVENT_RELEASED |
+ GD_EVENT_TEXT_RETURN | GD_EVENT_TEXT_LEAVING;
gd_x = DOOR_GFX_PAGEX4 + ED_SELECTBOX_XPOS;
gd_y = DOOR_GFX_PAGEY1 + ED_SELECTBOX_YPOS;
gd_x = DOOR_GFX_PAGEX4 + ED_SELECTBOX_XPOS;
gd_y = DOOR_GFX_PAGEY1 + ED_SELECTBOX_YPOS;
@@
-2406,6
+2408,11
@@
static void CreateCheckbuttonGadgets()
void CreateLevelEditorGadgets()
{
void CreateLevelEditorGadgets()
{
+ int old_game_status = game_status;
+
+ /* setting 'game_status' is needed to get the right fonts for the editor */
+ game_status = LEVELED;
+
ReinitializeElementList();
CreateControlButtons();
ReinitializeElementList();
CreateControlButtons();
@@
-2415,6
+2422,8
@@
void CreateLevelEditorGadgets()
CreateSelectboxGadgets();
CreateScrollbarGadgets();
CreateCheckbuttonGadgets();
CreateSelectboxGadgets();
CreateScrollbarGadgets();
CreateCheckbuttonGadgets();
+
+ game_status = old_game_status;
}
void FreeLevelEditorGadgets()
}
void FreeLevelEditorGadgets()
@@
-3395,8
+3404,8
@@
static void DrawLine(int from_x, int from_y, int to_x, int to_y,
}
}
}
}
-static void Draw
Rectangle
(int from_x, int from_y, int to_x, int to_y,
-
int element, boolean change_level)
+static void Draw
Box
(int from_x, int from_y, int to_x, int to_y,
+ int element, boolean change_level)
{
DrawLine(from_x, from_y, from_x, to_y, element, change_level);
DrawLine(from_x, to_y, to_x, to_y, element, change_level);
{
DrawLine(from_x, from_y, from_x, to_y, element, change_level);
DrawLine(from_x, to_y, to_x, to_y, element, change_level);
@@
-3518,7
+3527,7
@@
static void SelectArea(int from_x, int from_y, int to_x, int to_y,
int element, boolean change_level)
{
if (element == -1 || change_level)
int element, boolean change_level)
{
if (element == -1 || change_level)
- Draw
Rectangle
(from_x, from_y, to_x, to_y, -1, FALSE);
+ Draw
Box
(from_x, from_y, to_x, to_y, -1, FALSE);
else
DrawAreaBorder(from_x, from_y, to_x, to_y);
}
else
DrawAreaBorder(from_x, from_y, to_x, to_y);
}
@@
-4098,7
+4107,7
@@
static void HandleDrawingAreas(struct GadgetInfo *gi)
else if (drawing_function == GADGET_ID_ARC)
draw_func = DrawArc;
else if (drawing_function == GADGET_ID_RECTANGLE)
else if (drawing_function == GADGET_ID_ARC)
draw_func = DrawArc;
else if (drawing_function == GADGET_ID_RECTANGLE)
- draw_func = Draw
Rectangle
;
+ draw_func = Draw
Box
;
else if (drawing_function == GADGET_ID_FILLED_BOX)
draw_func = DrawFilledBox;
else if (drawing_function == GADGET_ID_GRAB_BRUSH)
else if (drawing_function == GADGET_ID_FILLED_BOX)
draw_func = DrawFilledBox;
else if (drawing_function == GADGET_ID_GRAB_BRUSH)