X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=2e317c3d21440addc0cc9f800045fd7330195aa6;hb=fa628a204ea4662806244b0ed994a48b40ece2ca;hp=c27ee10d2bf1064affd2fcf9642d5d7a3f89ba65;hpb=380afea8229172182d887138b6e72751669cf6e0;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index c27ee10d..2e317c3d 100644 --- a/src/editor.c +++ b/src/editor.c @@ -1765,11 +1765,50 @@ static struct ValueTextInfo options_action_arg_number[] = { CA_ARG_NUMBER_LEVEL_GEMS, "gems" }, { CA_ARG_NUMBER_LEVEL_SCORE, "score" }, { CA_ARG_UNDEFINED, " " }, - { CA_ARG_ELEMENT_HEADLINE, "[CE value" }, - { CA_ARG_ELEMENT_HEADLINE, " of" }, - { CA_ARG_ELEMENT_HEADLINE, " element]" }, - { CA_ARG_ELEMENT_TARGET, "target" }, - { CA_ARG_ELEMENT_TRIGGER, "trigger" }, + { CA_ARG_ELEMENT_CV_HEADLINE, "[CE value" }, + { CA_ARG_ELEMENT_CV_HEADLINE, " of" }, + { CA_ARG_ELEMENT_CV_HEADLINE, " element]" }, + { CA_ARG_ELEMENT_CV_TARGET, "target" }, + { CA_ARG_ELEMENT_CV_TRIGGER, "trigger" }, + + { -1, NULL } +}; + +static struct ValueTextInfo options_action_arg_value[] = +{ + { CA_ARG_NUMBER_HEADLINE, "[number]" }, + { CA_ARG_0, "0" }, + { CA_ARG_1, "1" }, + { CA_ARG_2, "2" }, + { CA_ARG_3, "3" }, + { CA_ARG_4, "4" }, + { CA_ARG_5, "5" }, + { CA_ARG_10, "10" }, + { CA_ARG_100, "100" }, + { CA_ARG_1000, "1000" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_NUMBER_MIN, "min" }, + { CA_ARG_NUMBER_MAX, "max" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_NUMBER_RESET, "reset" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_NUMBER_CE_DELAY, "CE delay" }, + { CA_ARG_NUMBER_CE_SCORE, "CE score" }, + { CA_ARG_NUMBER_CE_VALUE, "CE value" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_NUMBER_LEVEL_TIME, "time" }, + { CA_ARG_NUMBER_LEVEL_GEMS, "gems" }, + { CA_ARG_NUMBER_LEVEL_SCORE, "score" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_ELEMENT_CV_HEADLINE, "[CE value" }, + { CA_ARG_ELEMENT_CV_HEADLINE, " of" }, + { CA_ARG_ELEMENT_CV_HEADLINE, " element]" }, + { CA_ARG_ELEMENT_CV_TARGET, "target" }, + { CA_ARG_ELEMENT_CV_TRIGGER, "trigger" }, + { CA_ARG_UNDEFINED, " " }, + { CA_ARG_ELEMENT_NR_HEADLINE, "[element]" }, + { CA_ARG_ELEMENT_NR_TARGET, "target" }, + { CA_ARG_ELEMENT_NR_TRIGGER, "trigger" }, { -1, NULL } }; @@ -1929,8 +1968,8 @@ action_arg_options[] = { CA_SET_PLAYER_SPEED, 1, options_action_arg_speed, }, { CA_SET_PLAYER_SHIELD, 1, options_action_arg_shield, }, { CA_SET_PLAYER_ARTWORK, 1, options_action_arg_artwork, }, - { CA_SET_CE_SCORE, 3, options_action_arg_number, }, - { CA_SET_CE_VALUE, 3, options_action_arg_number, }, + { CA_SET_CE_SCORE, 3, options_action_arg_value, }, + { CA_SET_CE_VALUE, 3, options_action_arg_value, }, { CA_SET_ENGINE_SCAN_MODE, 1, options_action_arg_scan_mode, }, { -1, FALSE, NULL } @@ -2450,7 +2489,7 @@ static struct "slip down from certain flat walls","use EM style slipping behaviour" }, { - ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(1), + ED_ELEMENT_SETTINGS_XPOS(0), ED_ELEMENT_SETTINGS_YPOS(2), GADGET_ID_USE_SPRING_BUG, GADGET_ID_NONE, &level.use_spring_bug, NULL, @@ -3316,6 +3355,11 @@ static int editor_el_emerald_mine_club[] = EL_EMC_FAKE_GRASS, EL_EMPTY, EL_EMPTY, + + EL_EM_DYNAMITE, + EL_EM_DYNAMITE_ACTIVE, + EL_EMPTY, + EL_EMPTY, }; static int *editor_hl_emerald_mine_club_ptr = editor_hl_emerald_mine_club; static int *editor_el_emerald_mine_club_ptr = editor_el_emerald_mine_club; @@ -4160,9 +4204,9 @@ static int editor_el_custom[] = EL_CUSTOM_START + 254, EL_CUSTOM_START + 255, - EL_TRIGGER_ELEMENT, EL_TRIGGER_PLAYER, - EL_EMPTY, + EL_TRIGGER_ELEMENT, + EL_TRIGGER_CE_VALUE, EL_EMPTY }; static int *editor_hl_custom_ptr = editor_hl_custom; @@ -6319,8 +6363,12 @@ static void copy_custom_element_settings(int element_from, int element_to) ei_to->description[i] = ei_from->description[i]; /* ---------- copy element base properties ---------- */ +#if 1 + ei_to->properties[EP_BITFIELD_BASE] = ei_from->properties[EP_BITFIELD_BASE]; +#else Properties[element_to][EP_BITFIELD_BASE] = Properties[element_from][EP_BITFIELD_BASE]; +#endif /* ---------- copy custom property values ---------- */ @@ -7582,7 +7630,7 @@ static void DrawPropertiesInfo() #define TEXT_COLLECTING "Score for collecting" #define TEXT_SMASHING "Score for smashing" -#define TEXT_SLURPING "Score for slurping" +#define TEXT_SLURPING "Score for slurping robot" #define TEXT_CRACKING "Score for cracking" #define TEXT_AMOEBA_SPEED "Speed of amoeba growth" #define TEXT_DURATION "Duration when activated" @@ -7643,6 +7691,7 @@ static struct { EL_PACMAN_DOWN, &level.score[SC_PACMAN], TEXT_SMASHING }, { EL_NUT, &level.score[SC_NUT], TEXT_CRACKING }, { EL_DYNAMITE, &level.score[SC_DYNAMITE], TEXT_COLLECTING }, + { EL_EM_DYNAMITE, &level.score[SC_DYNAMITE], TEXT_COLLECTING }, { EL_DYNABOMB_INCREASE_NUMBER,&level.score[SC_DYNAMITE],TEXT_COLLECTING }, { EL_DYNABOMB_INCREASE_SIZE, &level.score[SC_DYNAMITE],TEXT_COLLECTING }, { EL_DYNABOMB_INCREASE_POWER, &level.score[SC_DYNAMITE],TEXT_COLLECTING }, @@ -7693,7 +7742,7 @@ static struct { EL_EMC_MAGIC_BALL, &level.ball_time, TEXT_BALL_DELAY }, { EL_EMC_LENSES, &level.lenses_score, TEXT_COLLECTING }, { EL_EMC_MAGNIFIER, &level.magnify_score, TEXT_COLLECTING }, - { EL_ROBOT, &level.slurp_score, TEXT_SLURPING }, + { EL_SPRING, &level.slurp_score, TEXT_SLURPING }, { EL_EMC_LENSES, &level.lenses_time, TEXT_DURATION }, { EL_EMC_MAGNIFIER, &level.magnify_time, TEXT_DURATION }, #endif @@ -9847,10 +9896,23 @@ void HandleLevelEditorKeyInput(Key key) button = MB_RIGHTBUTTON; break; + case KSYM_Home: + case KSYM_End: + element_shift = (key == KSYM_Home ? 0 : + num_editor_elements - ED_NUM_ELEMENTLIST_BUTTONS); + + ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_LIST_VERTICAL], + GDI_SCROLLBAR_ITEM_POSITION, + element_shift / ED_ELEMENTLIST_BUTTONS_HORIZ, GDI_END); + + ModifyEditorElementList(); + + break; + case KSYM_Escape: if (edit_mode == ED_MODE_DRAWING) { - RequestExitLevelEditor(setup.ask_on_escape); + RequestExitLevelEditor(setup.ask_on_escape_editor); } else if (edit_mode == ED_MODE_INFO) {