projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100608-1-src
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 9f92ad68cb84300f0e09883ac808a6803a4b153a..349d2d52806c2bcec427e55733f4e06a941e947b 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-6551,7
+6551,7
@@
static void LoadLevelFromFileInfo_SB(struct LevelInfo *level,
boolean load_xsb_to_ces = check_special_flags("load_xsb_to_ces");
int file_level_nr = 0;
int line_nr = 0;
boolean load_xsb_to_ces = check_special_flags("load_xsb_to_ces");
int file_level_nr = 0;
int line_nr = 0;
- int x
, y;
+ int x
= 0, y = 0; /* initialized to make compilers happy */
#if 0
printf("::: looking for level number %d [%d]\n",
#if 0
printf("::: looking for level number %d [%d]\n",
@@
-9067,8
+9067,12
@@
void SaveScore(int nr)
#define SETUP_TOKEN_SHORTCUT_SOUND_SIMPLE 13
#define SETUP_TOKEN_SHORTCUT_SOUND_LOOPS 14
#define SETUP_TOKEN_SHORTCUT_SOUND_MUSIC 15
#define SETUP_TOKEN_SHORTCUT_SOUND_SIMPLE 13
#define SETUP_TOKEN_SHORTCUT_SOUND_LOOPS 14
#define SETUP_TOKEN_SHORTCUT_SOUND_MUSIC 15
+#define SETUP_TOKEN_SHORTCUT_SNAP_LEFT 16
+#define SETUP_TOKEN_SHORTCUT_SNAP_RIGHT 17
+#define SETUP_TOKEN_SHORTCUT_SNAP_UP 18
+#define SETUP_TOKEN_SHORTCUT_SNAP_DOWN 19
-#define NUM_SHORTCUT_SETUP_TOKENS
16
+#define NUM_SHORTCUT_SETUP_TOKENS
20
/* player setup */
#define SETUP_TOKEN_PLAYER_USE_JOYSTICK 0
/* player setup */
#define SETUP_TOKEN_PLAYER_USE_JOYSTICK 0
@@
-9221,6
+9225,10
@@
static struct TokenInfo shortcut_setup_tokens[] =
{ TYPE_KEY_X11, &ssi.sound_simple, "shortcut.sound_simple" },
{ TYPE_KEY_X11, &ssi.sound_loops, "shortcut.sound_loops" },
{ TYPE_KEY_X11, &ssi.sound_music, "shortcut.sound_music" },
{ TYPE_KEY_X11, &ssi.sound_simple, "shortcut.sound_simple" },
{ TYPE_KEY_X11, &ssi.sound_loops, "shortcut.sound_loops" },
{ TYPE_KEY_X11, &ssi.sound_music, "shortcut.sound_music" },
+ { TYPE_KEY_X11, &ssi.snap_left, "shortcut.snap_left" },
+ { TYPE_KEY_X11, &ssi.snap_right, "shortcut.snap_right" },
+ { TYPE_KEY_X11, &ssi.snap_up, "shortcut.snap_up" },
+ { TYPE_KEY_X11, &ssi.snap_down, "shortcut.snap_down" },
};
static struct TokenInfo player_setup_tokens[] =
};
static struct TokenInfo player_setup_tokens[] =
@@
-9347,6
+9355,11
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->shortcut.sound_loops = DEFAULT_KEY_SOUND_LOOPS;
si->shortcut.sound_music = DEFAULT_KEY_SOUND_MUSIC;
si->shortcut.sound_loops = DEFAULT_KEY_SOUND_LOOPS;
si->shortcut.sound_music = DEFAULT_KEY_SOUND_MUSIC;
+ si->shortcut.snap_left = DEFAULT_KEY_SNAP_LEFT;
+ si->shortcut.snap_right = DEFAULT_KEY_SNAP_RIGHT;
+ si->shortcut.snap_up = DEFAULT_KEY_SNAP_UP;
+ si->shortcut.snap_down = DEFAULT_KEY_SNAP_DOWN;
+
for (i = 0; i < MAX_PLAYERS; i++)
{
si->input[i].use_joystick = FALSE;
for (i = 0; i < MAX_PLAYERS; i++)
{
si->input[i].use_joystick = FALSE;
@@
-9374,6
+9387,7
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->options.verbose = FALSE;
#if defined(CREATE_SPECIAL_EDITION_RND_JUE)
si->options.verbose = FALSE;
#if defined(CREATE_SPECIAL_EDITION_RND_JUE)
+ si->toons = FALSE;
si->handicap = FALSE;
si->fullscreen = TRUE;
si->override_level_graphics = AUTO;
si->handicap = FALSE;
si->fullscreen = TRUE;
si->override_level_graphics = AUTO;
@@
-9814,7
+9828,8
@@
static void InitMenuDesignSettings_SpecialPreProcessing()
{
viewport.playfield[i] = viewport.playfield[GFX_SPECIAL_ARG_DEFAULT];
viewport.door_1[i] = viewport.door_1[GFX_SPECIAL_ARG_DEFAULT];
{
viewport.playfield[i] = viewport.playfield[GFX_SPECIAL_ARG_DEFAULT];
viewport.door_1[i] = viewport.door_1[GFX_SPECIAL_ARG_DEFAULT];
- viewport.door_2[i] = viewport.door_2[GFX_SPECIAL_ARG_DEFAULT];
+ if (i != GFX_SPECIAL_ARG_EDITOR) /* editor value already initialized */
+ viewport.door_2[i] = viewport.door_2[GFX_SPECIAL_ARG_DEFAULT];
}
}
}
}
@@
-9957,31
+9972,44
@@
static void LoadMenuDesignSettingsFromFilename(char *filename)
/* (eg, init "viewport.door_1.MAIN.xyz" from "viewport.door_1.xyz") */
for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
{
/* (eg, init "viewport.door_1.MAIN.xyz" from "viewport.door_1.xyz") */
for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++)
{
- char *token_1 = "viewport.playfield.width";
- char *token_2 = "viewport.playfield.height";
- char *token_3 = "viewport.door_1.x";
- char *token_4 = "viewport.door_1.y";
- char *token_5 = "viewport.door_2.x";
- char *token_6 = "viewport.door_2.y";
+ char *token_1 = "viewport.playfield.x";
+ char *token_2 = "viewport.playfield.y";
+ char *token_3 = "viewport.playfield.width";
+ char *token_4 = "viewport.playfield.height";
+ char *token_5 = "viewport.playfield.border_size";
+ char *token_6 = "viewport.door_1.x";
+ char *token_7 = "viewport.door_1.y";
+ char *token_8 = "viewport.door_2.x";
+ char *token_9 = "viewport.door_2.y";
char *value_1 = getHashEntry(setup_file_hash, token_1);
char *value_2 = getHashEntry(setup_file_hash, token_2);
char *value_3 = getHashEntry(setup_file_hash, token_3);
char *value_4 = getHashEntry(setup_file_hash, token_4);
char *value_5 = getHashEntry(setup_file_hash, token_5);
char *value_6 = getHashEntry(setup_file_hash, token_6);
char *value_1 = getHashEntry(setup_file_hash, token_1);
char *value_2 = getHashEntry(setup_file_hash, token_2);
char *value_3 = getHashEntry(setup_file_hash, token_3);
char *value_4 = getHashEntry(setup_file_hash, token_4);
char *value_5 = getHashEntry(setup_file_hash, token_5);
char *value_6 = getHashEntry(setup_file_hash, token_6);
+ char *value_7 = getHashEntry(setup_file_hash, token_7);
+ char *value_8 = getHashEntry(setup_file_hash, token_8);
+ char *value_9 = getHashEntry(setup_file_hash, token_9);
if (value_1 != NULL)
if (value_1 != NULL)
- viewport.playfield[i].
width = get_token_parameter_value(token_1,
value_1);
+ viewport.playfield[i].
x = get_token_parameter_value(token_1,
value_1);
if (value_2 != NULL)
if (value_2 != NULL)
- viewport.playfield[i].
height = get_token_parameter_value(token_2,
value_2);
+ viewport.playfield[i].
y = get_token_parameter_value(token_2,
value_2);
if (value_3 != NULL)
if (value_3 != NULL)
- viewport.
door_1[i].x
= get_token_parameter_value(token_3, value_3);
+ viewport.
playfield[i].width
= get_token_parameter_value(token_3, value_3);
if (value_4 != NULL)
if (value_4 != NULL)
- viewport.
door_1[i].y = get_token_parameter_value(token_4,
value_4);
+ viewport.
playfield[i].height = get_token_parameter_value(token_4,
value_4);
if (value_5 != NULL)
if (value_5 != NULL)
- viewport.door_2[i].x = get_token_parameter_value(token_5, value_5);
+ viewport.playfield[i].border_size = get_token_parameter_value(token_5,
+ value_5);
if (value_6 != NULL)
if (value_6 != NULL)
- viewport.door_2[i].y = get_token_parameter_value(token_6, value_6);
+ viewport.door_1[i].x = get_token_parameter_value(token_6, value_6);
+ if (value_7 != NULL)
+ viewport.door_1[i].y = get_token_parameter_value(token_7, value_7);
+ if (value_8 != NULL)
+ viewport.door_2[i].x = get_token_parameter_value(token_8, value_8);
+ if (value_9 != NULL)
+ viewport.door_2[i].y = get_token_parameter_value(token_9, value_9);
}
/* special case: initialize with default values that may be overwritten */
}
/* special case: initialize with default values that may be overwritten */
@@
-10320,6
+10348,10
@@
void LoadMusicInfo()
if (!music_info_listed(music_file_info, music->filename))
{
*new = get_music_file_info(music->filename, i);
if (!music_info_listed(music_file_info, music->filename))
{
*new = get_music_file_info(music->filename, i);
+#if 0
+ if (*new != NULL)
+ printf(":1: adding '%s' ['%s'] ...\n", (*new)->title, music->filename);
+#endif
if (*new != NULL)
new = &(*new)->next;
}
if (*new != NULL)
new = &(*new)->next;
}
@@
-10365,6
+10397,10
@@
void LoadMusicInfo()
if (!music_info_listed(music_file_info, basename))
{
*new = get_music_file_info(basename, MAP_NOCONF_MUSIC(num_music_noconf));
if (!music_info_listed(music_file_info, basename))
{
*new = get_music_file_info(basename, MAP_NOCONF_MUSIC(num_music_noconf));
+#if 0
+ if (*new != NULL)
+ printf(":2: adding '%s' ['%s'] ...\n", (*new)->title, basename);
+#endif
if (*new != NULL)
new = &(*new)->next;
}
if (*new != NULL)
new = &(*new)->next;
}