X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=708b7dd70c74377d84096b035bf3e9549aa79e67;hb=c96a3788bfff5c87355451700389df7a83a8a9fb;hp=a820bf62d8d381f273a4df6f3468c8f6a06a6bc8;hpb=93c8731e8f90c740a393896cdbff237068cd49a5;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index a820bf62..708b7dd7 100644
--- a/src/init.c
+++ b/src/init.c
@@ -77,6 +77,11 @@ static int copy_properties[][5] =
     EL_MOLE_LEFT,		EL_MOLE_RIGHT,
     EL_MOLE_UP,			EL_MOLE_DOWN
   },
+  {
+    EL_SPRING,
+    EL_SPRING_LEFT,		EL_SPRING_RIGHT,
+    EL_SPRING_LEFT,		EL_SPRING_RIGHT,	// (to match array size)
+  },
   {
     -1,
     -1, -1, -1, -1
@@ -282,6 +287,10 @@ void InitImageTextures(void)
     IMG_GFX_REQUEST_BUTTON_TOUCH_CONFIRM,
     IMG_GFX_GAME_BUTTON_TOUCH_STOP,
     IMG_GFX_GAME_BUTTON_TOUCH_PAUSE,
+    IMG_MENU_BUTTON_TOUCH_BACK,
+    IMG_MENU_BUTTON_TOUCH_NEXT,
+    IMG_MENU_BUTTON_TOUCH_BACK2,
+    IMG_MENU_BUTTON_TOUCH_NEXT2,
     -1
   };
   int i, j, k;
@@ -314,23 +323,6 @@ void InitImageTextures(void)
     CreateImageTextures(texture_graphics[i]);
 }
 
-#if 1
-// !!! FIX THIS (CHANGE TO USING NORMAL ELEMENT GRAPHIC DEFINITIONS) !!!
-void SetBitmaps_EM(Bitmap **em_bitmap)
-{
-  em_bitmap[0] = graphic_info[IMG_EMC_OBJECT].bitmap;
-  em_bitmap[1] = graphic_info[IMG_EMC_SPRITE].bitmap;
-}
-#endif
-
-#if 0
-// !!! FIX THIS (CHANGE TO USING NORMAL ELEMENT GRAPHIC DEFINITIONS) !!!
-void SetBitmaps_SP(Bitmap **sp_bitmap)
-{
-  *sp_bitmap = graphic_info[IMG_SP_OBJECTS].bitmap;
-}
-#endif
-
 static int getFontBitmapID(int font_nr)
 {
   int special = -1;
@@ -2370,6 +2362,8 @@ static int get_special_property_bit(int element, int property_bit_nr)
     { EL_SP_ELECTRON,		15	},
     { EL_BALLOON,		16	},
     { EL_SPRING,	        17	},
+    { EL_SPRING_LEFT,	        17	},
+    { EL_SPRING_RIGHT,	        17	},
     { EL_EMC_ANDROID,	        18	},
 
     { -1,			-1	},
@@ -2875,6 +2869,7 @@ void InitElementPropertiesStatic(void)
     EL_BOMB,
     EL_NUT,
     EL_AMOEBA_DROP,
+    EL_AMOEBA_DROPPING,
     EL_QUICKSAND_FULL,
     EL_QUICKSAND_FAST_FULL,
     EL_MAGIC_WALL_FULL,
@@ -5921,6 +5916,7 @@ void ReloadCustomArtwork(int force_reload)
   InitOverrideArtwork();
 
   force_reload_gfx |= AdjustGraphicsForEMC();
+  force_reload_snd |= AdjustSoundsForEMC();
 
   gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
   snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);