projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed version number references for changes since version 4.2.0.0
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 1e77ca470bac29a2fb1da646ca27480fc3ef0540..2b43180b42f937d8bb27bf2fb4d4ceea0b6cb754 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-4,7
+4,7
@@
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
// (c) 1995-2014 by Artsoft Entertainment
// Holger Schemel
// info@artsoft.org
-// http://www.artsoft.org/
+// http
s
://www.artsoft.org/
// ----------------------------------------------------------------------------
// init.c
// ============================================================================
// ----------------------------------------------------------------------------
// init.c
// ============================================================================
@@
-77,6
+77,11
@@
static int copy_properties[][5] =
EL_MOLE_LEFT, EL_MOLE_RIGHT,
EL_MOLE_UP, EL_MOLE_DOWN
},
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
{
-1,
-1, -1, -1, -1
@@
-280,6
+285,12
@@
void InitImageTextures(void)
IMG_GFX_REQUEST_BUTTON_TOUCH_YES,
IMG_GFX_REQUEST_BUTTON_TOUCH_NO,
IMG_GFX_REQUEST_BUTTON_TOUCH_CONFIRM,
IMG_GFX_REQUEST_BUTTON_TOUCH_YES,
IMG_GFX_REQUEST_BUTTON_TOUCH_NO,
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;
-1
};
int i, j, k;
@@
-312,23
+323,6
@@
void InitImageTextures(void)
CreateImageTextures(texture_graphics[i]);
}
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;
static int getFontBitmapID(int font_nr)
{
int special = -1;
@@
-2368,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_SP_ELECTRON, 15 },
{ EL_BALLOON, 16 },
{ EL_SPRING, 17 },
+ { EL_SPRING_LEFT, 17 },
+ { EL_SPRING_RIGHT, 17 },
{ EL_EMC_ANDROID, 18 },
{ -1, -1 },
{ EL_EMC_ANDROID, 18 },
{ -1, -1 },
@@
-2873,6
+2869,7
@@
void InitElementPropertiesStatic(void)
EL_BOMB,
EL_NUT,
EL_AMOEBA_DROP,
EL_BOMB,
EL_NUT,
EL_AMOEBA_DROP,
+ EL_AMOEBA_DROPPING,
EL_QUICKSAND_FULL,
EL_QUICKSAND_FAST_FULL,
EL_MAGIC_WALL_FULL,
EL_QUICKSAND_FULL,
EL_QUICKSAND_FAST_FULL,
EL_MAGIC_WALL_FULL,
@@
-5919,6
+5916,7
@@
void ReloadCustomArtwork(int force_reload)
InitOverrideArtwork();
force_reload_gfx |= AdjustGraphicsForEMC();
InitOverrideArtwork();
force_reload_gfx |= AdjustGraphicsForEMC();
+ force_reload_snd |= AdjustSoundsForEMC();
gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);
gfx_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_GRAPHICS);
snd_new_identifier = getNewArtworkIdentifier(ARTWORK_TYPE_SOUNDS);