X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Feditor.c;h=d141e16a962ad3bc9112eb3d4ba598ca872148f5;hb=33bfa6789748737979047e8c8616f5c786b39958;hp=e598db1720ab94a912f0598585ec18b4e9dcf38e;hpb=476723662969279e665b95a3d57efd85e747a80e;p=rocksndiamonds.git diff --git a/src/editor.c b/src/editor.c index e598db17..d141e16a 100644 --- a/src/editor.c +++ b/src/editor.c @@ -1538,9 +1538,11 @@ static struct ValueTextInfo options_action_type[] = { CA_SET_SCORE, "set score" }, { CA_SET_CE_SCORE, "set CE score" }, { CA_SET_CE_COUNT, "set CE count" }, +#if 0 { CA_SET_DYNABOMB_NUMBER, "set bomb number" }, { CA_SET_DYNABOMB_SIZE, "set bomb size" }, { CA_SET_DYNABOMB_POWER, "set bomb power" }, +#endif { CA_TOGGLE_PLAYER_GRAVITY, "toggle gravity" }, { CA_ENABLE_PLAYER_GRAVITY, "enable gravity" }, { CA_DISABLE_PLAYER_GRAVITY, "disable gravity" }, @@ -1551,11 +1553,12 @@ static struct ValueTextInfo options_action_type[] = static struct ValueTextInfo options_action_mode[] = { { CA_MODE_UNDEFINED, " " }, + { CA_MODE_SET, "=" }, { CA_MODE_ADD, "+" }, { CA_MODE_SUBTRACT, "-" }, { CA_MODE_MULTIPLY, "*" }, { CA_MODE_DIVIDE, "/" }, - { CA_MODE_SET, "=" }, + { CA_MODE_MODULO, "%" }, { -1, NULL } }; @@ -2841,14 +2844,14 @@ static int editor_el_emerald_mine_club[] = EL_EMC_WALL_11, EL_EMC_WALL_12, -#if RELEASE_311 +#if RELEASE_3_1_2 EL_EMPTY, #else EL_EMC_ANDROID, #endif EL_BALLOON, EL_BALLOON_SWITCH_ANY, -#if RELEASE_311 +#if RELEASE_3_1_2 EL_EMPTY, #else EL_BALLOON_SWITCH_NONE, @@ -2861,7 +2864,7 @@ static int editor_el_emerald_mine_club[] = EL_EMC_GRASS, EL_EMC_PLANT, -#if RELEASE_311 +#if RELEASE_3_1_2 EL_EMPTY, EL_EMPTY, #else @@ -2869,7 +2872,7 @@ static int editor_el_emerald_mine_club[] = EL_EMC_MAGNIFIER, #endif -#if RELEASE_311 +#if RELEASE_3_1_2 EL_EMPTY, EL_EMPTY, #else @@ -2877,13 +2880,13 @@ static int editor_el_emerald_mine_club[] = EL_EMC_MAGIC_BALL_SWITCH, #endif EL_SPRING, -#if RELEASE_311 +#if RELEASE_3_1_2 EL_EMPTY, #else EL_EMC_SPRING_BUMPER, #endif -#if RELEASE_311 +#if RELEASE_3_1_2 EL_EMPTY, #else EL_EMC_DRIPPER,