From: Holger Schemel Date: Tue, 3 Apr 2007 23:05:13 +0000 (+0200) Subject: rnd-20070404-1-src X-Git-Tag: 3.2.4^2~45 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=914431754efb7c8c3321a68f8b828b471cf15e3c;p=rocksndiamonds.git rnd-20070404-1-src --- diff --git a/src/conftime.h b/src/conftime.h index e4a03f30..1319bb5c 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "2007-04-03 20:17" +#define COMPILE_DATE_STRING "2007-04-03 23:50" diff --git a/src/editor.c b/src/editor.c index 081dc373..e7664ed0 100644 --- a/src/editor.c +++ b/src/editor.c @@ -3311,6 +3311,11 @@ static int editor_el_emerald_mine[] = EL_EM_GATE_2_GRAY, EL_EM_GATE_3_GRAY, EL_EM_GATE_4_GRAY, + + EL_EM_EXIT_CLOSED, + EL_EM_EXIT_OPEN, + EL_EM_STEEL_EXIT_CLOSED, + EL_EM_STEEL_EXIT_OPEN, }; static int *editor_hl_emerald_mine_ptr = editor_hl_emerald_mine; static int *editor_el_emerald_mine_ptr = editor_el_emerald_mine; @@ -3642,25 +3647,25 @@ static int editor_el_diamond_caves[] = EL_SWITCHGATE_SWITCH_UP, EL_SWITCHGATE_SWITCH_DOWN, - EL_EMPTY, - EL_EMPTY, - EL_DC_SWITCHGATE_SWITCH_UP, - EL_DC_SWITCHGATE_SWITCH_DOWN, - - EL_SIGN_EXCLAMATION, - EL_SIGN_STOP, EL_LIGHT_SWITCH, EL_LIGHT_SWITCH_ACTIVE, + EL_DC_SWITCHGATE_SWITCH_UP, + EL_DC_SWITCHGATE_SWITCH_DOWN, + EL_STEEL_EXIT_CLOSED, + EL_STEEL_EXIT_OPEN, EL_STEELWALL_SLIPPERY, EL_INVISIBLE_SAND, + + EL_QUICKSAND_FAST_EMPTY, + EL_QUICKSAND_FAST_FULL, EL_LANDMINE, EL_DC_LANDMINE, EL_SHIELD_NORMAL, EL_SHIELD_DEADLY, EL_EXTRA_TIME, - EL_EMPTY, + EL_DC_MAGIC_WALL, EL_ENVELOPE_1, EL_ENVELOPE_2, @@ -3677,6 +3682,7 @@ static int editor_el_diamond_caves[] = EL_SIGN_EMERGENCY_EXIT, EL_SIGN_YIN_YANG, +#if 0 EL_SIGN_SPERMS, EL_SIGN_BULLET, EL_SIGN_HEART, @@ -3696,11 +3702,12 @@ static int editor_el_diamond_caves[] = EL_EMPTY, EL_EMPTY, EL_EMPTY, +#endif EL_DC_STEELWALL_2_SINGLE, EL_DC_STEELWALL_2_TOP, - EL_STEEL_EXIT_CLOSED, - EL_STEEL_EXIT_OPEN, + EL_SIGN_EXCLAMATION, + EL_SIGN_STOP, EL_DC_STEELWALL_2_LEFT, EL_DC_STEELWALL_2_MIDDLE, @@ -3710,52 +3717,32 @@ static int editor_el_diamond_caves[] = EL_DC_STEELWALL_1_TOPLEFT, EL_DC_STEELWALL_2_VERTICAL, EL_DC_STEELWALL_1_TOPRIGHT, - EL_EMPTY, + EL_DC_GATE_WHITE, EL_DC_STEELWALL_1_VERTICAL, EL_DC_STEELWALL_2_BOTTOM, - EL_EMPTY, - EL_EMPTY, + EL_DC_KEY_WHITE, + EL_DC_GATE_WHITE_GRAY, EL_DC_STEELWALL_1_BOTTOMLEFT, EL_DC_STEELWALL_1_HORIZONTAL, EL_DC_STEELWALL_1_BOTTOMRIGHT, - EL_EMPTY, + EL_DC_GATE_FAKE_GRAY, EL_DC_STEELWALL_1_BOTTOMRIGHT_2, EL_DC_STEELWALL_1_BOTTOM, EL_DC_STEELWALL_1_BOTTOMLEFT_2, - EL_EMPTY, + EL_EXPANDABLE_STEELWALL_HORIZONTAL, EL_DC_STEELWALL_1_RIGHT, EL_EMPTY, EL_DC_STEELWALL_1_LEFT, - EL_EMPTY, + EL_EXPANDABLE_STEELWALL_VERTICAL, EL_DC_STEELWALL_1_TOPRIGHT_2, EL_DC_STEELWALL_1_TOP, EL_DC_STEELWALL_1_TOPLEFT_2, - EL_EMPTY, - - EL_EXPANDABLE_STEELWALL_HORIZONTAL, - EL_EXPANDABLE_STEELWALL_VERTICAL, EL_EXPANDABLE_STEELWALL_ANY, - EL_EMPTY, - - EL_EM_EXIT_CLOSED, - EL_EM_EXIT_OPEN, - EL_EM_STEEL_EXIT_CLOSED, - EL_EM_STEEL_EXIT_OPEN, - - EL_DC_KEY_WHITE, - EL_DC_GATE_WHITE, - EL_DC_GATE_WHITE_GRAY, - EL_DC_GATE_FAKE_GRAY, - - EL_DC_MAGIC_WALL, - EL_QUICKSAND_FAST_EMPTY, - EL_QUICKSAND_FAST_FULL, - EL_EMPTY, }; static int *editor_hl_diamond_caves_ptr = editor_hl_diamond_caves; static int *editor_el_diamond_caves_ptr = editor_el_diamond_caves; diff --git a/src/main.c b/src/main.c index e6401836..58b61507 100644 --- a/src/main.c +++ b/src/main.c @@ -1437,7 +1437,7 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = { "dc_gate_white", "gate", - "white gate" + "white door" }, { "dc_gate_white_gray",