rnd-20021019-1-src

diff --git a/src/conf_chr.c b/src/conf_chr.c
index 127a270fabde31f16a2dca3351865198e381c73c..3f2923d0f91e0cc6901f82604cb04aadf3696a9c 100644 (file)
--- a/src/conf_chr.c
+++ b/src/conf_chr.c
@@ -339,23 +339,23 @@
   { "char_underscore.frames",                  "1"                     },
 
   { "char_empty",                              "RocksFontEM.pcx"       },
-  { "char_empty.xpos",                         "16"                    },
-  { "char_empty.ypos",                         "0"                     },
+  { "char_empty.xpos",                         "0"                     },
+  { "char_empty.ypos",                         "4"                     },
   { "char_empty.frames",                       "1"                     },
 
   { "char_degree",                             "RocksFontEM.pcx"       },
-  { "char_degree.xpos",                                "16"                    },
-  { "char_degree.ypos",                                "1"                     },
+  { "char_degree.xpos",                                "1"                     },
+  { "char_degree.ypos",                                "4"                     },
   { "char_degree.frames",                      "1"                     },
 
   { "char_tm",                                 "RocksFontEM.pcx"       },
-  { "char_tm.xpos",                            "16"                    },
-  { "char_tm.ypos",                            "2"                     },
+  { "char_tm.xpos",                            "2"                     },
+  { "char_tm.ypos",                            "4"                     },
   { "char_tm.frames",                          "1"                     },
 
   { "char_cursor",                             "RocksFontEM.pcx"       },
-  { "char_cursor.xpos",                                "16"                    },
-  { "char_cursor.ypos",                                "3"                     },
+  { "char_cursor.xpos",                                "3"                     },
+  { "char_cursor.ypos",                                "4"                     },
   { "char_cursor.frames",                      "1"                     },
 
 

diff --git a/src/conftime.h b/src/conftime.h
index 12893605bd1791becd62b044a746f53ed7f584cc..da17475830fbc4b1c5568ddd1b8dfe6e81aaae85 100644 (file)
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "[2002-10-06 04:07]"
+#define COMPILE_DATE_STRING "[2002-10-19 20:38]"

diff --git a/src/editor.c b/src/editor.c
index ec814f42a0f2ed7d6674223738409a97ed359689..db1a37e8705064866c79be94d87ea00baf298a9b 100644 (file)
--- a/src/editor.c
+++ b/src/editor.c
@@ -1298,13 +1298,13 @@ static void ScrollMiniLevel(int from_x, int from_y, int scroll)
   {
     x = (dx == 1 ? 0 : ed_fieldx - 1);
     for(y=0; y<ed_fieldy; y++)
-      DrawMiniElementOrWall(x, y, from_x, from_y);
+      DrawNewMiniElementOrWall(x, y, from_x, from_y);
   }
   else if (dy)
   {
     y = (dy == 1 ? 0 : ed_fieldy - 1);
     for(x=0; x<ed_fieldx; x++)
-      DrawMiniElementOrWall(x, y, from_x, from_y);
+      DrawNewMiniElementOrWall(x, y, from_x, from_y);
   }
 
   redraw_mask |= REDRAW_FIELD;
@@ -1490,8 +1490,8 @@ static void CreateControlButtons()
     gd_x2 = DOOR_GFX_PAGEX6 + ED_ELEMENTLIST_XPOS;
     gd_y  = DOOR_GFX_PAGEY1 + ED_ELEMENTLIST_YPOS;
 
-    getMiniGraphicSource(el2gfx(editor_element[i]),
-                        &deco_bitmap, &deco_x, &deco_y);
+    getNewMiniGraphicSource(el2img(editor_element[i]),
+                           &deco_bitmap, &deco_x, &deco_y);
     deco_xpos = (ED_ELEMENTLIST_XSIZE - MINI_TILEX) / 2;
     deco_ypos = (ED_ELEMENTLIST_YSIZE - MINI_TILEY) / 2;
 
@@ -2141,15 +2141,15 @@ void DrawLevelEd()
             DOOR_GFX_PAGEX6, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY);
 
   /* draw mouse button brush elements */
-  DrawMiniGraphicExt(drawto,
+  DrawNewMiniGraphicExt(drawto,
                     DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
-                    el2gfx(new_element1));
-  DrawMiniGraphicExt(drawto,
+                    el2img(new_element1));
+  DrawNewMiniGraphicExt(drawto,
                     DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
-                    el2gfx(new_element2));
-  DrawMiniGraphicExt(drawto,
+                    el2img(new_element2));
+  DrawNewMiniGraphicExt(drawto,
                     DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
-                    el2gfx(new_element3));
+                    el2img(new_element3));
 
   /* draw bigger door */
   DrawSpecialEditorDoor();
@@ -2320,23 +2320,23 @@ static void PickDrawingElement(int button, int element)
   if (button == 1)
   {
     new_element1 = element;
-    DrawMiniGraphicExt(drawto,
+    DrawNewMiniGraphicExt(drawto,
                       DX + ED_WIN_MB_LEFT_XPOS, DY + ED_WIN_MB_LEFT_YPOS,
-                      el2gfx(new_element1));
+                      el2img(new_element1));
   }
   else if (button == 2)
   {
     new_element2 = element;
-    DrawMiniGraphicExt(drawto,
+    DrawNewMiniGraphicExt(drawto,
                       DX + ED_WIN_MB_MIDDLE_XPOS, DY + ED_WIN_MB_MIDDLE_YPOS,
-                      el2gfx(new_element2));
+                      el2img(new_element2));
   }
   else
   {
     new_element3 = element;
-    DrawMiniGraphicExt(drawto,
+    DrawNewMiniGraphicExt(drawto,
                       DX + ED_WIN_MB_RIGHT_XPOS, DY + ED_WIN_MB_RIGHT_YPOS,
-                      el2gfx(new_element3));
+                      el2img(new_element3));
   }
 
   redraw_mask |= REDRAW_DOOR_1;
@@ -2350,7 +2350,7 @@ static void DrawDrawingWindow()
   AdjustLevelScrollPosition();
   AdjustEditorScrollbar(GADGET_ID_SCROLL_HORIZONTAL);
   AdjustEditorScrollbar(GADGET_ID_SCROLL_VERTICAL);
-  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+  DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
   MapMainDrawingArea();
 }
 
@@ -2367,7 +2367,7 @@ static void DrawRandomPlacementBackgroundArea()
   /* draw decorative border for the object */
   for (y=0; y<2; y++)
     for (x=0; x<2; x++)
-      DrawMiniElement(area_x + x, area_y + y, EL_SAND);
+      DrawNewMiniElement(area_x + x, area_y + y, EL_SAND);
 
   ClearRectangle(drawto,
                 area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1,
@@ -2378,7 +2378,7 @@ static void DrawRandomPlacementBackgroundArea()
             area_sx, area_sy, 3 * MINI_TILEX, 3 * MINI_TILEY,
             area_sx - MINI_TILEX/2, area_sy - MINI_TILEY/2);
 
-  DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
+  DrawNewMiniElement(area_x, area_y, ElementContent[0][0][0]);
 
   MapDrawingArea(GADGET_ID_RANDOM_BACKGROUND);
 }
@@ -2489,7 +2489,7 @@ static void DrawAmoebaContentArea()
   /* draw decorative border for the object */
   for (y=0; y<2; y++)
     for (x=0; x<2; x++)
-      DrawMiniElement(area_x + x, area_y + y, EL_SAND);
+      DrawNewMiniElement(area_x + x, area_y + y, EL_SAND);
 
   ClearRectangle(drawto,
                 area_sx + MINI_TILEX/2 - 1, area_sy + MINI_TILEY/2 - 1,
@@ -2503,7 +2503,7 @@ static void DrawAmoebaContentArea()
   DrawText(area_sx + TILEX, area_sy + 1, "Content of amoeba",
           FS_SMALL, font_color);
 
-  DrawMiniElement(area_x, area_y, ElementContent[0][0][0]);
+  DrawNewMiniElement(area_x, area_y, ElementContent[0][0][0]);
 
   MapDrawingArea(GADGET_ID_AMOEBA_CONTENT);
 }
@@ -2546,7 +2546,7 @@ static void DrawElementContentAreas()
   {
     for (y=0; y<4; y++)
       for (x=0; x<4; x++)
-       DrawMiniElement(area_x + 5 * (i % 4) + x, area_y + 6 * (i / 4) + y,
+       DrawNewMiniElement(area_x + 5 * (i % 4) + x, area_y + 6 * (i / 4) + y,
                        EL_SAND);
 
     ClearRectangle(drawto,
@@ -2571,7 +2571,7 @@ static void DrawElementContentAreas()
   {
     for (y=0; y<3; y++)
       for (x=0; x<3; x++)
-       DrawMiniElement(area_x + 5 * (i % 4) + x, area_y + 6 * (i / 4) + y,
+       DrawNewMiniElement(area_x + 5 * (i % 4) + x, area_y + 6 * (i / 4) + y,
                        ElementContent[i][x][y]);
 
     DrawTextF(area_sx - SX + 5 * (i % 4) * MINI_TILEX + MINI_TILEX + 1,
@@ -2666,7 +2666,7 @@ static void DrawPropertiesWindow()
   /* draw some decorative border for the object */
   for (y=0; y<3; y++)
     for (x=0; x<3; x++)
-      DrawMiniElement(xstart + x , ystart + y, EL_SAND);
+      DrawNewMiniElement(xstart + x , ystart + y, EL_SAND);
 
   ClearRectangle(drawto,
                 SX + xstart * MINI_TILEX + MINI_TILEX/2 - 1,
@@ -2681,7 +2681,7 @@ static void DrawPropertiesWindow()
             SX + xstart * MINI_TILEX - MINI_TILEX/2,
             SY + ystart * MINI_TILEY - MINI_TILEY/2);
 
-  DrawGraphic(xstart/2, ystart/2, el2gfx(properties_element));
+  DrawNewGraphic(xstart / 2, ystart / 2, el2img(properties_element), 0);
 
   /* copy the whole stuff to the definitive location */
   BlitBitmap(drawto, drawto,
@@ -2759,7 +2759,7 @@ static void DrawLineElement(int sx, int sy, int element, boolean change_level)
   int lx = sx + level_xpos;
   int ly = sy + level_ypos;
 
-  DrawMiniElement(sx, sy, (element < 0 ? Feld[lx][ly] : element));
+  DrawNewMiniElement(sx, sy, (element < 0 ? Feld[lx][ly] : element));
 
   if (change_level)
     Feld[lx][ly] = element;
@@ -3174,7 +3174,7 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
       break;
 
     case TEXT_SETCURSOR:
-      DrawMiniElement(last_sx, last_sy, Feld[lx][ly]);
+      DrawNewMiniElement(last_sx, last_sy, Feld[lx][ly]);
       DrawAreaBorder(sx, sy, sx, sy);
       last_sx = sx;
       last_sy = sy;
@@ -3199,7 +3199,7 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
       if (sx > start_sx)
       {
        Feld[lx - 1][ly] = delete_buffer[sx - start_sx - 1];
-       DrawMiniElement(sx - 1, sy, Feld[lx - 1][ly]);
+       DrawNewMiniElement(sx - 1, sy, Feld[lx - 1][ly]);
        DrawLevelText(sx - 1, sy, 0, TEXT_SETCURSOR);
       }
       break;
@@ -3213,7 +3213,7 @@ static int DrawLevelText(int sx, int sy, char letter, int mode)
 
     case TEXT_END:
       CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
-      DrawMiniElement(sx, sy, Feld[lx][ly]);
+      DrawNewMiniElement(sx, sy, Feld[lx][ly]);
       typing = FALSE;
       break;
 
@@ -3234,7 +3234,7 @@ static void SetTextCursor(int unused_sx, int unused_sy, int sx, int sy,
   int ly = sy + level_ypos;
 
   if (element == -1)
-    DrawMiniElement(sx, sy, Feld[lx][ly]);
+    DrawNewMiniElement(sx, sy, Feld[lx][ly]);
   else
     DrawAreaBorder(sx, sy, sx, sy);
 }
@@ -3279,7 +3279,7 @@ static void CopyLevelToUndoBuffer(int mode)
   last_border_element = BorderElement;
   SetBorderElement();
   if (BorderElement != last_border_element)
-    DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+    DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
 #if 0
 #ifdef DEBUG
@@ -3320,7 +3320,7 @@ static void RandomPlacement(int new_element)
       for (y=0; y<lev_fieldy; y++)
        Feld[x][y] = new_element;
 
-    DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+    DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
     CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
     return;
   }
@@ -3339,7 +3339,7 @@ static void RandomPlacement(int new_element)
     }
   }
 
-  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+  DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
   CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
 }
 
@@ -3358,7 +3358,7 @@ void WrapLevel(int dx, int dy)
       Feld[x][y] =
        FieldBackup[(x + wrap_dx) % lev_fieldx][(y + wrap_dy) % lev_fieldy];
 
-  DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+  DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
   CopyLevelToUndoBuffer(UNDO_ACCUMULATE);
 }
 
@@ -3458,7 +3458,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
                  Feld[x][y] = EL_EMPTY;
                  if (x - level_xpos >= 0 && x - level_xpos < ed_fieldx &&
                      y - level_ypos >= 0 && y - level_ypos < ed_fieldy)
-                   DrawMiniElement(x - level_xpos, y - level_ypos,
+                   DrawNewMiniElement(x - level_xpos, y - level_ypos,
                                    EL_EMPTY);
                }
              }
@@ -3466,19 +3466,19 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
          }
 
          Feld[lx][ly] = new_element;
-         DrawMiniElement(sx, sy, new_element);
+         DrawNewMiniElement(sx, sy, new_element);
        }
       }
       else
       {
-       DrawMiniGraphicExt(drawto,
+       DrawNewMiniGraphicExt(drawto,
                           gi->x + sx * MINI_TILEX,
                           gi->y + sy * MINI_TILEY,
-                          el2gfx(new_element));
-       DrawMiniGraphicExt(window,
+                          el2img(new_element));
+       DrawNewMiniGraphicExt(window,
                           gi->x + sx * MINI_TILEX,
                           gi->y + sy * MINI_TILEY,
-                          el2gfx(new_element));
+                          el2img(new_element));
 
        if (id == GADGET_ID_AMOEBA_CONTENT)
          level.amoeba_content = new_element;
@@ -3575,7 +3575,7 @@ static void HandleDrawingAreas(struct GadgetInfo *gi)
       if (button_press_event && Feld[lx][ly] != new_element)
       {
        FloodFill(lx, ly, new_element);
-       DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+       DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
        CopyLevelToUndoBuffer(UNDO_IMMEDIATE);
       }
       break;
@@ -3698,7 +3698,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        if (button == 1)
          ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_RIGHT);
        else
-         DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+         DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
        ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
                     GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
@@ -3717,7 +3717,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        if (button == 1)
          ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_LEFT);
        else
-         DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+         DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
        ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_HORIZONTAL],
                     GDI_SCROLLBAR_ITEM_POSITION, level_xpos + 1, GDI_END);
@@ -3736,7 +3736,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        if (button == 1)
          ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_DOWN);
        else
-         DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+         DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
        ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL],
                     GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
@@ -3755,7 +3755,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        if (button == 1)
          ScrollMiniLevel(level_xpos, level_ypos, ED_SCROLL_UP);
        else
-         DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+         DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
 
        ModifyGadget(level_editor_gadget[GADGET_ID_SCROLL_VERTICAL],
                     GDI_SCROLLBAR_ITEM_POSITION, level_ypos + 1, GDI_END);
@@ -3764,12 +3764,12 @@ static void HandleControlButtons(struct GadgetInfo *gi)
 
     case GADGET_ID_SCROLL_HORIZONTAL:
       level_xpos = gi->event.item_position - 1;
-      DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+      DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
       break;
 
     case GADGET_ID_SCROLL_VERTICAL:
       level_ypos = gi->event.item_position - 1;
-      DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+      DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
       break;
 
     case GADGET_ID_SCROLL_LIST_UP:
@@ -3800,7 +3800,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
        int element = editor_element[element_shift + i];
 
        UnmapGadget(gi);
-       getMiniGraphicSource(el2gfx(element), &gd->bitmap, &gd->x, &gd->y);
+       getNewMiniGraphicSource(el2img(element), &gd->bitmap, &gd->x, &gd->y);
        ModifyGadget(gi, GDI_INFO_TEXT, getElementInfoText(element), GDI_END);
        MapGadget(gi);
       }
@@ -3869,7 +3869,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
       for(x=0; x<lev_fieldx; x++)
        for(y=0; y<lev_fieldy; y++)
          Feld[x][y] = UndoBuffer[undo_buffer_position][x][y];
-      DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos,level_ypos);
+      DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos,level_ypos);
       break;
 
     case GADGET_ID_INFO:
@@ -3891,7 +3891,7 @@ static void HandleControlButtons(struct GadgetInfo *gi)
          Feld[x][y] = (button == 1 ? EL_EMPTY : new_element);
       CopyLevelToUndoBuffer(GADGET_ID_CLEAR);
 
-      DrawMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
+      DrawNewMiniLevel(ed_fieldx, ed_fieldy, level_xpos, level_ypos);
       break;
 
     case GADGET_ID_SAVE:

diff --git a/src/game.c b/src/game.c
index b82ede439a61eea86f45182870abb95d7f777524..d92acb70d86f7d3625a342cdaad72520f9a96a14 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -484,7 +484,7 @@ void DrawGameDoorValues()
   for (i=0; i<MAX_PLAYERS; i++)
     for (j=0; j<4; j++)
       if (stored_player[i].key[j])
-       DrawMiniGraphicExt(drawto, DX_KEYS + j * MINI_TILEX, DY_KEYS,
+       DrawNewMiniGraphicExt(drawto, DX_KEYS + j * MINI_TILEX, DY_KEYS,
                           GFX_SCHLUESSEL1 + j);
 
   DrawText(DX + XX_EMERALDS, DY + YY_EMERALDS,
@@ -6306,9 +6306,9 @@ int DigField(struct PlayerInfo *player,
       RemoveField(x, y);
       player->key[key_nr] = TRUE;
       RaiseScoreElement(element);
-      DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
+      DrawNewMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
                         GFX_SCHLUESSEL1 + key_nr);
-      DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
+      DrawNewMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
                         GFX_SCHLUESSEL1 + key_nr);
       PlaySoundLevel(x, y, SND_KEY_COLLECTING);
       break;
@@ -6324,9 +6324,9 @@ int DigField(struct PlayerInfo *player,
       RemoveField(x, y);
       player->key[key_nr] = TRUE;
       RaiseScoreElement(element);
-      DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
+      DrawNewMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
                         GFX_SCHLUESSEL1 + key_nr);
-      DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
+      DrawNewMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS,
                         GFX_SCHLUESSEL1 + key_nr);
       PlaySoundLevel(x, y, SND_KEY_COLLECTING);
       break;

diff --git a/src/init.c b/src/init.c
index 32b2cb8e3d6504c2f426e26ba65b554695b3c855..55cfd3a208824003d38d39726655a64003ee3774 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -109,9 +109,9 @@ void OpenAll(void)
 
   InitLevelInfo();
   InitLevelArtworkInfo();
-  InitGadgets();               /* needs to know number of level series */
   InitImages();                        /* needs to know current level directory */
   InitSound();                 /* needs to know current level directory */
+  InitGadgets();               /* needs images + number of level series */
 
   InitGfxBackground();
   InitToons();

diff --git a/src/libgame/text.c b/src/libgame/text.c
index a31c80f2881fe7bcfb2275fb81326b246e7be3bd..9c2529bcd886ba259b41379bd1f15ddaaf67e830 100644 (file)
--- a/src/libgame/text.c
+++ b/src/libgame/text.c
@@ -108,7 +108,7 @@ void DrawTextExt(DrawBuffer *bitmap, int x, int y,
                 char *text, int font_size, int font_type)
 {
   Bitmap *font_bitmap;
-  int font_width, font_height, font_start;
+  int font_width, font_height, font_starty;
   boolean print_inverse = FALSE;
 
   if (font_size != FS_SMALL && font_size != FS_BIG && font_size != FS_MEDIUM)
@@ -126,15 +126,15 @@ void DrawTextExt(DrawBuffer *bitmap, int x, int y,
                 font.bitmap_small);
 
   if (font_type == FC_SPECIAL2)
-    font_start = (font_size == FS_BIG ? 0 : FONT1_YSIZE) * FONT_LINES_PER_FONT;
+    font_starty = (font_size == FS_BIG ? 0 : FONT1_YSIZE) * 5;
   else
-    font_start = (font_type * (font_size == FS_BIG ? FONT1_YSIZE :
-                              font_size == FS_MEDIUM ? FONT6_YSIZE :
-                              FONT2_YSIZE) *
-                 FONT_LINES_PER_FONT);
+    font_starty = (font_type * (font_size == FS_BIG ? FONT1_YSIZE :
+                               font_size == FS_MEDIUM ? FONT6_YSIZE :
+                               FONT2_YSIZE) *
+                  FONT_LINES_PER_FONT);
 
   if (font_type == FC_SPECIAL3)
-    font_start -= FONT2_YSIZE * FONT_LINES_PER_FONT;
+    font_starty -= FONT2_YSIZE * FONT_LINES_PER_FONT;
 
   while (*text)
   {
@@ -162,20 +162,28 @@ void DrawTextExt(DrawBuffer *bitmap, int x, int y,
     if ((c >= 32 && c <= 95) || c == '°' || c == '´')
     {
       int src_x = ((c - 32) % FONT_CHARS_PER_LINE) * font_width;
-      int src_y = ((c - 32) / FONT_CHARS_PER_LINE) * font_height + font_start;
+      int src_y = ((c - 32) / FONT_CHARS_PER_LINE) * font_height + font_starty;
       int dest_x = x, dest_y = y;
 
       if (c == '°' || c == '´')                /* map '°' and 'TM' signs */
       {
-       src_x = FONT_CHARS_PER_LINE * font_width;
-       src_y = (c == '°' ? 1 : 2) * font_height + font_start;
+       if (font_type == FC_SPECIAL2)
+       {
+         src_x = (c == '°' ? 1 : 2) * font_width;
+         src_y = 4 * font_height;
+       }
+       else
+       {
+         src_x = FONT_CHARS_PER_LINE * font_width;
+         src_y = (c == '°' ? 1 : 2) * font_height + font_starty;
+       }
       }
 
       if (print_inverse)
       {
        BlitBitmap(font_bitmap, bitmap,
                   FONT_CHARS_PER_LINE * font_width,
-                  3 * font_height + font_start,
+                  3 * font_height + font_starty,
                   font_width, font_height, x, y);
 
        SetClipOrigin(font_bitmap, font_bitmap->stored_clip_gc,

diff --git a/src/main.h b/src/main.h
index 7b82f5e3a138adc4801cf5273e064a22b90fad14..458c7e188ffbceec80a2506a81265b56a2f2fa80 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -255,9 +255,9 @@
 #define MICRO_GFX_PER_LINE     16
 
 #define MINI_FONT_STARTX       0
-#define MINI_FONT_STARTY       128
-#define MICRO_FONT_STARTX      408
-#define MICRO_FONT_STARTY      128
+#define MINI_FONT_STARTY       160
+#define MICRO_FONT_STARTX      384
+#define MICRO_FONT_STARTY      160
 
 #define HEROES_PER_LINE                16
 

diff --git a/src/tools.c b/src/tools.c
index c8f9e5d2dd7f9ac1861ade040d05cd2a66a394de..eba90f7076c043aca03039fa62c779e27f932728 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -1008,8 +1008,16 @@ void DrawNewGraphicThruMaskExt(DrawBuffer *d, int dest_x, int dest_y,
 
 void DrawMiniGraphic(int x, int y, int graphic)
 {
-  DrawMiniGraphicExt(drawto, SX + x*MINI_TILEX, SY + y*MINI_TILEY, graphic);
-  MarkTileDirty(x/2, y/2);
+  DrawMiniGraphicExt(drawto,
+                    SX + x * MINI_TILEX, SY + y * MINI_TILEY, graphic);
+  MarkTileDirty(x / 2, y / 2);
+}
+
+void DrawNewMiniGraphic(int x, int y, int graphic)
+{
+  DrawNewMiniGraphicExt(drawto,
+                       SX + x * MINI_TILEX, SY + y * MINI_TILEY, graphic);
+  MarkTileDirty(x / 2, y / 2);
 }
 
 void getMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
@@ -1057,6 +1065,19 @@ void getMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
   }
 }
 
+void getNewMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
+{
+  Bitmap *src_bitmap = new_graphic_info[graphic].bitmap;
+  int mini_startx = 0;
+  int mini_starty = src_bitmap->height * 2 / 3;
+  int src_x = mini_startx + new_graphic_info[graphic].src_x / 2;
+  int src_y = mini_starty + new_graphic_info[graphic].src_y / 2;
+
+  *bitmap = src_bitmap;
+  *x = src_x;
+  *y = src_y;
+}
+
 void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic)
 {
   Bitmap *bitmap;
@@ -1066,6 +1087,24 @@ void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic)
   BlitBitmap(bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, x, y);
 }
 
+void DrawNewMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic)
+{
+#if 1
+  Bitmap *src_bitmap;
+  int src_x, src_y;
+
+  getNewMiniGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+#else
+  Bitmap *src_bitmap = new_graphic_info[graphic].bitmap;
+  int mini_startx = src_bitmap->width  * 2 / 3;
+  int mini_starty = src_bitmap->height * 2 / 3;
+  int src_x = mini_startx + new_graphic_info[graphic].src_x / 2;
+  int src_y = mini_starty + new_graphic_info[graphic].src_y / 2;
+#endif
+
+  BlitBitmap(src_bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, x, y);
+}
+
 void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic,
                        int cut_mode, int mask_mode)
 {
@@ -2025,6 +2064,22 @@ void DrawMiniElement(int x, int y, int element)
   DrawMiniGraphic(x, y, graphic);
 }
 
+void DrawNewMiniElement(int x, int y, int element)
+{
+  int graphic;
+
+#if 0
+  if (!element)
+  {
+    DrawNewMiniGraphic(x, y, -1);
+    return;
+  }
+#endif
+
+  graphic = el2img(element);
+  DrawNewMiniGraphic(x, y, graphic);
+}
+
 void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
 {
   int x = sx + scroll_x, y = sy + scroll_y;
@@ -2059,6 +2114,40 @@ void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
   }
 }
 
+void DrawNewMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y)
+{
+  int x = sx + scroll_x, y = sy + scroll_y;
+
+  if (x < -1 || x > lev_fieldx || y < -1 || y > lev_fieldy)
+    DrawNewMiniElement(sx, sy, EL_EMPTY);
+  else if (x > -1 && x < lev_fieldx && y > -1 && y < lev_fieldy)
+    DrawNewMiniElement(sx, sy, Feld[x][y]);
+  else
+  {
+    int steel_type, steel_position;
+    int border[6][2] =
+    {
+      { IMG_STEELWALL_TOPLEFT,         IMG_INVISIBLE_STEELWALL_TOPLEFT     },
+      { IMG_STEELWALL_TOPRIGHT,                IMG_INVISIBLE_STEELWALL_TOPRIGHT    },
+      { IMG_STEELWALL_BOTTOMLEFT,      IMG_INVISIBLE_STEELWALL_BOTTOMLEFT  },
+      { IMG_STEELWALL_BOTTOMRIGHT,     IMG_INVISIBLE_STEELWALL_BOTTOMRIGHT },
+      { IMG_STEELWALL_VERTICAL,                IMG_INVISIBLE_STEELWALL_VERTICAL    },
+      { IMG_STEELWALL_HORIZONTAL,      IMG_INVISIBLE_STEELWALL_HORIZONTAL  }
+    };
+
+    steel_type = (BorderElement == EL_STEELWALL ? 0 : 1);
+    steel_position = (x == -1 && y == -1                       ? 0 :
+                     x == lev_fieldx && y == -1                ? 1 :
+                     x == -1 && y == lev_fieldy                ? 2 :
+                     x == lev_fieldx && y == lev_fieldy        ? 3 :
+                     x == -1 || x == lev_fieldx                ? 4 :
+                     y == -1 || y == lev_fieldy                ? 5 : -1);
+
+    if (steel_position != -1)
+      DrawNewMiniGraphic(sx, sy, border[steel_position][steel_type]);
+  }
+}
+
 void DrawMicroElement(int xpos, int ypos, int element)
 {
   int graphic;
@@ -2131,6 +2220,17 @@ void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y)
   redraw_mask |= REDRAW_FIELD;
 }
 
+void DrawNewMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y)
+{
+  int x,y;
+
+  for(x=0; x<size_x; x++)
+    for(y=0; y<size_y; y++)
+      DrawNewMiniElementOrWall(x, y, scroll_x, scroll_y);
+
+  redraw_mask |= REDRAW_FIELD;
+}
+
 static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y)
 {
   int x, y;
@@ -3293,6 +3393,12 @@ int el2img(int element)
 #if 1
   int graphic_NEW = element_info[element].graphic[GFX_ACTION_DEFAULT];
 
+#if DEBUG
+  if (graphic_NEW < 0)
+    Error(ERR_WARN, "element %d -> graphic %d -- probably crashing now...",
+         element, graphic_NEW);
+#endif
+
   return graphic_NEW;
 #else
 

diff --git a/src/tools.h b/src/tools.h
index 33f43c8c786ec220a33df38bc9998732f0888fdd..96b27e416d4ec99cfc1d257ab11634aa3ececae2 100644 (file)
--- a/src/tools.h
+++ b/src/tools.h
@@ -85,8 +85,11 @@ void DrawNewGraphicThruMask(int, int, int, int);
 void DrawGraphicThruMaskExt(DrawBuffer *, int, int, int);
 void DrawNewGraphicThruMaskExt(DrawBuffer *, int, int, int, int);
 void DrawMiniGraphic(int, int, int);
+void DrawNewMiniGraphic(int, int, int);
 void getMiniGraphicSource(int, Bitmap **, int *, int *);
+void getNewMiniGraphicSource(int, Bitmap **, int *, int *);
 void DrawMiniGraphicExt(DrawBuffer *, int, int, int);
+void DrawNewMiniGraphicExt(DrawBuffer *, int, int, int);
 void DrawGraphicShifted(int, int, int, int, int, int, int);
 void DrawNewGraphicShifted(int, int, int, int, int, int, int, int);
 void DrawGraphicShiftedThruMask(int, int, int, int, int, int);
@@ -115,10 +118,13 @@ void DrawNewScreenField(int, int);
 void DrawLevelField(int, int);
 void DrawNewLevelField(int, int);
 void DrawMiniElement(int, int, int);
+void DrawNewMiniElement(int, int, int);
 void DrawMiniElementOrWall(int, int, int, int);
+void DrawNewMiniElementOrWall(int, int, int, int);
 void DrawMicroElement(int, int, int);
 void DrawLevel(void);
 void DrawMiniLevel(int, int, int, int);
+void DrawNewMiniLevel(int, int, int, int);
 void DrawMicroLevel(int, int, boolean);
 boolean Request(char *, unsigned int);
 unsigned int OpenDoor(unsigned int);