X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=d3d81c2599b3649dd4cd973152fad2f86178bd44;hb=c5728b1ebc2a1d3753a6eea5a0f6335d077eef6b;hp=bcecaa8848529d57450a55acb412473da730a1b5;hpb=b5d58347438b481c0f071df7281a1453566951ba;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index bcecaa88..d3d81c25 100644 --- a/src/editor.c +++ b/src/editor.c @@ -17,6 +17,7 @@ #include "misc.h" #include "buttons.h" #include "files.h" +#include "game.h" /* positions in the level editor */ #define ED_WIN_MB_LEFT_XPOS 7 @@ -35,11 +36,17 @@ #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_EDIT 0 +#define ED_MODE_INFO 1 +#define ED_MODE_PROPERTIES 2 /* how many steps can be cancelled */ -#define NUM_UNDO_STEPS 10 +#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 @@ -59,7 +66,16 @@ #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 + +/* 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_LINE 2 @@ -67,7 +83,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 @@ -81,20 +97,41 @@ #define ED_CTRL_ID_TEST 20 #define ED_CTRL_ID_EXIT 21 +/* other gadget identifiers */ +#define ED_CTRL_ID_SCORE_DOWN 22 +#define ED_CTRL_ID_SCORE_UP 23 + +#define ED_NUM_GADGETS 24 + /* forward declaration for internal use */ -void HandleDrawingFunction(int, int, int); +static void CopyLevelToUndoBuffer(); +static void HandleDrawingFunctions(int, int, int); +static void HandlePressedControlButtons(); +static void HandleControlButtons(struct GadgetInfo *); -static struct GadgetInfo *control_button_gadget[ED_NUM_CTRL_BUTTONS]; -static boolean control_button_gadgets_created = 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; +static short OrigBackup[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; 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; @@ -396,7 +433,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); @@ -423,224 +460,18 @@ void ScrollMiniLevel(int from_x, int from_y, int scroll) BackToFront(); } -void HandlePressedControlButtons() -{ - static unsigned long button_delay = 0; - int i = 0; - - /* buttons with action when held pressed */ - int gadget_id[] = - { - ED_CTRL_ID_WRAP_UP, - ED_CTRL_ID_WRAP_LEFT, - ED_CTRL_ID_WRAP_RIGHT, - ED_CTRL_ID_WRAP_DOWN, - -1 - }; - - if (!DelayReached(&button_delay, CHOICE_DELAY_VALUE)) - return; - - while (gadget_id[i] != -1) - { - int id = gadget_id[i++]; - int state = control_button_gadget[id]->state; - int button = control_button_gadget[id]->event.button; - int step = (button == 1 ? 1 : button == 2 ? 5 : 10); - - if (state != GD_BUTTON_PRESSED) - continue; - - switch (id) - { - 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; - - default: - break; - } - } -} - -void HandleLevelEditorControlButtons(struct GadgetInfo *gi) +void InitLevelEditorGadgets() { - int event_type = gi->event.type; - - /* - int button = gi->event.button; - */ - - int id; - int i, x, y; - - /* get the button id */ - for (i=0; iid == control_button_gadget[i]->id) - id = i; - - switch (id) - { - case ED_CTRL_ID_SINGLE_ITEMS: - case ED_CTRL_ID_CONNECTED_ITEMS: - case ED_CTRL_ID_LINE: - case ED_CTRL_ID_TEXT: - 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_CLEAR: - if (Request("Are you sure to clear this level ?", REQ_ASK)) - { - for(x=0; xlev_fieldx-2*SCR_FIELDX+1) - level_xpos = lev_fieldx-2*SCR_FIELDX+1; - if (lev_fieldx<2*SCR_FIELDX-2) + if (level_xpos > lev_fieldx - 2*SCR_FIELDX + 1) + level_xpos = lev_fieldx - 2*SCR_FIELDX + 1; + if (lev_fieldx < 2*SCR_FIELDX - 2) level_xpos = -1; - if (level_ypos<-1) + if (level_ypos < -1) level_ypos = -1; - if (level_ypos>lev_fieldy-2*SCR_FIELDY+1) - level_ypos = lev_fieldy-2*SCR_FIELDY+1; - if (lev_fieldy<2*SCR_FIELDY-2) + if (level_ypos > lev_fieldy - 2*SCR_FIELDY + 1) + level_ypos = lev_fieldy - 2*SCR_FIELDY + 1; + if (lev_fieldy < 2*SCR_FIELDY - 2) level_ypos = -1; } @@ -1019,7 +924,7 @@ void LevelEd(int mx, int my, int button) HandlePressedControlButtons(); - HandleDrawingFunction(mx, my, button); + HandleDrawingFunctions(mx, my, button); if (use_floodfill) /********** FLOOD FILL **********/ { @@ -1071,7 +976,7 @@ void LevelEd(int mx, int my, int button) if (((choice == ED_BUTTON_EUP && element_shift>0) || (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; @@ -1163,7 +1068,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; @@ -1180,7 +1085,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; @@ -1197,7 +1102,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; @@ -1276,7 +1181,7 @@ void LevelEd(int mx, int my, int 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; @@ -1416,7 +1321,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_EDIT; break; case ED_BUTTON_CLEAR: if (Request("Are you sure to clear this level ?",REQ_ASK)) @@ -1431,7 +1336,7 @@ void LevelEd(int mx, int my, int button) if (leveldir[leveldir_nr].readonly || Request("Exit without saving ?",REQ_ASK | REQ_STAY_OPEN)) { - CloseDoor(DOOR_CLOSE_BOTH); + CloseDoor(DOOR_CLOSE_ALL); game_status=MAINMENU; DrawMainMenu(); } @@ -1469,7 +1374,7 @@ void LevelEd(int mx, int my, int button) Ur[x][y]=Feld[x][y]; SaveLevel(level_nr); } - CloseDoor(DOOR_CLOSE_BOTH); + CloseDoor(DOOR_CLOSE_ALL); game_status=MAINMENU; DrawMainMenu(); } @@ -1665,12 +1570,71 @@ void LevelNameTyping(KeySym key) } } -static void swap_numbers(int *i1, int *i2) +static void DrawValueField(int field, int value) { - int help = *i1; + int i = 0; + int screen_pos[][3] = + { + { ED_SCORE_FIELD, + ED_SCORE_XPOS + ED_WIN_COUNT_XPOS, ED_SCORE_YPOS }, + { -1, 0, 0 } + }; - *i1 = *i2; - *i2 = help; + while (screen_pos[i][0] != -1) + { + int x = SX + screen_pos[i][1]; + int y = SY + screen_pos[i][2]; + + if (screen_pos[i++][0] != field) + continue; + + 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); + } +} + +static void DrawPropertiesWindow(int button) +{ + int x, y; + int new_element; + int num_elements_in_level; + + ClearWindow(); + + new_element = (button == 1 ? new_element1 : + button == 2 ? new_element2 : + button == 3 ? new_element3 : 0); + + DrawGraphic(1, 1, el2gfx(new_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 HandleDrawingFunctions(int mx, int my, int button) { static int last_button = 0; static int last_element = 0; 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; @@ -1824,6 +1843,9 @@ void HandleDrawingFunction(int mx, int my, int button) int ly = sy + level_ypos; int x, y; + if (edit_mode != ED_MODE_EDIT) + return; + button_press_event = (last_button == 0 && button != 0); button_release_event = (last_button != 0 && button == 0); last_button = button; @@ -1831,7 +1853,8 @@ void HandleDrawingFunction(int mx, int my, int button) if (mx < SX || mx >= SX + SXSIZE || my < SY || my >= SY + SYSIZE) return; - if (sx > lev_fieldx || sy > lev_fieldy || + if ((!button && !button_release_event) || + sx > lev_fieldx || sy > lev_fieldy || (sx == 0 && level_xpos<0) || (sx == 2*SCR_FIELDX - 1 && level_xpos > lev_fieldx - 2*SCR_FIELDX) || (sy == 0 && level_ypos < 0) || @@ -1846,7 +1869,7 @@ void HandleDrawingFunction(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; @@ -1882,7 +1905,7 @@ void HandleDrawingFunction(int mx, int my, int button) static int last_sy = -1; if (button_release_event) - copy_to_undo_buffer = TRUE; + CopyLevelToUndoBuffer(); if (button) { @@ -1920,7 +1943,7 @@ void HandleDrawingFunction(int mx, int my, int button) 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) { @@ -1932,65 +1955,328 @@ void HandleDrawingFunction(int mx, int my, int button) } break; - case 999: + case ED_CTRL_ID_FLOOD_FILL: + if (button_press_event && Feld[lx][ly] != new_element) { - static int last_sx = -1; - static int last_sy = -1; + FloodFill(lx, ly, new_element); + DrawMiniLevel(level_xpos, level_ypos); + CopyLevelToUndoBuffer(); + } + break; - if (last_sx == -1) - { - Feld[lx][ly] = new_element; - DrawMiniElement(sx, sy, new_element); + default: + break; + } - last_sx = sx; - last_sy = sy; - } - else if (last_sx != sx || last_sy != sy) - { - DrawLine(last_sx, last_sy, sx, sy, new_element, TRUE); + last_element = new_element; +} - last_sx = -1; - last_sy = -1; - } +static void HandlePressedControlButtons() +{ + static unsigned long button_delay = 0; + int i = 0; - /* - last_sx = sx; - last_sy = sy; - */ - } - break; + /* buttons with action when held pressed */ + int gadget_id[] = + { + ED_CTRL_ID_WRAP_UP, + 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, GADGET_FRAME_DELAY)) + return; + + while (gadget_id[i] != -1) + { + 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) + continue; + + switch (id) + { + 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_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; + DrawValueField(ED_SCORE_FIELD, *gadget_score_value); + break; + + default: + break; + } + } +} + +static void HandleControlButtons(struct GadgetInfo *gi) +{ + /* + int event_type = gi->event.type; + */ + int button = gi->event.button; + int player_present = FALSE; + int level_changed = FALSE; + int id = -1; + int i, x, y; + + /* get the button id */ + for (i=0; iid == level_editor_gadget[i]->id) + id = i; + + if (id >= 0 && id < ED_NUM_CTRL1_BUTTONS && edit_mode != ED_MODE_EDIT) + { + UnmapLevelEditorWindowGadgets(); + AdjustLevelScrollPosition(); + DrawMiniLevel(level_xpos, level_ypos); + edit_mode = ED_MODE_EDIT; + } + + switch (id) + { + case ED_CTRL_ID_SINGLE_ITEMS: + case ED_CTRL_ID_CONNECTED_ITEMS: + case ED_CTRL_ID_LINE: + case ED_CTRL_ID_TEXT: + case ED_CTRL_ID_RECTANGLE: + case ED_CTRL_ID_FILLED_BOX: case ED_CTRL_ID_FLOOD_FILL: - if (!button) + case ED_CTRL_ID_BRUSH: + drawing_function = id; + break; + + case ED_CTRL_ID_PROPERTIES: + DrawPropertiesWindow(button); + 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) + { + Request("Undo buffer empty !", REQ_CONFIRM); break; + } - if (button_press_event && Feld[lx][ly] != new_element) + undo_buffer_position = + (undo_buffer_position - 1 + NUM_UNDO_STEPS) % NUM_UNDO_STEPS; + undo_buffer_steps--; + + for(x=0; x