projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030717-1-src
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 6d32cd3b46158d149470e58a04e890ffd37a147e..839551baf35d51968493d295071366a34d2f2220 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-645,7
+645,7
@@
static void set_graphic_parameters(int graphic, char **parameter_raw)
anim_frames_per_col = src_bitmap->height / graphic_info[graphic].height;
}
anim_frames_per_col = src_bitmap->height / graphic_info[graphic].height;
}
- /* correct x or y offset depend
a
nt of vertical or horizontal frame order */
+ /* correct x or y offset depend
e
nt of vertical or horizontal frame order */
if (parameter[GFX_ARG_VERTICAL]) /* frames are ordered vertically */
{
graphic_info[graphic].offset_y =
if (parameter[GFX_ARG_VERTICAL]) /* frames are ordered vertically */
{
graphic_info[graphic].offset_y =
@@
-966,8
+966,10
@@
static void set_sound_parameters(int sound, char **parameter_raw)
static void InitSoundInfo()
{
static void InitSoundInfo()
{
+#if 0
struct PropertyMapping *property_mapping = getSoundListPropertyMapping();
int num_property_mappings = getSoundListPropertyMappingSize();
struct PropertyMapping *property_mapping = getSoundListPropertyMapping();
int num_property_mappings = getSoundListPropertyMappingSize();
+#endif
int *sound_effect_properties;
int num_sounds = getSoundListSize();
int i, j;
int *sound_effect_properties;
int num_sounds = getSoundListSize();
int i, j;
@@
-1033,6
+1035,8
@@
static void InitSoundInfo()
free(sound_effect_properties);
free(sound_effect_properties);
+#if 0
+ /* !!! now handled in InitElementSoundInfo() !!! */
/* initialize element/sound mapping from dynamic configuration */
for (i=0; i < num_property_mappings; i++)
{
/* initialize element/sound mapping from dynamic configuration */
for (i=0; i < num_property_mappings; i++)
{
@@
-1043,8
+1047,12
@@
static void InitSoundInfo()
if (action < 0)
action = ACTION_DEFAULT;
if (action < 0)
action = ACTION_DEFAULT;
+ printf("::: %d: %d, %d, %d ['%s']\n",
+ i, element, action, sound, element_info[element].token_name);
+
element_info[element].sound[action] = sound;
}
element_info[element].sound[action] = sound;
}
+#endif
#if 0
/* TEST ONLY */
#if 0
/* TEST ONLY */
@@
-1526,6
+1534,9
@@
void InitElementPropertiesStatic()
EL_GATE_2_GRAY,
EL_GATE_3_GRAY,
EL_GATE_4_GRAY,
EL_GATE_2_GRAY,
EL_GATE_3_GRAY,
EL_GATE_4_GRAY,
+ EL_PENGUIN,
+ EL_PIG,
+ EL_DRAGON,
-1
};
-1
};
@@
-2243,7
+2254,9
@@
void InitElementPropertiesStatic()
EL_DYNABOMB_INCREASE_NUMBER,
EL_DYNABOMB_INCREASE_SIZE,
EL_DYNABOMB_INCREASE_POWER,
EL_DYNABOMB_INCREASE_NUMBER,
EL_DYNABOMB_INCREASE_SIZE,
EL_DYNABOMB_INCREASE_POWER,
+#if 0
EL_SOKOBAN_OBJECT,
EL_SOKOBAN_OBJECT,
+#endif
EL_SOKOBAN_FIELD_EMPTY,
EL_SOKOBAN_FIELD_FULL,
EL_WALL_EMERALD_RED,
EL_SOKOBAN_FIELD_EMPTY,
EL_SOKOBAN_FIELD_FULL,
EL_WALL_EMERALD_RED,
@@
-2273,7
+2286,9
@@
void InitElementPropertiesStatic()
EL_SP_PORT_VERTICAL,
EL_SP_PORT_ANY,
EL_SP_DISK_RED,
EL_SP_PORT_VERTICAL,
EL_SP_PORT_ANY,
EL_SP_DISK_RED,
+#if 0
EL_SP_DISK_YELLOW,
EL_SP_DISK_YELLOW,
+#endif
EL_SP_CHIP_SINGLE,
EL_SP_CHIP_LEFT,
EL_SP_CHIP_RIGHT,
EL_SP_CHIP_SINGLE,
EL_SP_CHIP_LEFT,
EL_SP_CHIP_RIGHT,
@@
-2514,7
+2529,7
@@
void InitElementPropertiesEngine(int engine_version)
InitElementPropertiesStatic();
#endif
InitElementPropertiesStatic();
#endif
- /* set all special, combined or engine depend
a
nt element properties */
+ /* set all special, combined or engine depend
e
nt element properties */
for (i=0; i < MAX_NUM_ELEMENTS; i++)
{
#if 0
for (i=0; i < MAX_NUM_ELEMENTS; i++)
{
#if 0
@@
-2742,7
+2757,7
@@
void Execute_Command(char *command)
if (access(filename, F_OK) != 0)
Error(ERR_EXIT, "cannot open file '%s'", filename);
if (access(filename, F_OK) != 0)
Error(ERR_EXIT, "cannot open file '%s'", filename);
- LoadLevelFromFilename(filename);
+ LoadLevelFromFilename(
&level,
filename);
DumpLevel(&level);
exit(0);
DumpLevel(&level);
exit(0);
@@
-3126,7
+3141,7
@@
void ReloadCustomArtwork()
/* custom level artwork configured in level series configuration file
always overrides custom level artwork stored in level series directory
/* custom level artwork configured in level series configuration file
always overrides custom level artwork stored in level series directory
- and (level independ
a
nt) custom artwork configured in setup menue */
+ and (level independ
e
nt) custom artwork configured in setup menue */
if (leveldir_current->graphics_set != NULL)
gfx_new_identifier = leveldir_current->graphics_set;
if (leveldir_current->sounds_set != NULL)
if (leveldir_current->graphics_set != NULL)
gfx_new_identifier = leveldir_current->graphics_set;
if (leveldir_current->sounds_set != NULL)
@@
-3291,7
+3306,7
@@
void CloseAllAndExit(int exit_value)
FreeTileClipmasks();
CloseVideoDisplay();
FreeTileClipmasks();
CloseVideoDisplay();
- ClosePlatformDepend
a
ntStuff();
+ ClosePlatformDepend
e
ntStuff();
exit(exit_value);
}
exit(exit_value);
}