X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=d19c8c26083e0b20cc1fe9a87dbcfe1e3f0b63b0;hb=f6ba86f49b8d92a6cb8d06b42e580195d09b8183;hp=5a8035a888d4d82693be1bd0392949bef2448f2e;hpb=6fe98dc77891e9fc45cbd99bbd4793e2133c6960;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index 5a8035a8..d19c8c26 100644 --- a/src/editor.c +++ b/src/editor.c @@ -36,12 +36,18 @@ #define ED_SCROLL_UP 4 #define ED_SCROLL_DOWN 8 -/* delay value to avoid too fast scrolling etc. */ -#define CHOICE_DELAY_VALUE 100 +/* screens in the level editor */ +#define ED_MODE_DRAWING 0 +#define ED_MODE_INFO 1 +#define ED_MODE_PROPERTIES 2 /* how many steps can be cancelled */ #define NUM_UNDO_STEPS (10 + 1) +/* values for random placement */ +#define RANDOM_USE_PERCENTAGE 0 +#define RANDOM_USE_NUM_OBJECTS 1 + /* values for the control window */ #define ED_CTRL_BUTTONS_GFX_YPOS 236 #define ED_CTRL1_BUTTONS_HORIZ 4 @@ -60,7 +66,13 @@ #define ED_NUM_CTRL2_BUTTONS (ED_CTRL2_BUTTONS_HORIZ * ED_CTRL2_BUTTONS_VERT) #define ED_NUM_CTRL_BUTTONS (ED_NUM_CTRL1_BUTTONS + ED_NUM_CTRL2_BUTTONS) -/* control button names */ +/* values for other gadgets */ +#define ED_SCORE_XPOS TILEX +#define ED_SCORE_YPOS (7 * TILEY) +#define ED_COUNT_VALUE_XOFFSET 5 +#define ED_COUNT_VALUE_YOFFSET 3 + +/* control button identifiers */ #define ED_CTRL_ID_SINGLE_ITEMS 0 #define ED_CTRL_ID_CONNECTED_ITEMS 1 #define ED_CTRL_ID_LINE 2 @@ -68,7 +80,7 @@ #define ED_CTRL_ID_RECTANGLE 4 #define ED_CTRL_ID_FILLED_BOX 5 #define ED_CTRL_ID_WRAP_UP 6 -#define ED_CTRL_ID_ITEM_PROPERTIES 7 +#define ED_CTRL_ID_PROPERTIES 7 #define ED_CTRL_ID_FLOOD_FILL 8 #define ED_CTRL_ID_WRAP_LEFT 9 #define ED_CTRL_ID_WRAP_RIGHT 11 @@ -82,14 +94,39 @@ #define ED_CTRL_ID_TEST 20 #define ED_CTRL_ID_EXIT 21 +/* counter button identifiers */ +#define ED_CTRL_ID_SCORE_DOWN 22 +#define ED_CTRL_ID_SCORE_UP 23 + +/* 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 */ -void HandleDrawingFunctions(int, int, int); -void HandlePressedControlButtons(); -void HandleControlButtons(struct GadgetInfo *); +static void DrawDrawingWindow(); +static void DrawPropertiesWindow(int); +static void CopyLevelToUndoBuffer(); +static void HandleDrawingAreas(struct GadgetInfo *); +static void HandleCounterButtons(struct GadgetInfo *); +static void HandleControlButtons(struct GadgetInfo *); -static struct GadgetInfo *control_button_gadget[ED_NUM_CTRL_BUTTONS]; -static boolean control_button_gadgets_created = FALSE; -static boolean control_button_gadgets_mapped = FALSE; +static struct GadgetInfo *level_editor_gadget[ED_NUM_GADGETS]; +static boolean level_editor_gadgets_created = FALSE; static int drawing_function = ED_CTRL_ID_SINGLE_ITEMS; @@ -98,8 +135,19 @@ static short UndoBuffer[NUM_UNDO_STEPS][MAX_LEV_FIELDX][MAX_LEV_FIELDY]; static int undo_buffer_position = 0; static int undo_buffer_steps = 0; +static int random_placement_percentage = 10; +static int random_placement_num_objects = 10; +#if 0 +static int random_placement_method = RANDOM_USE_PERCENTAGE; +#else +static int random_placement_method = RANDOM_USE_NUM_OBJECTS; +#endif + +/* pointer to score value */ +static int *gadget_score_value; + static int level_xpos,level_ypos; -static boolean edit_mode; +static int edit_mode; static boolean name_typing; static int new_element1 = EL_MAUERWERK; static int new_element2 = EL_LEERRAUM; @@ -401,7 +449,7 @@ int editor_element[] = }; int elements_in_list = sizeof(editor_element)/sizeof(int); -void ScrollMiniLevel(int from_x, int from_y, int scroll) +static void ScrollMiniLevel(int from_x, int from_y, int scroll) { int x,y; int dx = (scroll==ED_SCROLL_LEFT ? -1 : scroll==ED_SCROLL_RIGHT ? 1 : 0); @@ -428,12 +476,17 @@ void ScrollMiniLevel(int from_x, int from_y, int scroll) BackToFront(); } -void CreateLevelEditorControlButtons() +void InitLevelEditorGadgets() { int i; - if (control_button_gadgets_created) - return; + for (i=0; ievent.type; - control_button_gadgets_created = TRUE; + 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"); } -void MapLevelEditorControlButtons() +#endif + + + +static void CreateCounterButtons(int counter_id) { int i; - if (!control_button_gadgets_created) - CreateLevelEditorControlButtons(); + for (i=0; i<2; i++) + { + Pixmap gd_pixmap = pix[PIX_DOOR]; + struct GadgetInfo *gi; + int gd_xoffset; + int gd_x1, gd_x2, gd_y; + int id = counter_info[counter_id].gadget_id + i; + + 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_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_REPEATED, + GDI_CALLBACK, HandleCounterButtons, + GDI_END); - for (i=0; i0) || (choice == ED_BUTTON_EDOWN && element_shift=0) { - if (!DelayReached(&choice_delay, CHOICE_DELAY_VALUE)) + if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY)) break; if (lev_fieldx<2*SCR_FIELDX-2) break; @@ -976,7 +1146,7 @@ void LevelEd(int mx, int my, int button) case ED_BUTTON_RIGHT: if (level_xpos<=lev_fieldx-2*SCR_FIELDX) { - if (!DelayReached(&choice_delay, CHOICE_DELAY_VALUE)) + if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY)) break; if (lev_fieldx<2*SCR_FIELDX-2) break; @@ -993,7 +1163,7 @@ void LevelEd(int mx, int my, int button) case ED_BUTTON_UP: if (level_ypos>=0) { - if (!DelayReached(&choice_delay, CHOICE_DELAY_VALUE)) + if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY)) break; if (lev_fieldy<2*SCR_FIELDY-2) break; @@ -1010,7 +1180,7 @@ void LevelEd(int mx, int my, int button) case ED_BUTTON_DOWN: if (level_ypos<=lev_fieldy-2*SCR_FIELDY) { - if (!DelayReached(&choice_delay, CHOICE_DELAY_VALUE)) + if (!DelayReached(&choice_delay, GADGET_FRAME_DELAY)) break; if (lev_fieldy<2*SCR_FIELDY-2) break; @@ -1083,13 +1253,13 @@ void LevelEd(int mx, int my, int button) } - 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); if (choice >= 0 && choice < 36 && - DelayReached(&choice_delay, CHOICE_DELAY_VALUE)) + DelayReached(&choice_delay, GADGET_FRAME_DELAY)) { if (!(choice % 2)) step = -step; @@ -1229,7 +1399,7 @@ void LevelEd(int mx, int my, int button) VXSIZE,VYSIZE, DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY2); OpenDoor(DOOR_OPEN_2); - edit_mode = TRUE; + edit_mode = ED_MODE_DRAWING; break; case ED_BUTTON_CLEAR: if (Request("Are you sure to clear this level ?",REQ_ASK)) @@ -1478,6 +1648,124 @@ void LevelNameTyping(KeySym key) } } +static void DrawCounterValueField(int counter_id, int value) +{ + int x = SX + counter_info[counter_id].x + ED_WIN_COUNT_XPOS; + int y = SY + counter_info[counter_id].y; + + 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); + + DrawText(x + ED_COUNT_VALUE_XOFFSET, y + ED_COUNT_VALUE_YOFFSET, + int2str(value, 3), FS_SMALL, FC_YELLOW); +} + +#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" + +static void DrawDrawingWindow() +{ + ClearWindow(); + UnmapLevelEditorWindowGadgets(); + MapMainDrawingArea(); + AdjustLevelScrollPosition(); + DrawMiniLevel(level_xpos, level_ypos); +} + +static void DrawPropertiesWindow(int 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(); + + 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 0) + { + x = RND(lev_fieldx); + y = RND(lev_fieldy); + + if (Feld[x][y] != new_element) + { + Feld[x][y] = new_element; + elements_left--; + } + } + } + + DrawMiniLevel(level_xpos, level_ypos); +} + +/* +static void HandleDrawingAreas(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; boolean button_press_event; boolean button_release_event; - boolean copy_to_undo_buffer = FALSE; 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 mx = SX + gi->event.x * MINI_TILEX; + int my = SX + gi->event.y * MINI_TILEY; + int min_mx = SX, max_mx = SX + SXSIZE -1; + int min_my = SY, max_my = SY + SYSIZE -1; + int sx, sy; + int lx, ly; int x, y; - if (!edit_mode) + 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; - if (mx < SX || mx >= SX + SXSIZE || my < SY || my >= SY + SYSIZE) + inside_drawing_area = + (mx >= min_mx && mx <= max_mx && my >= min_my && my <= max_my); + + mx = (mx < min_mx ? min_mx : mx > max_mx ? max_mx : mx); + my = (my < min_my ? min_my : my > max_my ? max_my : my); + sx = (mx - SX) / MINI_TILEX; + sy = (my - SY) / MINI_TILEY; + lx = sx + level_xpos; + ly = sy + level_ypos; + + if (button_press_event) + started_inside_drawing_area = inside_drawing_area; + + if (!started_inside_drawing_area) return; if ((!button && !button_release_event) || @@ -1683,7 +2028,7 @@ void HandleDrawingFunctions(int mx, int my, int button) { case ED_CTRL_ID_SINGLE_ITEMS: if (button_release_event) - copy_to_undo_buffer = TRUE; + CopyLevelToUndoBuffer(); if (!button) break; @@ -1719,7 +2064,7 @@ void HandleDrawingFunctions(int mx, int my, int button) static int last_sy = -1; if (button_release_event) - copy_to_undo_buffer = TRUE; + CopyLevelToUndoBuffer(); if (button) { @@ -1753,11 +2098,12 @@ void HandleDrawingFunctions(int mx, int my, int button) { 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); - copy_to_undo_buffer = TRUE; + CopyLevelToUndoBuffer(); } else if (last_sx != sx || last_sy != sy) { @@ -1774,7 +2120,7 @@ void HandleDrawingFunctions(int mx, int my, int button) { FloodFill(lx, ly, new_element); DrawMiniLevel(level_xpos, level_ypos); - copy_to_undo_buffer = TRUE; + CopyLevelToUndoBuffer(); } break; @@ -1783,16 +2129,16 @@ void HandleDrawingFunctions(int mx, int my, int button) } last_element = new_element; - - if (copy_to_undo_buffer) - CopyLevelToUndoBuffer(); - copy_to_undo_buffer = FALSE; } -void HandlePressedControlButtons() + + +#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[] = @@ -1801,17 +2147,19 @@ void HandlePressedControlButtons() ED_CTRL_ID_WRAP_LEFT, ED_CTRL_ID_WRAP_RIGHT, ED_CTRL_ID_WRAP_DOWN, + ED_CTRL_ID_SCORE_DOWN, + ED_CTRL_ID_SCORE_UP, -1 }; - if (!DelayReached(&button_delay, CHOICE_DELAY_VALUE)) + 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 state = control_button_gadget[id]->state; - int button = control_button_gadget[id]->event.button; + 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); if (state != GD_BUTTON_PRESSED) @@ -1882,6 +2230,17 @@ void HandlePressedControlButtons() DrawMiniLevel(level_xpos, level_ypos); } break; + + 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; @@ -1889,24 +2248,53 @@ void HandlePressedControlButtons() } } -void HandleControlButtons(struct GadgetInfo *gi) +#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 id = gi->custom_id; int event_type = gi->event.type; + 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; - int i, x, y; + int x, y; - /* get the button id */ - for (i=0; iid == control_button_gadget[i]->id) - id = i; + new_element = (button == 1 ? new_element1 : + button == 2 ? new_element2 : + button == 3 ? new_element3 : 0); - if (id < ED_NUM_CTRL1_BUTTONS && !edit_mode) + if (id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_DRAWING) { - AdjustLevelScrollPosition(); - DrawMiniLevel(level_xpos, level_ypos); - edit_mode = TRUE; + DrawDrawingWindow(); + edit_mode = ED_MODE_DRAWING; } switch (id) @@ -1918,11 +2306,84 @@ void HandleControlButtons(struct GadgetInfo *gi) case ED_CTRL_ID_RECTANGLE: case ED_CTRL_ID_FILLED_BOX: case ED_CTRL_ID_FLOOD_FILL: - case ED_CTRL_ID_RANDOM_PLACEMENT: case ED_CTRL_ID_BRUSH: 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(new_element); + edit_mode = ED_MODE_PROPERTIES; + break; + + case ED_CTRL_ID_RANDOM_PLACEMENT: + RandomPlacement(button); + CopyLevelToUndoBuffer(); + break; + case ED_CTRL_ID_UNDO: if (undo_buffer_steps == 0) { @@ -1941,25 +2402,24 @@ void HandleControlButtons(struct GadgetInfo *gi) break; case ED_CTRL_ID_INFO: - if (edit_mode) + if (edit_mode != ED_MODE_INFO) { DrawControlWindow(); - edit_mode = FALSE; + edit_mode = ED_MODE_INFO; } else { AdjustLevelScrollPosition(); DrawMiniLevel(level_xpos, level_ypos); - edit_mode = TRUE; + edit_mode = ED_MODE_DRAWING; } break; case ED_CTRL_ID_CLEAR: - CopyLevelToUndoBuffer(); - for(x=0; x