projects / rocksndiamonds.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rnd-20020921-1-src
[rocksndiamonds.git] / src / editor.c
diff --git a/src/editor.c b/src/editor.c
index cf287ec8e82456497d57234c75a3fbee052079f7..922dfe0699deaf9c27600642299f01c2b3531cc1 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -764,7 +764,7 @@ int editor_element[] =
   EL_EXIT_CLOSED,
   EL_EXIT_OPEN,
 
-  EL_EDELSTEIN_BD,
+  EL_BD_DIAMOND,
   EL_BUTTERFLY_UP,
   EL_FIREFLY_UP,
   EL_BD_ROCK,
@@ -794,10 +794,10 @@ int editor_element[] =
   EL_CHAR('N'),
   EL_CHAR('E'),
 
-  EL_SPIELER1,
-  EL_SPIELER2,
-  EL_SPIELER3,
-  EL_SPIELER4,
+  EL_PLAYER1,
+  EL_PLAYER2,
+  EL_PLAYER3,
+  EL_PLAYER4,
 
   EL_PLAYER,
   EL_EMPTY,
@@ -854,15 +854,15 @@ int editor_element[] =
   EL_AMOEBA_WET,
   EL_AMOEBA_DRY,
 
-  EL_EM_KEY_1_FILE,
-  EL_EM_KEY_2_FILE,
-  EL_EM_KEY_3_FILE,
-  EL_EM_KEY_4_FILE,
+  EL_EM_KEY1_FILE,
+  EL_EM_KEY2_FILE,
+  EL_EM_KEY3_FILE,
+  EL_EM_KEY4_FILE,
 
-  EL_EM_GATE_1,
-  EL_EM_GATE_2,
-  EL_EM_GATE_3,
-  EL_EM_GATE_4,
+  EL_EM_GATE1,
+  EL_EM_GATE2,
+  EL_EM_GATE3,
+  EL_EM_GATE4,
 
   EL_EM_GATE1_GRAY,
   EL_EM_GATE2_GRAY,
@@ -889,15 +889,15 @@ int editor_element[] =
   EL_GATE3_GRAY,
   EL_GATE4_GRAY,
 
-  EL_PFEIL_LEFT,
-  EL_PFEIL_RIGHT,
-  EL_PFEIL_UP,
-  EL_PFEIL_DOWN,
+  EL_ARROW_LEFT,
+  EL_ARROW_RIGHT,
+  EL_ARROW_UP,
+  EL_ARROW_DOWN,
 
   EL_AMOEBA_FULL,
-  EL_EDELSTEIN_YELLOW,
-  EL_EDELSTEIN_RED,
-  EL_EDELSTEIN_PURPLE,
+  EL_EMERALD_YELLOW,
+  EL_EMERALD_RED,
+  EL_EMERALD_PURPLE,
 
   EL_WALL_BD_DIAMOND,
   EL_WALL_EMERALD_YELLOW,
@@ -912,7 +912,7 @@ int editor_element[] =
   EL_PACMAN_LEFT,
   EL_DARK_YAMYAM,
   EL_PACMAN_RIGHT,
-  EL_MAUER_LEBT,
+  EL_WALL_GROWING,
 
   EL_BIOMAZE,
   EL_PACMAN_DOWN,
@@ -922,12 +922,12 @@ int editor_element[] =
   EL_DYNABOMB_NR,
   EL_DYNABOMB_SZ,
   EL_DYNABOMB_XL,
-  EL_BADEWANNE,
+  EL_STONEBLOCK,
 
   EL_MOLE,
-  EL_PINGUIN,
-  EL_SCHWEIN,
-  EL_DRACHE,
+  EL_PENGUIN,
+  EL_PIG,
+  EL_DRAGON,
 
   EL_EMPTY,
   EL_MOLE_UP,
@@ -949,25 +949,25 @@ int editor_element[] =
   EL_BALLOON_SEND_UP,
   EL_BALLOON_SEND_DOWN,
 
-  EL_SONDE,
-  EL_MAUER_X,
-  EL_MAUER_Y,
-  EL_MAUER_XY,
+  EL_SATELLITE,
+  EL_WALL_GROWING_X,
+  EL_WALL_GROWING_Y,
+  EL_WALL_GROWING_XY,
 
-  EL_INVISIBLE_STEEL,
+  EL_INVISIBLE_STEELWALL,
   EL_INVISIBLE_WALL,
   EL_SPEED_PILL,
   EL_BLACK_ORB,
 
-  EL_EMC_STEEL_WALL_1,
-  EL_EMC_WALL_1,
-  EL_EMC_WALL_2,
-  EL_EMC_WALL_3,
+  EL_EMC_STEELWALL1,
+  EL_EMC_WALL_PILLAR_UPPER,
+  EL_EMC_WALL_PILLAR_MIDDLE,
+  EL_EMC_WALL_PILLAR_LOWER,
 
-  EL_EMC_WALL_4,
-  EL_EMC_WALL_5,
-  EL_EMC_WALL_6,
-  EL_EMC_WALL_7,
+  EL_EMC_WALL4,
+  EL_EMC_WALL5,
+  EL_EMC_WALL6,
+  EL_EMC_WALL7,
 
 
   EL_CHAR('S'),
@@ -1003,7 +1003,7 @@ int editor_element[] =
   EL_SP_INFOTRON,
   EL_SP_CHIP_SINGLE,
   EL_SP_HARD_GRAY,
-  EL_SP_EXIT,
+  EL_SP_EXIT_CLOSED,
 
   EL_SP_DISK_ORANGE,
   EL_SP_PORT1_RIGHT,
@@ -1070,39 +1070,39 @@ int editor_element[] =
   EL_WALL_PEARL,
   EL_WALL_CRYSTAL,
 
-  EL_BELT1_LEFT,
-  EL_BELT1_MIDDLE,
-  EL_BELT1_RIGHT,
-  EL_BELT1_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT1_LEFT,
+  EL_CONVEYOR_BELT1_MIDDLE,
+  EL_CONVEYOR_BELT1_RIGHT,
+  EL_CONVEYOR_BELT1_SWITCH_MIDDLE,
 
-  EL_BELT2_LEFT,
-  EL_BELT2_MIDDLE,
-  EL_BELT2_RIGHT,
-  EL_BELT2_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT2_LEFT,
+  EL_CONVEYOR_BELT2_MIDDLE,
+  EL_CONVEYOR_BELT2_RIGHT,
+  EL_CONVEYOR_BELT2_SWITCH_MIDDLE,
 
-  EL_BELT3_LEFT,
-  EL_BELT3_MIDDLE,
-  EL_BELT3_RIGHT,
-  EL_BELT3_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT3_LEFT,
+  EL_CONVEYOR_BELT3_MIDDLE,
+  EL_CONVEYOR_BELT3_RIGHT,
+  EL_CONVEYOR_BELT3_SWITCH_MIDDLE,
 
-  EL_BELT4_LEFT,
-  EL_BELT4_MIDDLE,
-  EL_BELT4_RIGHT,
-  EL_BELT4_SWITCH_MIDDLE,
+  EL_CONVEYOR_BELT4_LEFT,
+  EL_CONVEYOR_BELT4_MIDDLE,
+  EL_CONVEYOR_BELT4_RIGHT,
+  EL_CONVEYOR_BELT4_SWITCH_MIDDLE,
 
-  EL_BELT1_SWITCH_LEFT,
-  EL_BELT2_SWITCH_LEFT,
-  EL_BELT3_SWITCH_LEFT,
-  EL_BELT4_SWITCH_LEFT,
+  EL_CONVEYOR_BELT1_SWITCH_LEFT,
+  EL_CONVEYOR_BELT2_SWITCH_LEFT,
+  EL_CONVEYOR_BELT3_SWITCH_LEFT,
+  EL_CONVEYOR_BELT4_SWITCH_LEFT,
 
-  EL_BELT1_SWITCH_RIGHT,
-  EL_BELT2_SWITCH_RIGHT,
-  EL_BELT3_SWITCH_RIGHT,
-  EL_BELT4_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT1_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT2_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT3_SWITCH_RIGHT,
+  EL_CONVEYOR_BELT4_SWITCH_RIGHT,
 
   EL_SWITCHGATE_OPEN,
   EL_SWITCHGATE_CLOSED,
-  EL_SWITCHGATE_SWITCH_1,
+  EL_SWITCHGATE_SWITCH_UP,
   EL_ENVELOPE,
 
   EL_TIMEGATE_CLOSED,
@@ -1112,15 +1112,15 @@ int editor_element[] =
 
   EL_LANDMINE,
   EL_SAND_INVISIBLE,
-  EL_STEEL_SLANTED,
+  EL_STEELWALL_SLANTED,
   EL_EMPTY,
 
   EL_SIGN_EXCLAMATION,
   EL_SIGN_STOP,
-  EL_LIGHT_SWITCH_OFF,
-  EL_LIGHT_SWITCH_ON,
+  EL_LIGHT_SWITCH,
+  EL_LIGHT_SWITCH_ACTIVE,
 
-  EL_SHIELD_PASSIVE,
+  EL_SHIELD_NORMAL,
   EL_SHIELD_ACTIVE,
   EL_EXTRA_TIME,
   EL_EMPTY,
@@ -2102,7 +2102,7 @@ static boolean LevelContainsPlayer()
   for(y=0; y<lev_fieldy; y++) 
     for(x=0; x<lev_fieldx; x++)
       if (Feld[x][y] == EL_PLAYER ||
-         Feld[x][y] == EL_SPIELER1 ||
+         Feld[x][y] == EL_PLAYER1 ||
          Feld[x][y] == EL_SP_MURPHY) 
        player_found = TRUE;
 
@@ -2611,10 +2611,10 @@ static void DrawPropertiesWindow()
   } elements_with_counter[] =
   {
     { EL_EMERALD,      &level.score[SC_EDELSTEIN],     TEXT_COLLECTING },
-    { EL_EDELSTEIN_BD, &level.score[SC_EDELSTEIN],     TEXT_COLLECTING },
-    { EL_EDELSTEIN_YELLOW,&level.score[SC_EDELSTEIN],  TEXT_COLLECTING },
-    { EL_EDELSTEIN_RED,        &level.score[SC_EDELSTEIN],     TEXT_COLLECTING },
-    { EL_EDELSTEIN_PURPLE,&level.score[SC_EDELSTEIN],  TEXT_COLLECTING },
+    { EL_BD_DIAMOND,   &level.score[SC_EDELSTEIN],     TEXT_COLLECTING },
+    { EL_EMERALD_YELLOW,&level.score[SC_EDELSTEIN],    TEXT_COLLECTING },
+    { EL_EMERALD_RED,  &level.score[SC_EDELSTEIN],     TEXT_COLLECTING },
+    { EL_EMERALD_PURPLE,&level.score[SC_EDELSTEIN],    TEXT_COLLECTING },
     { EL_DIAMOND,      &level.score[SC_DIAMANT],       TEXT_COLLECTING },
     { EL_BUG_RIGHT,    &level.score[SC_KAEFER],        TEXT_SMASHING },
     { EL_BUG_UP,       &level.score[SC_KAEFER],        TEXT_SMASHING },
@@ -2645,10 +2645,10 @@ static void DrawPropertiesWindow()
     { EL_KEY2,         &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
     { EL_KEY3,         &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
     { EL_KEY4,         &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
-    { EL_EM_KEY_1_FILE,        &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
-    { EL_EM_KEY_2_FILE,        &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
-    { EL_EM_KEY_3_FILE,        &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
-    { EL_EM_KEY_4_FILE,        &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
+    { EL_EM_KEY1_FILE, &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
+    { EL_EM_KEY2_FILE, &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
+    { EL_EM_KEY3_FILE, &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
+    { EL_EM_KEY4_FILE, &level.score[SC_SCHLUESSEL],    TEXT_COLLECTING },
     { EL_AMOEBA_WET,   &level.amoeba_speed,            TEXT_SPEED },
     { EL_AMOEBA_DRY,   &level.amoeba_speed,            TEXT_SPEED },
     { EL_AMOEBA_FULL,  &level.amoeba_speed,            TEXT_SPEED },
@@ -3143,7 +3143,7 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
   else if (letter == 'ü' || letter == 'Ü')
     letter_element = EL_CHAR_UE;
   else if (letter == '^')
-    letter_element = EL_CHAR_COPY;
+    letter_element = EL_CHAR_COPYRIGHT;
   else
     letter_element = EL_CHAR_ASCII0 + letter;
 
@@ -3454,7 +3454,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
            {
              for(x=0; x<lev_fieldx; x++)
              {
-               if (Feld[x][y] == EL_PLAYER || Feld[x][y] == EL_SPIELER1)
+               if (Feld[x][y] == EL_PLAYER || Feld[x][y] == EL_PLAYER1)
                {
                  Feld[x][y] = EL_EMPTY;
                  if (x - level_xpos >= 0 && x - level_xpos < ed_fieldx &&
Rocks'n'Diamonds