projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added check for OpenGL renderer when trying to change vsync mode
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 272cc8b97bffa317c8c41ec1d0005a540a99798f..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
@@
-2357,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 },
@@
-2862,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,
@@
-5908,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);