#define ED_SCROLL_DOWN 8
/* screens in the level editor */
-#define ED_MODE_EDIT 0
+#define ED_MODE_DRAWING 0
#define ED_MODE_INFO 1
#define ED_MODE_PROPERTIES 2
#define ED_COUNT_VALUE_XOFFSET 5
#define ED_COUNT_VALUE_YOFFSET 3
-/* identifiers for DrawValueField() */
-#define ED_SCORE_FIELD 0
-
/* control button identifiers */
#define ED_CTRL_ID_SINGLE_ITEMS 0
#define ED_CTRL_ID_CONNECTED_ITEMS 1
#define ED_CTRL_ID_TEST 20
#define ED_CTRL_ID_EXIT 21
-/* other gadget identifiers */
+/* counter button identifiers */
#define ED_CTRL_ID_SCORE_DOWN 22
#define ED_CTRL_ID_SCORE_UP 23
-#define ED_NUM_GADGETS 24
+/* drawing area identifiers */
+#define ED_CTRL_ID_DRAWING_LEVEL 24
+
+#define ED_NUM_GADGETS 25
+
+/* values for counter gadgets */
+#define ED_COUNTER_SCORE 0
+
+#define ED_NUM_COUNTERS 1
+
+static struct
+{
+ int x, y;
+ int gadget_id;
+} counter_info[ED_NUM_COUNTERS] =
+{
+ { ED_SCORE_XPOS, ED_SCORE_YPOS, ED_CTRL_ID_SCORE_DOWN }
+};
/* forward declaration for internal use */
+static void DrawDrawingWindow();
+static void DrawPropertiesWindow(int);
static void CopyLevelToUndoBuffer();
-static void HandleDrawingFunctions(int, int, int);
-static void HandlePressedControlButtons();
+static void HandleDrawingAreas(struct GadgetInfo *);
+static void HandleCounterButtons(struct GadgetInfo *);
static void HandleControlButtons(struct GadgetInfo *);
static struct GadgetInfo *level_editor_gadget[ED_NUM_GADGETS];
int gd_x1, gd_x2, gd_y;
int width, height;
unsigned long event_mask;
+ int id = i;
if (i < ED_NUM_CTRL1_BUTTONS)
{
i == ED_CTRL_ID_WRAP_RIGHT ||
i == ED_CTRL_ID_WRAP_UP ||
i == ED_CTRL_ID_WRAP_DOWN)
- event_mask = GD_EVENT_PRESSED;
+ event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
else
event_mask = GD_EVENT_RELEASED;
- gi = CreateGadget(GDI_X, EX + gd_xoffset,
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_X, EX + gd_xoffset,
GDI_Y, EY + gd_yoffset,
GDI_WIDTH, width,
GDI_HEIGHT, height,
if (gi == NULL)
Error(ERR_EXIT, "cannot create gadget");
- level_editor_gadget[i] = gi;
+ level_editor_gadget[id] = gi;
}
}
-static void CreateCounterButtons(int id)
+
+
+#if 0
+
+static void test1(struct GadgetInfo *gi)
+{
+ int event_type = gi->event.type;
+
+ printf("HandleControlButtons: (%d,%d) (%d,%d) [%d] ",
+ gi->x, gi->y,
+ gi->event.x, gi->event.y, gi->event.button);
+
+ if (event_type == GD_EVENT_PRESSED)
+ printf("GD_EVENT_PRESSED\n");
+ else if (event_type == GD_EVENT_RELEASED)
+ printf("GD_EVENT_RELEASED\n");
+ else if (event_type == GD_EVENT_MOVING)
+ printf("GD_EVENT_MOVING\n");
+ else
+ printf("?\n");
+}
+
+#endif
+
+
+
+static void CreateCounterButtons(int counter_id)
{
int i;
struct GadgetInfo *gi;
int gd_xoffset;
int gd_x1, gd_x2, gd_y;
+ int id = counter_info[counter_id].gadget_id + i;
+ unsigned long event_mask;
+
+ event_mask = GD_EVENT_PRESSED | GD_EVENT_REPEATED;
gd_xoffset = (i == 0 ? ED_BUTTON_MINUS_XPOS : ED_BUTTON_PLUS_XPOS);
gd_x1 = DOOR_GFX_PAGEX4 + gd_xoffset;
gd_x2 = DOOR_GFX_PAGEX3 + gd_xoffset;
gd_y = DOOR_GFX_PAGEY1 + ED_BUTTON_COUNT_YPOS;
- gi = CreateGadget(GDI_X, SX + ED_SCORE_XPOS + gd_xoffset,
- GDI_Y, SY + ED_SCORE_YPOS,
+ gi = CreateGadget(GDI_CUSTOM_ID, id,
+ GDI_X, SX + counter_info[counter_id].x + gd_xoffset,
+ GDI_Y, SY + counter_info[counter_id].y,
GDI_WIDTH, ED_BUTTON_COUNT_XSIZE,
GDI_HEIGHT, ED_BUTTON_COUNT_YSIZE,
GDI_TYPE, GD_TYPE_NORMAL_BUTTON,
GDI_STATE, GD_BUTTON_UNPRESSED,
GDI_DESIGN_UNPRESSED, gd_pixmap, gd_x1, gd_y,
GDI_DESIGN_PRESSED, gd_pixmap, gd_x2, gd_y,
- GDI_EVENT_MASK, GD_EVENT_PRESSED,
- GDI_CALLBACK, HandleControlButtons,
+ GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK, HandleCounterButtons,
GDI_END);
if (gi == NULL)
Error(ERR_EXIT, "cannot create gadget");
- level_editor_gadget[id + i] = gi;
+ level_editor_gadget[id] = gi;
}
}
+static void CreateDrawingAreas()
+{
+ struct GadgetInfo *gi;
+ unsigned long event_mask;
+
+ event_mask = GD_EVENT_PRESSED | GD_EVENT_RELEASED | GD_EVENT_MOVING;
+
+ gi = CreateGadget(GDI_CUSTOM_ID, ED_CTRL_ID_DRAWING_LEVEL,
+ GDI_X, SX,
+ GDI_Y, SY,
+ GDI_WIDTH, SXSIZE,
+ GDI_HEIGHT, SYSIZE,
+ GDI_TYPE, GD_TYPE_DRAWING_AREA,
+ GDI_ITEM_SIZE, MINI_TILEX, MINI_TILEY,
+ GDI_EVENT_MASK, event_mask,
+ GDI_CALLBACK, HandleDrawingAreas,
+ GDI_END);
+
+ if (gi == NULL)
+ Error(ERR_EXIT, "cannot create gadget");
+
+ level_editor_gadget[ED_CTRL_ID_DRAWING_LEVEL] = gi;
+}
+
static void CreateLevelEditorGadgets()
{
if (level_editor_gadgets_created)
return;
- /* create main control buttons */
CreateControlButtons();
-
- /* create element score buttons */
- CreateCounterButtons(ED_CTRL_ID_SCORE_DOWN);
+ CreateCounterButtons(ED_COUNTER_SCORE);
+ CreateDrawingAreas();
level_editor_gadgets_created = TRUE;
}
MapGadget(level_editor_gadget[i]);
}
-static void MapCounterButtons(int id)
+static void MapCounterButtons(int counter_id)
{
int i;
for (i=0; i<2; i++)
- MapGadget(level_editor_gadget[id + i]);
+ MapGadget(level_editor_gadget[counter_info[counter_id].gadget_id + i]);
+}
+
+static void MapMainDrawingArea()
+{
+ MapGadget(level_editor_gadget[ED_CTRL_ID_DRAWING_LEVEL]);
}
void UnmapLevelEditorWindowGadgets()
level_xpos=-1;
level_ypos=-1;
- edit_mode = ED_MODE_EDIT;
+ edit_mode = ED_MODE_DRAWING;
name_typing = FALSE;
element_shift = 0;
CreateLevelEditorGadgets();
MapControlButtons();
+ MapMainDrawingArea();
/*
OpenDoor(DOOR_OPEN_1 | DOOR_OPEN_2);
int y = (my-SY)/MINI_TILEY;
*/
-
+ /*
HandlePressedControlButtons();
HandleDrawingFunctions(mx, my, button);
+ */
if (use_floodfill) /********** FLOOD FILL **********/
{
DY+ED_WIN_MB_RIGHT_YPOS,
el2gfx(new_element3));
redraw_mask |= REDRAW_DOOR_1;
+
+ if (edit_mode == ED_MODE_PROPERTIES)
+ DrawPropertiesWindow(new_element);
}
- if (edit_mode == ED_MODE_EDIT) /********** EDIT-FENSTER **********/
+ if (edit_mode == ED_MODE_DRAWING) /********** EDIT-FENSTER **********/
{
}
- else /********** KONTROLL-FENSTER **********/
+ else if (edit_mode == ED_MODE_INFO)/********** KONTROLL-FENSTER **********/
{
int choice = CheckCountButtons(mx,my,button);
int step = (button==1 ? 1 : button==2 ? 5 : button==3 ? 10 : 0);
VXSIZE,VYSIZE,
DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2);
OpenDoor(DOOR_OPEN_2);
- edit_mode = ED_MODE_EDIT;
+ edit_mode = ED_MODE_DRAWING;
break;
case ED_BUTTON_CLEAR:
if (Request("Are you sure to clear this level ?",REQ_ASK))
}
}
-static void DrawValueField(int field, int value)
+static void DrawCounterValueField(int counter_id, int value)
{
- int i = 0;
- int screen_pos[][3] =
- {
- { ED_SCORE_FIELD,
- ED_SCORE_XPOS + ED_WIN_COUNT_XPOS, ED_SCORE_YPOS },
- { -1, 0, 0 }
- };
+ int x = SX + counter_info[counter_id].x + ED_WIN_COUNT_XPOS;
+ int y = SY + counter_info[counter_id].y;
- while (screen_pos[i][0] != -1)
- {
- int x = SX + screen_pos[i][1];
- int y = SY + screen_pos[i][2];
+ XCopyArea(display, pix[PIX_DOOR], drawto, gc,
+ DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS,
+ DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS,
+ ED_WIN_COUNT_XSIZE, ED_WIN_COUNT_YSIZE,
+ x, y);
- if (screen_pos[i++][0] != field)
- continue;
+ DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
+ int2str(value, 3), FS_SMALL, FC_YELLOW);
+}
- XCopyArea(display, pix[PIX_DOOR], drawto, gc,
- DOOR_GFX_PAGEX4 + ED_WIN_COUNT_XPOS,
- DOOR_GFX_PAGEY1 + ED_WIN_COUNT_YPOS,
- ED_WIN_COUNT_XSIZE, ED_WIN_COUNT_YSIZE,
- x, y);
+#define TEXT_COLLECTING "Score for collecting"
+#define TEXT_SMASHING "Score for smashing"
+#define TEXT_CRACKING "Score for cracking"
+#define TEXT_SPEED "Speed of growth"
+#define TEXT_DURATION "Duration when activated"
- DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
- int2str(value, 3), FS_SMALL, FC_YELLOW);
- }
+static void DrawDrawingWindow()
+{
+ ClearWindow();
+ UnmapLevelEditorWindowGadgets();
+ MapMainDrawingArea();
+ AdjustLevelScrollPosition();
+ DrawMiniLevel(level_xpos, level_ypos);
}
-static void DrawPropertiesWindow(int button)
+static void DrawPropertiesWindow(int element)
{
- int x, y;
- int new_element;
+ int i, x, y;
int num_elements_in_level;
+ static struct
+ {
+ int element;
+ int *counter_value;
+ char *text;
+ } elements_with_counter[] =
+ {
+ { EL_EDELSTEIN, &level.score[0], TEXT_COLLECTING },
+ { EL_EDELSTEIN_BD, &level.score[0], TEXT_COLLECTING },
+ { EL_EDELSTEIN_GELB,&level.score[0], TEXT_COLLECTING },
+ { EL_EDELSTEIN_ROT, &level.score[0], TEXT_COLLECTING },
+ { EL_EDELSTEIN_LILA,&level.score[0], TEXT_COLLECTING },
+ { EL_DIAMANT, &level.score[1], TEXT_COLLECTING },
+ { EL_KAEFER_R, &level.score[2], TEXT_SMASHING },
+ { EL_KAEFER_O, &level.score[2], TEXT_SMASHING },
+ { EL_KAEFER_L, &level.score[2], TEXT_SMASHING },
+ { EL_KAEFER_U, &level.score[2], TEXT_SMASHING },
+ { EL_BUTTERFLY_R, &level.score[2], TEXT_SMASHING },
+ { EL_BUTTERFLY_O, &level.score[2], TEXT_SMASHING },
+ { EL_BUTTERFLY_L, &level.score[2], TEXT_SMASHING },
+ { EL_BUTTERFLY_U, &level.score[2], TEXT_SMASHING },
+ { EL_FLIEGER_R, &level.score[3], TEXT_SMASHING },
+ { EL_FLIEGER_O, &level.score[3], TEXT_SMASHING },
+ { EL_FLIEGER_L, &level.score[3], TEXT_SMASHING },
+ { EL_FLIEGER_U, &level.score[3], TEXT_SMASHING },
+ { EL_FIREFLY_R, &level.score[3], TEXT_SMASHING },
+ { EL_FIREFLY_O, &level.score[3], TEXT_SMASHING },
+ { EL_FIREFLY_L, &level.score[3], TEXT_SMASHING },
+ { EL_FIREFLY_U, &level.score[3], TEXT_SMASHING },
+ { EL_MAMPFER, &level.score[4], TEXT_SMASHING },
+ { EL_MAMPFER2, &level.score[4], TEXT_SMASHING },
+ { EL_ROBOT, &level.score[5], TEXT_SMASHING },
+ { EL_PACMAN_R, &level.score[6], TEXT_SMASHING },
+ { EL_PACMAN_O, &level.score[6], TEXT_SMASHING },
+ { EL_PACMAN_L, &level.score[6], TEXT_SMASHING },
+ { EL_PACMAN_U, &level.score[6], TEXT_SMASHING },
+ { EL_KOKOSNUSS, &level.score[7], TEXT_CRACKING },
+ { EL_DYNAMIT_AUS, &level.score[8], TEXT_COLLECTING },
+ { EL_SCHLUESSEL1, &level.score[9], TEXT_COLLECTING },
+ { EL_SCHLUESSEL2, &level.score[9], TEXT_COLLECTING },
+ { EL_SCHLUESSEL3, &level.score[9], TEXT_COLLECTING },
+ { EL_SCHLUESSEL4, &level.score[9], TEXT_COLLECTING },
+ { EL_AMOEBE_NASS, &level.tempo_amoebe, TEXT_SPEED },
+ { EL_AMOEBE_NORM, &level.tempo_amoebe, TEXT_SPEED },
+ { EL_AMOEBE_VOLL, &level.tempo_amoebe, TEXT_SPEED },
+ { EL_AMOEBE_BD, &level.tempo_amoebe, TEXT_SPEED },
+ { EL_SIEB_LEER, &level.dauer_sieb, TEXT_DURATION },
+ { EL_ABLENK_AUS, &level.dauer_ablenk, TEXT_DURATION },
+ { -1, NULL, NULL }
+ };
ClearWindow();
+ UnmapLevelEditorWindowGadgets();
- new_element = (button == 1 ? new_element1 :
- button == 2 ? new_element2 :
- button == 3 ? new_element3 : 0);
-
- DrawGraphic(1, 1, el2gfx(new_element));
+ DrawGraphic(1, 1, el2gfx(element));
DrawText(SX + 3*TILEX, SY + 5*TILEY/4, "Element Properties",
FS_SMALL, FC_YELLOW);
num_elements_in_level = 0;
for(y=0; y<lev_fieldy; y++)
for(x=0; x<lev_fieldx; x++)
- if (Feld[x][y] == new_element)
+ if (Feld[x][y] == element)
num_elements_in_level++;
DrawTextF(TILEX, 5*TILEY, FC_YELLOW, "%d x contained in level",
num_elements_in_level);
-
- gadget_score_value = &level.score[0];
- DrawValueField(ED_SCORE_FIELD, *gadget_score_value);
- MapCounterButtons(ED_CTRL_ID_SCORE_DOWN);
+
+ for (i=0; elements_with_counter[i].element != -1; i++)
+ {
+ if (elements_with_counter[i].element == element)
+ {
+ int x = SX + counter_info[ED_COUNTER_SCORE].x + DXSIZE;
+ int y = SY + counter_info[ED_COUNTER_SCORE].y;
+
+ gadget_score_value = elements_with_counter[i].counter_value;
+ DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
+ DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET,
+ elements_with_counter[i].text, FS_SMALL, FC_YELLOW);
+ MapCounterButtons(ED_COUNTER_SCORE);
+ break;
+ }
+ }
}
static void swap_numbers(int *i1, int *i2)
DrawMiniLevel(level_xpos, level_ypos);
}
-static void HandleDrawingFunctions(int mx, int my, int button)
+static void HandleDrawingAreas(struct GadgetInfo *gi)
{
- static int last_button = 0;
- static int last_element = 0;
+ static boolean started_inside_drawing_area = FALSE;
+ boolean inside_drawing_area = !gi->event.off_borders;
boolean button_press_event;
boolean button_release_event;
int new_element;
- int sx = (mx - SX) / MINI_TILEX;
- int sy = (my - SY) / MINI_TILEY;
- int lx = sx + level_xpos;
- int ly = sy + level_ypos;
+ int button = gi->event.button;
+ int sx = gi->event.x, sy = gi->event.y;
+ int lx, ly;
int x, y;
- if (edit_mode != ED_MODE_EDIT)
+ if (edit_mode != ED_MODE_DRAWING)
return;
- button_press_event = (last_button == 0 && button != 0);
- button_release_event = (last_button != 0 && button == 0);
- last_button = button;
+ button_press_event = (gi->event.type == GD_EVENT_PRESSED);
+ button_release_event = (gi->event.type == GD_EVENT_RELEASED);
+
+ sx = (sx < 0 ? 0 : sx > 2*SCR_FIELDX - 1 ? 2*SCR_FIELDX - 1 : sx);
+ sy = (sy < 0 ? 0 : sy > 2*SCR_FIELDY - 1 ? 2*SCR_FIELDY - 1 : sy);
+ lx = sx + level_xpos;
+ ly = sy + level_ypos;
- if (mx < SX || mx >= SX + SXSIZE || my < SY || my >= SY + SYSIZE)
+ if (button_press_event)
+ started_inside_drawing_area = inside_drawing_area;
+
+ if (!started_inside_drawing_area)
return;
+ printf("%d,%d, %d,%d, %d,%d.\n",
+ gi->event.x, gi->event.y, sx, sy, lx, ly);
+
if ((!button && !button_release_event) ||
sx > lev_fieldx || sy > lev_fieldy ||
(sx == 0 && level_xpos<0) ||
{
last_sx = start_sx = sx;
last_sy = start_sy = sy;
+ draw_func(sx, sy, sx, sy, new_element, FALSE);
}
else if (button_release_event)
{
- draw_func(start_sx, start_sy, sx, sy, last_element, TRUE);
+ draw_func(start_sx, start_sy, sx, sy, new_element, TRUE);
CopyLevelToUndoBuffer();
}
else if (last_sx != sx || last_sy != sy)
default:
break;
}
-
- last_element = new_element;
}
+
+
+#if 0
+
static void HandlePressedControlButtons()
{
static unsigned long button_delay = 0;
- int i = 0;
+ int i;
/* buttons with action when held pressed */
int gadget_id[] =
if (!DelayReached(&button_delay, GADGET_FRAME_DELAY))
return;
- while (gadget_id[i] != -1)
+ for (i=0; gadget_id[i] != -1; i++)
{
- int id = gadget_id[i++];
+ int id = gadget_id[i];
int state = level_editor_gadget[id]->state;
int button = level_editor_gadget[id]->event.button;
int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
else if (*gadget_score_value > 255)
*gadget_score_value = 255;
- DrawValueField(ED_SCORE_FIELD, *gadget_score_value);
+ DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
break;
default:
}
}
+#endif
+
+
+
+static void HandleCounterButtons(struct GadgetInfo *gi)
+{
+ int id = gi->custom_id;
+ int button = gi->event.button;
+ int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+
+ switch (id)
+ {
+ case ED_CTRL_ID_SCORE_DOWN:
+ case ED_CTRL_ID_SCORE_UP:
+ *gadget_score_value += (id == ED_CTRL_ID_SCORE_DOWN ? -step : step);
+ if (*gadget_score_value < 0)
+ *gadget_score_value = 0;
+ else if (*gadget_score_value > 255)
+ *gadget_score_value = 255;
+
+ DrawCounterValueField(ED_COUNTER_SCORE, *gadget_score_value);
+ break;
+
+ default:
+ break;
+ }
+}
+
static void HandleControlButtons(struct GadgetInfo *gi)
{
- /*
- int event_type = gi->event.type;
- */
+ int id = gi->custom_id;
int button = gi->event.button;
+ int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
+ int new_element;
int player_present = FALSE;
int level_changed = FALSE;
- int id = -1;
- int i, x, y;
+ int x, y;
- /* get the button id */
- for (i=0; i<ED_NUM_CTRL_BUTTONS; i++)
- if (gi->id == level_editor_gadget[i]->id)
- id = i;
+ new_element = (button == 1 ? new_element1 :
+ button == 2 ? new_element2 :
+ button == 3 ? new_element3 : 0);
- if (id >= 0 && id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_EDIT)
+ if (id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_DRAWING)
{
- UnmapLevelEditorWindowGadgets();
- AdjustLevelScrollPosition();
- DrawMiniLevel(level_xpos, level_ypos);
- edit_mode = ED_MODE_EDIT;
+ DrawDrawingWindow();
+ edit_mode = ED_MODE_DRAWING;
}
switch (id)
drawing_function = id;
break;
+ case ED_CTRL_ID_WRAP_LEFT:
+ if (level_xpos >= 0)
+ {
+ if (lev_fieldx < 2*SCR_FIELDX - 2)
+ break;
+
+ level_xpos -= step;
+ if (level_xpos <- 1)
+ level_xpos = -1;
+ if (button == 1)
+ ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_RIGHT);
+ else
+ DrawMiniLevel(level_xpos, level_ypos);
+ }
+ break;
+
+ case ED_CTRL_ID_WRAP_RIGHT:
+ if (level_xpos <= lev_fieldx - 2*SCR_FIELDX)
+ {
+ if (lev_fieldx < 2*SCR_FIELDX - 2)
+ break;
+
+ level_xpos += step;
+ if (level_xpos > lev_fieldx - 2*SCR_FIELDX + 1)
+ level_xpos = lev_fieldx - 2*SCR_FIELDX + 1;
+ if (button == 1)
+ ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_LEFT);
+ else
+ DrawMiniLevel(level_xpos, level_ypos);
+ }
+ break;
+
+ case ED_CTRL_ID_WRAP_UP:
+ if (level_ypos >= 0)
+ {
+ if (lev_fieldy < 2*SCR_FIELDY - 2)
+ break;
+
+ level_ypos -= step;
+ if (level_ypos < -1)
+ level_ypos = -1;
+ if (button == 1)
+ ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_DOWN);
+ else
+ DrawMiniLevel(level_xpos, level_ypos);
+ }
+ break;
+
+ case ED_CTRL_ID_WRAP_DOWN:
+ if (level_ypos <= lev_fieldy - 2*SCR_FIELDY)
+ {
+ if (lev_fieldy < 2*SCR_FIELDY - 2)
+ break;
+
+ level_ypos += step;
+ if (level_ypos > lev_fieldy - 2*SCR_FIELDY + 1)
+ level_ypos = lev_fieldy - 2*SCR_FIELDY + 1;
+ if (button == 1)
+ ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_UP);
+ else
+ DrawMiniLevel(level_xpos, level_ypos);
+ }
+ break;
+
case ED_CTRL_ID_PROPERTIES:
- DrawPropertiesWindow(button);
+ DrawPropertiesWindow(new_element);
edit_mode = ED_MODE_PROPERTIES;
break;
{
AdjustLevelScrollPosition();
DrawMiniLevel(level_xpos, level_ypos);
- edit_mode = ED_MODE_EDIT;
+ edit_mode = ED_MODE_DRAWING;
}
break;
break;
default:
- /*
- if (event_type == GD_EVENT_PRESSED)
- printf("HandleControlButtons: GD_EVENT_PRESSED\n");
- else if (event_type == GD_EVENT_RELEASED)
- printf("HandleControlButtons: GD_EVENT_RELEASED\n");
+ if (gi->event.type == GD_EVENT_PRESSED)
+ printf("default: HandleControlButtons: GD_EVENT_PRESSED\n");
+ else if (gi->event.type == GD_EVENT_RELEASED)
+ printf("default: HandleControlButtons: GD_EVENT_RELEASED\n");
+ else if (gi->event.type == GD_EVENT_MOVING)
+ printf("default: HandleControlButtons: GD_EVENT_MOVING\n");
else
- printf("HandleControlButtons: ?\n");
- */
+ printf("default: HandleControlButtons: ?\n");
break;
}
}