X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=684cdb4d5155beb501d7f40bec251dd051e6418c;hb=6b83db8bee17d70c4e89dc3e3b703b7032aa5f27;hp=634542b53c5a41063f191a631b713719f432fe56;hpb=f941ccddee3065d7531298e37ad4dcfcd892c1f8;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 634542b5..684cdb4d 100644
--- a/src/init.c
+++ b/src/init.c
@@ -528,6 +528,15 @@ void InitGfx()
     { GFX_SPIELER4_RIGHT, 4 },
     { GFX_SPIELER4_PUSH_LEFT, 4 },
     { GFX_SPIELER4_PUSH_RIGHT, 4 },
+    { GFX_SP_MURPHY, 1 },
+    { GFX_MURPHY_GO_LEFT, 3 },
+    { GFX_MURPHY_GO_RIGHT, 3 },
+    { GFX_MURPHY_SNAP_UP, 1 },
+    { GFX_MURPHY_SNAP_DOWN, 1 },
+    { GFX_MURPHY_SNAP_RIGHT, 1 },
+    { GFX_MURPHY_SNAP_LEFT, 1 },
+    { GFX_MURPHY_PUSH_RIGHT, 1 },
+    { GFX_MURPHY_PUSH_LEFT, 1 },
     { GFX_GEBLUBBER, 4 },
     { GFX_DYNAMIT, 7 },
     { GFX_DYNABOMB, 4 },
@@ -593,6 +602,7 @@ void InitGfx()
       int src_x, src_y;
       Pixmap src_pixmap;
 
+#if 0
       if (graphic >= GFX_START_ROCKSSCREEN &&
 	  graphic <= GFX_END_ROCKSSCREEN)
       {
@@ -620,6 +630,14 @@ void InitGfx()
       }
       else
 	break;
+#else
+
+      int pixmap_nr;
+
+      getGraphicSource(graphic, &pixmap_nr, &src_x, &src_y);
+      src_pixmap = clipmask[pixmap_nr];
+
+#endif
 
       tile_clipmask[tile] = XCreatePixmap(display, window, TILEX,TILEY, 1);
 
@@ -799,6 +817,7 @@ void InitGadgets()
   CreateLevelEditorGadgets();
   CreateGameButtons();
   CreateTapeButtons();
+  CreateToolButtons();
 }
 
 void InitElementProperties()