projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed redrawing element corners left and right from laser in MM engine
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 926ce926d71ff247a157b8ad9a47c381cc28e490..6a4c5f62623e4654fcd5441204bae12b8afc3771 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-921,6
+921,16
@@
static struct LevelFileConfigInfo chunk_config_ELEM[] =
&li.mm_ball_content, EL_EMPTY, NULL,
&li.num_mm_ball_contents, 8, MAX_MM_BALL_CONTENTS
},
&li.mm_ball_content, EL_EMPTY, NULL,
&li.num_mm_ball_contents, 8, MAX_MM_BALL_CONTENTS
},
+ {
+ EL_MM_GRAY_BALL, -1,
+ TYPE_BOOLEAN, CONF_VALUE_8_BIT(1),
+ &li.rotate_mm_ball_content, TRUE
+ },
+ {
+ EL_MM_GRAY_BALL, -1,
+ TYPE_BOOLEAN, CONF_VALUE_8_BIT(2),
+ &li.explode_mm_ball, FALSE
+ },
{
EL_MM_STEEL_BLOCK, -1,
{
EL_MM_STEEL_BLOCK, -1,
@@
-4161,9
+4171,13
@@
static void CopyNativeLevel_RND_to_MM(struct LevelInfo *level)
level_mm->kettles_needed = level->gems_needed;
level_mm->auto_count_kettles = level->auto_count_gems;
level_mm->kettles_needed = level->gems_needed;
level_mm->auto_count_kettles = level->auto_count_gems;
- level_mm->laser_red = level->mm_laser_red;
- level_mm->laser_green = level->mm_laser_green;
- level_mm->laser_blue = level->mm_laser_blue;
+ level_mm->mm_laser_red = level->mm_laser_red;
+ level_mm->mm_laser_green = level->mm_laser_green;
+ level_mm->mm_laser_blue = level->mm_laser_blue;
+
+ level_mm->df_laser_red = level->df_laser_red;
+ level_mm->df_laser_green = level->df_laser_green;
+ level_mm->df_laser_blue = level->df_laser_blue;
strcpy(level_mm->name, level->name);
strcpy(level_mm->author, level->author);
strcpy(level_mm->name, level->name);
strcpy(level_mm->author, level->author);
@@
-4182,6
+4196,8
@@
static void CopyNativeLevel_RND_to_MM(struct LevelInfo *level)
level_mm->num_ball_contents = level->num_mm_ball_contents;
level_mm->ball_choice_mode = level->mm_ball_choice_mode;
level_mm->num_ball_contents = level->num_mm_ball_contents;
level_mm->ball_choice_mode = level->mm_ball_choice_mode;
+ level_mm->rotate_ball_content = level->rotate_mm_ball_content;
+ level_mm->explode_ball = level->explode_mm_ball;
for (i = 0; i < level->num_mm_ball_contents; i++)
level_mm->ball_content[i] =
for (i = 0; i < level->num_mm_ball_contents; i++)
level_mm->ball_content[i] =
@@
-4205,9
+4221,13
@@
static void CopyNativeLevel_MM_to_RND(struct LevelInfo *level)
level->gems_needed = level_mm->kettles_needed;
level->auto_count_gems = level_mm->auto_count_kettles;
level->gems_needed = level_mm->kettles_needed;
level->auto_count_gems = level_mm->auto_count_kettles;
- level->mm_laser_red = level_mm->laser_red;
- level->mm_laser_green = level_mm->laser_green;
- level->mm_laser_blue = level_mm->laser_blue;
+ level->mm_laser_red = level_mm->mm_laser_red;
+ level->mm_laser_green = level_mm->mm_laser_green;
+ level->mm_laser_blue = level_mm->mm_laser_blue;
+
+ level->df_laser_red = level_mm->df_laser_red;
+ level->df_laser_green = level_mm->df_laser_green;
+ level->df_laser_blue = level_mm->df_laser_blue;
strcpy(level->name, level_mm->name);
strcpy(level->name, level_mm->name);
@@
-4229,6
+4249,8
@@
static void CopyNativeLevel_MM_to_RND(struct LevelInfo *level)
level->num_mm_ball_contents = level_mm->num_ball_contents;
level->mm_ball_choice_mode = level_mm->ball_choice_mode;
level->num_mm_ball_contents = level_mm->num_ball_contents;
level->mm_ball_choice_mode = level_mm->ball_choice_mode;
+ level->rotate_mm_ball_content = level_mm->rotate_ball_content;
+ level->explode_mm_ball = level_mm->explode_ball;
for (i = 0; i < level->num_mm_ball_contents; i++)
level->mm_ball_content[i] =
for (i = 0; i < level->num_mm_ball_contents; i++)
level->mm_ball_content[i] =
@@
-10363,6
+10385,14
@@
static struct TokenInfo options_setup_tokens[] =
TYPE_BOOLEAN,
&setup.options.verbose, "options.verbose"
},
TYPE_BOOLEAN,
&setup.options.verbose, "options.verbose"
},
+ {
+ TYPE_BOOLEAN,
+ &setup.options.debug, "options.debug"
+ },
+ {
+ TYPE_STRING,
+ &setup.options.debug_mode, "options.debug_mode"
+ },
};
static void setSetupInfoToDefaults(struct SetupInfo *si)
};
static void setSetupInfoToDefaults(struct SetupInfo *si)
@@
-10634,6
+10664,8
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->debug.xsn_percent = 0;
si->options.verbose = FALSE;
si->debug.xsn_percent = 0;
si->options.verbose = FALSE;
+ si->options.debug = FALSE;
+ si->options.debug_mode = getStringCopy(ARG_UNDEFINED_STRING);
#if defined(PLATFORM_ANDROID)
si->fullscreen = TRUE;
#if defined(PLATFORM_ANDROID)
si->fullscreen = TRUE;
@@
-12903,7
+12935,7
@@
static boolean sound_info_listed(struct MusicFileInfo *list, char *basename)
void LoadMusicInfo(void)
{
void LoadMusicInfo(void)
{
- char *music_directory = getCustomMusicDirectory();
+ char *music_directory = getCustomMusicDirectory
_NoConf
();
int num_music = getMusicListSize();
int num_music_noconf = 0;
int num_sounds = getSoundListSize();
int num_music = getMusicListSize();
int num_music_noconf = 0;
int num_sounds = getSoundListSize();