projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20031130-1-src
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index cb4c6a605a173139931c8203c7f39353b77275a6..011f715e0d8d94cf3bd48543f0d0175f908cb83f 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-91,8
+91,8
@@
void setElementChangeInfoToDefaults(struct ElementChangeInfo *change)
change->random = 100;
change->power = CP_NON_DESTRUCTIVE;
change->random = 100;
change->power = CP_NON_DESTRUCTIVE;
- for
(x=0; x<
3; x++)
- for
(y=0; y<
3; y++)
+ for
(x = 0; x <
3; x++)
+ for
(y = 0; y <
3; y++)
change->content[x][y] = EL_EMPTY_SPACE;
change->direct_action = 0;
change->content[x][y] = EL_EMPTY_SPACE;
change->direct_action = 0;
@@
-117,8
+117,8
@@
static void setLevelInfoToDefaults(struct LevelInfo *level)
level->fieldx = STD_LEV_FIELDX;
level->fieldy = STD_LEV_FIELDY;
level->fieldx = STD_LEV_FIELDX;
level->fieldy = STD_LEV_FIELDY;
- for
(x=0; x<
MAX_LEV_FIELDX; x++)
- for
(y=0; y<
MAX_LEV_FIELDY; y++)
+ for
(x = 0; x <
MAX_LEV_FIELDX; x++)
+ for
(y = 0; y <
MAX_LEV_FIELDY; y++)
level->field[x][y] = EL_SAND;
level->time = 100;
level->field[x][y] = EL_SAND;
level->time = 100;
@@
-135,45
+135,45
@@
static void setLevelInfoToDefaults(struct LevelInfo *level)
level->use_custom_template = FALSE;
level->use_custom_template = FALSE;
- for
(i=0; i<
MAX_LEVEL_NAME_LEN; i++)
+ for
(i = 0; i <
MAX_LEVEL_NAME_LEN; i++)
level->name[i] = '\0';
level->name[i] = '\0';
- for
(i=0; i<
MAX_LEVEL_AUTHOR_LEN; i++)
+ for
(i = 0; i <
MAX_LEVEL_AUTHOR_LEN; i++)
level->author[i] = '\0';
strcpy(level->name, NAMELESS_LEVEL_NAME);
strcpy(level->author, ANONYMOUS_NAME);
level->author[i] = '\0';
strcpy(level->name, NAMELESS_LEVEL_NAME);
strcpy(level->author, ANONYMOUS_NAME);
- for (i
=0; i<
4; i++)
+ for (i
= 0; i <
4; i++)
{
level->envelope_text[i][0] = '\0';
level->envelope_xsize[i] = MAX_ENVELOPE_XSIZE;
level->envelope_ysize[i] = MAX_ENVELOPE_YSIZE;
}
{
level->envelope_text[i][0] = '\0';
level->envelope_xsize[i] = MAX_ENVELOPE_XSIZE;
level->envelope_ysize[i] = MAX_ENVELOPE_YSIZE;
}
- for
(i=0; i<
LEVEL_SCORE_ELEMENTS; i++)
+ for
(i = 0; i <
LEVEL_SCORE_ELEMENTS; i++)
level->score[i] = 10;
level->num_yamyam_contents = STD_ELEMENT_CONTENTS;
level->score[i] = 10;
level->num_yamyam_contents = STD_ELEMENT_CONTENTS;
- for
(i=0; i<
MAX_ELEMENT_CONTENTS; i++)
- for
(x=0; x<
3; x++)
- for
(y=0; y<
3; y++)
+ for
(i = 0; i <
MAX_ELEMENT_CONTENTS; i++)
+ for
(x = 0; x <
3; x++)
+ for
(y = 0; y <
3; y++)
level->yamyam_content[i][x][y] =
(i < STD_ELEMENT_CONTENTS ? EL_ROCK : EL_EMPTY);
level->field[0][0] = EL_PLAYER_1;
level->field[STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED;
level->yamyam_content[i][x][y] =
(i < STD_ELEMENT_CONTENTS ? EL_ROCK : EL_EMPTY);
level->field[0][0] = EL_PLAYER_1;
level->field[STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED;
- for (i
=
0; i < MAX_NUM_ELEMENTS; i++)
+ for (i
=
0; i < MAX_NUM_ELEMENTS; i++)
{
setElementChangePages(&element_info[i], 1);
setElementChangeInfoToDefaults(element_info[i].change);
}
{
setElementChangePages(&element_info[i], 1);
setElementChangeInfoToDefaults(element_info[i].change);
}
- for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
+ for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
{
int element = EL_CUSTOM_START + i;
{
int element = EL_CUSTOM_START + i;
- for
(j=
0; j < MAX_ELEMENT_NAME_LEN + 1; j++)
+ for
(j =
0; j < MAX_ELEMENT_NAME_LEN + 1; j++)
element_info[element].description[j] = '\0';
if (element_info[element].custom_description != NULL)
strncpy(element_info[element].description,
element_info[element].description[j] = '\0';
if (element_info[element].custom_description != NULL)
strncpy(element_info[element].description,
@@
-199,8
+199,8
@@
static void setLevelInfoToDefaults(struct LevelInfo *level)
element_info[element].slippery_type = SLIPPERY_ANY_RANDOM;
element_info[element].slippery_type = SLIPPERY_ANY_RANDOM;
- for
(x=0; x<
3; x++)
- for
(y=0; y<
3; y++)
+ for
(x = 0; x <
3; x++)
+ for
(y = 0; y <
3; y++)
element_info[element].content[x][y] = EL_EMPTY_SPACE;
element_info[element].access_type = 0;
element_info[element].content[x][y] = EL_EMPTY_SPACE;
element_info[element].access_type = 0;
@@
-217,7
+217,7
@@
static void setLevelInfoToDefaults(struct LevelInfo *level)
element_info[element].current_change_page = 0;
/* start with no properties at all */
element_info[element].current_change_page = 0;
/* start with no properties at all */
- for (j
=
0; j < NUM_EP_BITFIELDS; j++)
+ for (j
=
0; j < NUM_EP_BITFIELDS; j++)
Properties[element][j] = EP_BITMASK_DEFAULT;
element_info[element].modified_settings = FALSE;
Properties[element][j] = EP_BITMASK_DEFAULT;
element_info[element].modified_settings = FALSE;
@@
-356,17
+356,17
@@
static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level)
level->time = getFile16BitBE(file);
level->gems_needed = getFile16BitBE(file);
level->time = getFile16BitBE(file);
level->gems_needed = getFile16BitBE(file);
- for
(i=0; i<
MAX_LEVEL_NAME_LEN; i++)
+ for
(i = 0; i <
MAX_LEVEL_NAME_LEN; i++)
level->name[i] = getFile8Bit(file);
level->name[MAX_LEVEL_NAME_LEN] = 0;
level->name[i] = getFile8Bit(file);
level->name[MAX_LEVEL_NAME_LEN] = 0;
- for
(i=0; i<
LEVEL_SCORE_ELEMENTS; i++)
+ for
(i = 0; i <
LEVEL_SCORE_ELEMENTS; i++)
level->score[i] = getFile8Bit(file);
level->num_yamyam_contents = STD_ELEMENT_CONTENTS;
level->score[i] = getFile8Bit(file);
level->num_yamyam_contents = STD_ELEMENT_CONTENTS;
- for
(i=0; i<
STD_ELEMENT_CONTENTS; i++)
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(i = 0; i <
STD_ELEMENT_CONTENTS; i++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
level->yamyam_content[i][x][y] = checkLevelElement(getFile8Bit(file));
level->amoeba_speed = getFile8Bit(file);
level->yamyam_content[i][x][y] = checkLevelElement(getFile8Bit(file));
level->amoeba_speed = getFile8Bit(file);
@@
-389,7
+389,7
@@
static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level)
{
int i;
{
int i;
- for
(i=0; i<
MAX_LEVEL_AUTHOR_LEN; i++)
+ for
(i = 0; i <
MAX_LEVEL_AUTHOR_LEN; i++)
level->author[i] = getFile8Bit(file);
level->author[MAX_LEVEL_NAME_LEN] = 0;
level->author[i] = getFile8Bit(file);
level->author[MAX_LEVEL_NAME_LEN] = 0;
@@
-415,8
+415,8
@@
static int LoadLevel_BODY(FILE *file, int chunk_size, struct LevelInfo *level)
return chunk_size_expected;
}
return chunk_size_expected;
}
- for
(y=0; y<
level->fieldy; y++)
- for
(x=0; x<
level->fieldx; x++)
+ for
(y = 0; y <
level->fieldy; y++)
+ for
(x = 0; x <
level->fieldx; x++)
level->field[x][y] =
checkLevelElement(level->encoding_16bit_field ? getFile16BitBE(file) :
getFile8Bit(file));
level->field[x][y] =
checkLevelElement(level->encoding_16bit_field ? getFile16BitBE(file) :
getFile8Bit(file));
@@
-454,9
+454,9
@@
static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level)
level->num_yamyam_contents > MAX_ELEMENT_CONTENTS)
level->num_yamyam_contents = STD_ELEMENT_CONTENTS;
level->num_yamyam_contents > MAX_ELEMENT_CONTENTS)
level->num_yamyam_contents = STD_ELEMENT_CONTENTS;
- for
(i=0; i<
MAX_ELEMENT_CONTENTS; i++)
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(i = 0; i <
MAX_ELEMENT_CONTENTS; i++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
level->yamyam_content[i][x][y] =
checkLevelElement(level->encoding_16bit_field ?
getFile16BitBE(file) : getFile8Bit(file));
level->yamyam_content[i][x][y] =
checkLevelElement(level->encoding_16bit_field ?
getFile16BitBE(file) : getFile8Bit(file));
@@
-477,9
+477,9
@@
static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level)
ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT2_UNUSED);
ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT2_UNUSED);
- for
(i=0; i<
MAX_ELEMENT_CONTENTS; i++)
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(i = 0; i <
MAX_ELEMENT_CONTENTS; i++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
content_array[i][x][y] = checkLevelElement(getFile16BitBE(file));
/* correct invalid number of content fields -- should never happen */
content_array[i][x][y] = checkLevelElement(getFile16BitBE(file));
/* correct invalid number of content fields -- should never happen */
@@
-490,9
+490,9
@@
static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level)
{
level->num_yamyam_contents = num_contents;
{
level->num_yamyam_contents = num_contents;
- for
(i=0; i<
num_contents; i++)
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(i = 0; i <
num_contents; i++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
level->yamyam_content[i][x][y] = content_array[i][x][y];
}
else if (element == EL_BD_AMOEBA)
level->yamyam_content[i][x][y] = content_array[i][x][y];
}
else if (element == EL_BD_AMOEBA)
@@
-536,7
+536,7
@@
static int LoadLevel_CNT3(FILE *file, int chunk_size, struct LevelInfo *level)
return chunk_size_expected;
}
return chunk_size_expected;
}
- for
(i=
0; i < envelope_len; i++)
+ for
(i =
0; i < envelope_len; i++)
level->envelope_text[envelope_nr][i] = getFile8Bit(file);
return chunk_size;
level->envelope_text[envelope_nr][i] = getFile8Bit(file);
return chunk_size;
@@
-554,7
+554,7
@@
static int LoadLevel_CUS1(FILE *file, int chunk_size, struct LevelInfo *level)
return chunk_size_expected;
}
return chunk_size_expected;
}
- for (i
=
0; i < num_changed_custom_elements; i++)
+ for (i
=
0; i < num_changed_custom_elements; i++)
{
int element = getFile16BitBE(file);
int properties = getFile32BitBE(file);
{
int element = getFile16BitBE(file);
int properties = getFile32BitBE(file);
@@
-580,7
+580,7
@@
static int LoadLevel_CUS2(FILE *file, int chunk_size, struct LevelInfo *level)
return chunk_size_expected;
}
return chunk_size_expected;
}
- for (i
=
0; i < num_changed_custom_elements; i++)
+ for (i
=
0; i < num_changed_custom_elements; i++)
{
int element = getFile16BitBE(file);
int custom_target_element = getFile16BitBE(file);
{
int element = getFile16BitBE(file);
int custom_target_element = getFile16BitBE(file);
@@
-606,7
+606,7
@@
static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level)
return chunk_size_expected;
}
return chunk_size_expected;
}
- for (i
=
0; i < num_changed_custom_elements; i++)
+ for (i
=
0; i < num_changed_custom_elements; i++)
{
int element = getFile16BitBE(file);
{
int element = getFile16BitBE(file);
@@
-617,7
+617,7
@@
static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level)
element = EL_DUMMY;
}
element = EL_DUMMY;
}
- for
(j=0; j<
MAX_ELEMENT_NAME_LEN; j++)
+ for
(j = 0; j <
MAX_ELEMENT_NAME_LEN; j++)
element_info[element].description[j] = getFile8Bit(file);
element_info[element].description[MAX_ELEMENT_NAME_LEN] = 0;
element_info[element].description[j] = getFile8Bit(file);
element_info[element].description[MAX_ELEMENT_NAME_LEN] = 0;
@@
-642,8
+642,8
@@
static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level)
element_info[element].move_direction_initial = getFile8Bit(file);
element_info[element].move_stepsize = getFile8Bit(file);
element_info[element].move_direction_initial = getFile8Bit(file);
element_info[element].move_stepsize = getFile8Bit(file);
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
element_info[element].content[x][y] =
checkLevelElement(getFile16BitBE(file));
element_info[element].content[x][y] =
checkLevelElement(getFile16BitBE(file));
@@
-667,8
+667,8
@@
static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level)
element_info[element].change->random = getFile8Bit(file);
element_info[element].change->power = getFile8Bit(file);
element_info[element].change->random = getFile8Bit(file);
element_info[element].change->power = getFile8Bit(file);
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
element_info[element].change->content[x][y] =
checkLevelElement(getFile16BitBE(file));
element_info[element].change->content[x][y] =
checkLevelElement(getFile16BitBE(file));
@@
-702,7
+702,7
@@
static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level)
ei = &element_info[element];
ei = &element_info[element];
- for
(i=
0; i < MAX_ELEMENT_NAME_LEN; i++)
+ for
(i =
0; i < MAX_ELEMENT_NAME_LEN; i++)
ei->description[i] = getFile8Bit(file);
ei->description[MAX_ELEMENT_NAME_LEN] = 0;
ei->description[i] = getFile8Bit(file);
ei->description[MAX_ELEMENT_NAME_LEN] = 0;
@@
-740,8
+740,8
@@
static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level)
ei->slippery_type = getFile8Bit(file);
ei->slippery_type = getFile8Bit(file);
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
ei->content[x][y] = checkLevelElement(getFile16BitBE(file));
/* some free bytes for future custom property values and padding */
ei->content[x][y] = checkLevelElement(getFile16BitBE(file));
/* some free bytes for future custom property values and padding */
@@
-751,7
+751,7
@@
static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level)
setElementChangePages(ei, ei->num_change_pages);
setElementChangePages(ei, ei->num_change_pages);
- for (i
=
0; i < ei->num_change_pages; i++)
+ for (i
=
0; i < ei->num_change_pages; i++)
{
struct ElementChangeInfo *change = &ei->change_page[i];
{
struct ElementChangeInfo *change = &ei->change_page[i];
@@
-776,8
+776,8
@@
static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level)
change->random = getFile8Bit(file);
change->power = getFile8Bit(file);
change->random = getFile8Bit(file);
change->power = getFile8Bit(file);
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
change->content[x][y] = checkLevelElement(getFile16BitBE(file));
change->can_change = getFile8Bit(file);
change->content[x][y] = checkLevelElement(getFile16BitBE(file));
change->can_change = getFile8Bit(file);
@@
-1027,12
+1027,12
@@
static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
(these following values were accidentally changed in version 3.0.1) */
if (level->game_version <= VERSION_IDENT(3,0,0,0))
{
(these following values were accidentally changed in version 3.0.1) */
if (level->game_version <= VERSION_IDENT(3,0,0,0))
{
- for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
+ for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
{
int element = EL_CUSTOM_START + i;
/* order of checking and copying events to be mapped is important */
{
int element = EL_CUSTOM_START + i;
/* order of checking and copying events to be mapped is important */
- for (j
=
CE_BY_OTHER_ACTION; j >= CE_BY_PLAYER; j--)
+ for (j
=
CE_BY_OTHER_ACTION; j >= CE_BY_PLAYER; j--)
{
if (HAS_CHANGE_EVENT(element, j - 2))
{
{
if (HAS_CHANGE_EVENT(element, j - 2))
{
@@
-1042,7
+1042,7
@@
static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
}
/* order of checking and copying events to be mapped is important */
}
/* order of checking and copying events to be mapped is important */
- for (j
=
CE_OTHER_GETS_COLLECTED; j >= CE_COLLISION; j--)
+ for (j
=
CE_OTHER_GETS_COLLECTED; j >= CE_COLLISION; j--)
{
if (HAS_CHANGE_EVENT(element, j - 1))
{
{
if (HAS_CHANGE_EVENT(element, j - 1))
{
@@
-1054,7
+1054,7
@@
static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
}
/* some custom element change events get mapped since version 3.0.3 */
}
/* some custom element change events get mapped since version 3.0.3 */
- for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
+ for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
{
int element = EL_CUSTOM_START + i;
{
int element = EL_CUSTOM_START + i;
@@
-1071,7
+1071,7
@@
static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
/* initialize "can_change" field for old levels with only one change page */
if (level->game_version <= VERSION_IDENT(3,0,2,0))
{
/* initialize "can_change" field for old levels with only one change page */
if (level->game_version <= VERSION_IDENT(3,0,2,0))
{
- for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
+ for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
{
int element = EL_CUSTOM_START + i;
{
int element = EL_CUSTOM_START + i;
@@
-1094,7
+1094,7
@@
static void LoadLevel_InitElements(struct LevelInfo *level, char *filename)
}
/* set uninitialized push delay values of custom elements in older levels */
}
/* set uninitialized push delay values of custom elements in older levels */
- for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
+ for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
{
int element = EL_CUSTOM_START + i;
{
int element = EL_CUSTOM_START + i;
@@
-1114,9
+1114,9
@@
static void LoadLevel_InitPlayfield(struct LevelInfo *level, char *filename)
int x, y;
/* map elements that have changed in newer versions */
int x, y;
/* map elements that have changed in newer versions */
- for
(y=0; y<
level->fieldy; y++)
+ for
(y = 0; y <
level->fieldy; y++)
{
{
- for
(x=0; x<
level->fieldx; x++)
+ for
(x = 0; x <
level->fieldx; x++)
{
int element = level->field[x][y];
{
int element = level->field[x][y];
@@
-1144,8
+1144,8
@@
static void LoadLevel_InitPlayfield(struct LevelInfo *level, char *filename)
}
/* copy elements to runtime playfield array */
}
/* copy elements to runtime playfield array */
- for
(x=0; x<
MAX_LEV_FIELDX; x++)
- for
(y=0; y<
MAX_LEV_FIELDY; y++)
+ for
(x = 0; x <
MAX_LEV_FIELDX; x++)
+ for
(y = 0; y <
MAX_LEV_FIELDY; y++)
Feld[x][y] = level->field[x][y];
/* initialize level size variables for faster access */
Feld[x][y] = level->field[x][y];
/* initialize level size variables for faster access */
@@
-1202,15
+1202,15
@@
static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level)
putFile16BitBE(file, level->time);
putFile16BitBE(file, level->gems_needed);
putFile16BitBE(file, level->time);
putFile16BitBE(file, level->gems_needed);
- for
(i=0; i<
MAX_LEVEL_NAME_LEN; i++)
+ for
(i = 0; i <
MAX_LEVEL_NAME_LEN; i++)
putFile8Bit(file, level->name[i]);
putFile8Bit(file, level->name[i]);
- for
(i=0; i<
LEVEL_SCORE_ELEMENTS; i++)
+ for
(i = 0; i <
LEVEL_SCORE_ELEMENTS; i++)
putFile8Bit(file, level->score[i]);
putFile8Bit(file, level->score[i]);
- for
(i=0; i<
STD_ELEMENT_CONTENTS; i++)
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(i = 0; i <
STD_ELEMENT_CONTENTS; i++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
putFile8Bit(file, (level->encoding_16bit_yamyam ? EL_EMPTY :
level->yamyam_content[i][x][y]));
putFile8Bit(file, level->amoeba_speed);
putFile8Bit(file, (level->encoding_16bit_yamyam ? EL_EMPTY :
level->yamyam_content[i][x][y]));
putFile8Bit(file, level->amoeba_speed);
@@
-1232,7
+1232,7
@@
static void SaveLevel_AUTH(FILE *file, struct LevelInfo *level)
{
int i;
{
int i;
- for
(i=0; i<
MAX_LEVEL_AUTHOR_LEN; i++)
+ for
(i = 0; i <
MAX_LEVEL_AUTHOR_LEN; i++)
putFile8Bit(file, level->author[i]);
}
putFile8Bit(file, level->author[i]);
}
@@
-1240,8
+1240,8
@@
static void SaveLevel_BODY(FILE *file, struct LevelInfo *level)
{
int x, y;
{
int x, y;
- for
(y=0; y<
level->fieldy; y++)
- for
(x=0; x<
level->fieldx; x++)
+ for
(y = 0; y <
level->fieldy; y++)
+ for
(x = 0; x <
level->fieldx; x++)
if (level->encoding_16bit_field)
putFile16BitBE(file, level->field[x][y]);
else
if (level->encoding_16bit_field)
putFile16BitBE(file, level->field[x][y]);
else
@@
-1258,9
+1258,9
@@
static void SaveLevel_CONT(FILE *file, struct LevelInfo *level)
putFile8Bit(file, 0);
putFile8Bit(file, 0);
putFile8Bit(file, 0);
putFile8Bit(file, 0);
- for
(i=0; i<
MAX_ELEMENT_CONTENTS; i++)
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(i = 0; i <
MAX_ELEMENT_CONTENTS; i++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
if (level->encoding_16bit_field)
putFile16BitBE(file, level->yamyam_content[i][x][y]);
else
if (level->encoding_16bit_field)
putFile16BitBE(file, level->yamyam_content[i][x][y]);
else
@@
-1280,9
+1280,9
@@
static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
content_xsize = 3;
content_ysize = 3;
content_xsize = 3;
content_ysize = 3;
- for
(i=0; i<
MAX_ELEMENT_CONTENTS; i++)
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(i = 0; i <
MAX_ELEMENT_CONTENTS; i++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
content_array[i][x][y] = level->yamyam_content[i][x][y];
}
else if (element == EL_BD_AMOEBA)
content_array[i][x][y] = level->yamyam_content[i][x][y];
}
else if (element == EL_BD_AMOEBA)
@@
-1291,9
+1291,9
@@
static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
content_xsize = 1;
content_ysize = 1;
content_xsize = 1;
content_ysize = 1;
- for
(i=0; i<
MAX_ELEMENT_CONTENTS; i++)
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(i = 0; i <
MAX_ELEMENT_CONTENTS; i++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
content_array[i][x][y] = EL_EMPTY;
content_array[0][0][0] = level->amoeba_content;
}
content_array[i][x][y] = EL_EMPTY;
content_array[0][0][0] = level->amoeba_content;
}
@@
-1313,9
+1313,9
@@
static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_UNUSED);
WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_UNUSED);
- for
(i=0; i<
MAX_ELEMENT_CONTENTS; i++)
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(i = 0; i <
MAX_ELEMENT_CONTENTS; i++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
putFile16BitBE(file, content_array[i][x][y]);
}
putFile16BitBE(file, content_array[i][x][y]);
}
@@
-1332,7
+1332,7
@@
static void SaveLevel_CNT3(FILE *file, struct LevelInfo *level, int element)
WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT3_UNUSED);
WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT3_UNUSED);
- for
(i=
0; i < envelope_len; i++)
+ for
(i =
0; i < envelope_len; i++)
putFile8Bit(file, level->envelope_text[envelope_nr][i]);
}
putFile8Bit(file, level->envelope_text[envelope_nr][i]);
}
@@
-1344,7
+1344,7
@@
static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level,
putFile16BitBE(file, num_changed_custom_elements);
putFile16BitBE(file, num_changed_custom_elements);
- for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
+ for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
{
int element = EL_CUSTOM_START + i;
{
int element = EL_CUSTOM_START + i;
@@
-1373,7
+1373,7
@@
static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level,
putFile16BitBE(file, num_changed_custom_elements);
putFile16BitBE(file, num_changed_custom_elements);
- for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
+ for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
{
int element = EL_CUSTOM_START + i;
{
int element = EL_CUSTOM_START + i;
@@
-1402,7
+1402,7
@@
static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level,
putFile16BitBE(file, num_changed_custom_elements);
putFile16BitBE(file, num_changed_custom_elements);
- for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
+ for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
{
int element = EL_CUSTOM_START + i;
{
int element = EL_CUSTOM_START + i;
@@
-1412,7
+1412,7
@@
static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level,
{
putFile16BitBE(file, element);
{
putFile16BitBE(file, element);
- for
(j=0; j<
MAX_ELEMENT_NAME_LEN; j++)
+ for
(j = 0; j <
MAX_ELEMENT_NAME_LEN; j++)
putFile8Bit(file, element_info[element].description[j]);
putFile32BitBE(file, Properties[element][EP_BITFIELD_BASE]);
putFile8Bit(file, element_info[element].description[j]);
putFile32BitBE(file, Properties[element][EP_BITFIELD_BASE]);
@@
-1435,8
+1435,8
@@
static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level,
putFile8Bit(file, element_info[element].move_direction_initial);
putFile8Bit(file, element_info[element].move_stepsize);
putFile8Bit(file, element_info[element].move_direction_initial);
putFile8Bit(file, element_info[element].move_stepsize);
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
putFile16BitBE(file, element_info[element].content[x][y]);
putFile32BitBE(file, element_info[element].change->events);
putFile16BitBE(file, element_info[element].content[x][y]);
putFile32BitBE(file, element_info[element].change->events);
@@
-1457,8
+1457,8
@@
static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level,
putFile8Bit(file, element_info[element].change->random);
putFile8Bit(file, element_info[element].change->power);
putFile8Bit(file, element_info[element].change->random);
putFile8Bit(file, element_info[element].change->power);
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
putFile16BitBE(file, element_info[element].change->content[x][y]);
putFile8Bit(file, element_info[element].slippery_type);
putFile16BitBE(file, element_info[element].change->content[x][y]);
putFile8Bit(file, element_info[element].slippery_type);
@@
-1483,7
+1483,7
@@
static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element)
putFile16BitBE(file, element);
putFile16BitBE(file, element);
- for
(i=
0; i < MAX_ELEMENT_NAME_LEN; i++)
+ for
(i =
0; i < MAX_ELEMENT_NAME_LEN; i++)
putFile8Bit(file, ei->description[i]);
putFile32BitBE(file, Properties[element][EP_BITFIELD_BASE]);
putFile8Bit(file, ei->description[i]);
putFile32BitBE(file, Properties[element][EP_BITFIELD_BASE]);
@@
-1513,8
+1513,8
@@
static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element)
putFile8Bit(file, ei->slippery_type);
putFile8Bit(file, ei->slippery_type);
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
putFile16BitBE(file, ei->content[x][y]);
/* some free bytes for future custom property values and padding */
putFile16BitBE(file, ei->content[x][y]);
/* some free bytes for future custom property values and padding */
@@
-1522,7
+1522,7
@@
static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element)
/* write change property values */
/* write change property values */
- for (i
=
0; i < ei->num_change_pages; i++)
+ for (i
=
0; i < ei->num_change_pages; i++)
{
struct ElementChangeInfo *change = &ei->change_page[i];
{
struct ElementChangeInfo *change = &ei->change_page[i];
@@
-1544,8
+1544,8
@@
static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element)
putFile8Bit(file, change->random);
putFile8Bit(file, change->power);
putFile8Bit(file, change->random);
putFile8Bit(file, change->power);
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
putFile16BitBE(file, change->content[x][y]);
putFile8Bit(file, change->can_change);
putFile16BitBE(file, change->content[x][y]);
putFile8Bit(file, change->can_change);
@@
-1574,16
+1574,16
@@
static void SaveLevelFromFilename(struct LevelInfo *level, char *filename)
/* check level field for 16-bit elements */
level->encoding_16bit_field = FALSE;
/* check level field for 16-bit elements */
level->encoding_16bit_field = FALSE;
- for
(y=0; y<
level->fieldy; y++)
- for
(x=0; x<
level->fieldx; x++)
+ for
(y = 0; y <
level->fieldy; y++)
+ for
(x = 0; x <
level->fieldx; x++)
if (level->field[x][y] > 255)
level->encoding_16bit_field = TRUE;
/* check yamyam content for 16-bit elements */
level->encoding_16bit_yamyam = FALSE;
if (level->field[x][y] > 255)
level->encoding_16bit_field = TRUE;
/* check yamyam content for 16-bit elements */
level->encoding_16bit_yamyam = FALSE;
- for
(i=0; i<
level->num_yamyam_contents; i++)
- for
(y=0; y<
3; y++)
- for
(x=0; x<
3; x++)
+ for
(i = 0; i <
level->num_yamyam_contents; i++)
+ for
(y = 0; y <
3; y++)
+ for
(x = 0; x <
3; x++)
if (level->yamyam_content[i][x][y] > 255)
level->encoding_16bit_yamyam = TRUE;
if (level->yamyam_content[i][x][y] > 255)
level->encoding_16bit_yamyam = TRUE;
@@
-1625,7
+1625,7
@@
static void SaveLevelFromFilename(struct LevelInfo *level, char *filename)
}
/* check for envelope content */
}
/* check for envelope content */
- for (i
=0; i<
4; i++)
+ for (i
= 0; i <
4; i++)
{
if (strlen(level->envelope_text[i]) > 0)
{
{
if (strlen(level->envelope_text[i]) > 0)
{
@@
-1639,7
+1639,7
@@
static void SaveLevelFromFilename(struct LevelInfo *level, char *filename)
/* check for non-default custom elements (unless using template level) */
if (!level->use_custom_template)
{
/* check for non-default custom elements (unless using template level) */
if (!level->use_custom_template)
{
- for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
+ for (i
=
0; i < NUM_CUSTOM_ELEMENTS; i++)
{
int element = EL_CUSTOM_START + i;
{
int element = EL_CUSTOM_START + i;
@@
-1715,7
+1715,7
@@
static void setTapeInfoToDefaults()
/* default values (also for pre-1.2 tapes) with only the first player */
tape.player_participates[0] = TRUE;
/* default values (also for pre-1.2 tapes) with only the first player */
tape.player_participates[0] = TRUE;
- for
(i=1; i<
MAX_PLAYERS; i++)
+ for
(i = 1; i <
MAX_PLAYERS; i++)
tape.player_participates[i] = FALSE;
/* at least one (default: the first) player participates in every tape */
tape.player_participates[i] = FALSE;
/* at least one (default: the first) player participates in every tape */
@@
-1754,7
+1754,7
@@
static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape)
/* since version 1.2, tapes store which players participate in the tape */
tape->num_participating_players = 0;
/* since version 1.2, tapes store which players participate in the tape */
tape->num_participating_players = 0;
- for
(i=0; i<
MAX_PLAYERS; i++)
+ for
(i = 0; i <
MAX_PLAYERS; i++)
{
tape->player_participates[i] = FALSE;
{
tape->player_participates[i] = FALSE;
@@
-1787,7
+1787,7
@@
static int LoadTape_INFO(FILE *file, int chunk_size, struct TapeInfo *tape)
tape->level_identifier =
checked_realloc(tape->level_identifier, level_identifier_size);
tape->level_identifier =
checked_realloc(tape->level_identifier, level_identifier_size);
- for
(i=
0; i < level_identifier_size; i++)
+ for
(i =
0; i < level_identifier_size; i++)
tape->level_identifier[i] = getFile8Bit(file);
tape->level_nr = getFile16BitBE(file);
tape->level_identifier[i] = getFile8Bit(file);
tape->level_nr = getFile16BitBE(file);
@@
-1809,12
+1809,12
@@
static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape)
return chunk_size_expected;
}
return chunk_size_expected;
}
- for
(i=0; i<
tape->length; i++)
+ for
(i = 0; i <
tape->length; i++)
{
if (i >= MAX_TAPELEN)
break;
{
if (i >= MAX_TAPELEN)
break;
- for
(j=0; j<
MAX_PLAYERS; j++)
+ for
(j = 0; j <
MAX_PLAYERS; j++)
{
tape->pos[i].action[j] = MV_NO_MOVING;
{
tape->pos[i].action[j] = MV_NO_MOVING;
@@
-1833,7
+1833,7
@@
static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape)
byte action = tape->pos[i].action[0];
int k, num_moves = 0;
byte action = tape->pos[i].action[0];
int k, num_moves = 0;
- for (k
=
0; k<4; k++)
+ for (k
=
0; k<4; k++)
{
if (action & joy_dir[k])
{
{
if (action & joy_dir[k])
{
@@
-1862,7
+1862,7
@@
static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape)
tape->pos[i + 1].delay = 1;
/* delay part */
tape->pos[i + 1].delay = 1;
/* delay part */
- for
(j=0; j<
MAX_PLAYERS; j++)
+ for
(j = 0; j <
MAX_PLAYERS; j++)
tape->pos[i].action[j] = MV_NO_MOVING;
tape->pos[i].delay--;
tape->pos[i].action[j] = MV_NO_MOVING;
tape->pos[i].delay--;
@@
-2023,7
+2023,7
@@
static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape)
byte store_participating_players = 0;
/* set bits for participating players for compact storage */
byte store_participating_players = 0;
/* set bits for participating players for compact storage */
- for
(i=0; i<
MAX_PLAYERS; i++)
+ for
(i = 0; i <
MAX_PLAYERS; i++)
if (tape->player_participates[i])
store_participating_players |= (1 << i);
if (tape->player_participates[i])
store_participating_players |= (1 << i);
@@
-2046,7
+2046,7
@@
static void SaveTape_INFO(FILE *file, struct TapeInfo *tape)
putFile16BitBE(file, level_identifier_size);
putFile16BitBE(file, level_identifier_size);
- for
(i=
0; i < level_identifier_size; i++)
+ for
(i =
0; i < level_identifier_size; i++)
putFile8Bit(file, tape->level_identifier[i]);
putFile16BitBE(file, tape->level_nr);
putFile8Bit(file, tape->level_identifier[i]);
putFile16BitBE(file, tape->level_nr);
@@
-2056,9
+2056,9
@@
static void SaveTape_BODY(FILE *file, struct TapeInfo *tape)
{
int i, j;
{
int i, j;
- for
(i=0; i<
tape->length; i++)
+ for
(i = 0; i <
tape->length; i++)
{
{
- for
(j=0; j<
MAX_PLAYERS; j++)
+ for
(j = 0; j <
MAX_PLAYERS; j++)
if (tape->player_participates[j])
putFile8Bit(file, tape->pos[i].action[j]);
if (tape->player_participates[j])
putFile8Bit(file, tape->pos[i].action[j]);
@@
-2096,7
+2096,7
@@
void SaveTape(int level_nr)
tape.game_version = GAME_VERSION_ACTUAL;
/* count number of participating players */
tape.game_version = GAME_VERSION_ACTUAL;
/* count number of participating players */
- for
(i=0; i<
MAX_PLAYERS; i++)
+ for
(i = 0; i <
MAX_PLAYERS; i++)
if (tape.player_participates[i])
num_participating_players++;
if (tape.player_participates[i])
num_participating_players++;
@@
-2144,14
+2144,14
@@
void DumpTape(struct TapeInfo *tape)
printf("Level series identifier: '%s'\n", tape->level_identifier);
printf_line("-", 79);
printf("Level series identifier: '%s'\n", tape->level_identifier);
printf_line("-", 79);
- for
(i=0; i<
tape->length; i++)
+ for
(i = 0; i <
tape->length; i++)
{
if (i >= MAX_TAPELEN)
break;
printf("%03d: ", i);
{
if (i >= MAX_TAPELEN)
break;
printf("%03d: ", i);
- for
(j=0; j<
MAX_PLAYERS; j++)
+ for
(j = 0; j <
MAX_PLAYERS; j++)
{
if (tape->player_participates[j])
{
{
if (tape->player_participates[j])
{
@@
-2189,7
+2189,7
@@
void LoadScore(int level_nr)
FILE *file;
/* always start with reliable default values */
FILE *file;
/* always start with reliable default values */
- for
(i=0; i<
MAX_SCORE_ENTRIES; i++)
+ for
(i = 0; i <
MAX_SCORE_ENTRIES; i++)
{
strcpy(highscore[i].Name, EMPTY_PLAYER_NAME);
highscore[i].Score = 0;
{
strcpy(highscore[i].Name, EMPTY_PLAYER_NAME);
highscore[i].Score = 0;
@@
-2210,7
+2210,7
@@
void LoadScore(int level_nr)
return;
}
return;
}
- for
(i=0; i<
MAX_SCORE_ENTRIES; i++)
+ for
(i = 0; i <
MAX_SCORE_ENTRIES; i++)
{
fscanf(file, "%d", &highscore[i].Score);
fgets(line, MAX_LINE_LEN, file);
{
fscanf(file, "%d", &highscore[i].Score);
fgets(line, MAX_LINE_LEN, file);
@@
-2248,7
+2248,7
@@
void SaveScore(int level_nr)
fprintf(file, "%s\n\n", SCORE_COOKIE);
fprintf(file, "%s\n\n", SCORE_COOKIE);
- for
(i=0; i<
MAX_SCORE_ENTRIES; i++)
+ for
(i = 0; i <
MAX_SCORE_ENTRIES; i++)
fprintf(file, "%d %s\n", highscore[i].Score, highscore[i].Name);
fclose(file);
fprintf(file, "%d %s\n", highscore[i].Score, highscore[i].Name);
fclose(file);
@@
-2495,7
+2495,7
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME;
si->shortcut.toggle_pause = DEFAULT_KEY_TOGGLE_PAUSE;
si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME;
si->shortcut.toggle_pause = DEFAULT_KEY_TOGGLE_PAUSE;
- for (i
=0; i<
MAX_PLAYERS; i++)
+ for (i
= 0; i <
MAX_PLAYERS; i++)
{
si->input[i].use_joystick = FALSE;
si->input[i].joy.device_name=getStringCopy(getDeviceNameFromJoystickNr(i));
{
si->input[i].use_joystick = FALSE;
si->input[i].joy.device_name=getStringCopy(getDeviceNameFromJoystickNr(i));
@@
-2530,34
+2530,34
@@
static void decodeSetupFileHash(SetupFileHash *setup_file_hash)
/* global setup */
si = setup;
/* global setup */
si = setup;
- for (i
=0; i<
NUM_GLOBAL_SETUP_TOKENS; i++)
+ for (i
= 0; i <
NUM_GLOBAL_SETUP_TOKENS; i++)
setSetupInfo(global_setup_tokens, i,
getHashEntry(setup_file_hash, global_setup_tokens[i].text));
setup = si;
/* editor setup */
sei = setup.editor;
setSetupInfo(global_setup_tokens, i,
getHashEntry(setup_file_hash, global_setup_tokens[i].text));
setup = si;
/* editor setup */
sei = setup.editor;
- for (i
=0; i<
NUM_EDITOR_SETUP_TOKENS; i++)
+ for (i
= 0; i <
NUM_EDITOR_SETUP_TOKENS; i++)
setSetupInfo(editor_setup_tokens, i,
getHashEntry(setup_file_hash,editor_setup_tokens[i].text));
setup.editor = sei;
/* shortcut setup */
ssi = setup.shortcut;
setSetupInfo(editor_setup_tokens, i,
getHashEntry(setup_file_hash,editor_setup_tokens[i].text));
setup.editor = sei;
/* shortcut setup */
ssi = setup.shortcut;
- for (i
=0; i<
NUM_SHORTCUT_SETUP_TOKENS; i++)
+ for (i
= 0; i <
NUM_SHORTCUT_SETUP_TOKENS; i++)
setSetupInfo(shortcut_setup_tokens, i,
getHashEntry(setup_file_hash,shortcut_setup_tokens[i].text));
setup.shortcut = ssi;
/* player setup */
setSetupInfo(shortcut_setup_tokens, i,
getHashEntry(setup_file_hash,shortcut_setup_tokens[i].text));
setup.shortcut = ssi;
/* player setup */
- for (pnr
=0; pnr<
MAX_PLAYERS; pnr++)
+ for (pnr
= 0; pnr <
MAX_PLAYERS; pnr++)
{
char prefix[30];
sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, pnr + 1);
sii = setup.input[pnr];
{
char prefix[30];
sprintf(prefix, "%s%d", TOKEN_STR_PLAYER_PREFIX, pnr + 1);
sii = setup.input[pnr];
- for (i
=0; i<
NUM_PLAYER_SETUP_TOKENS; i++)
+ for (i
= 0; i <
NUM_PLAYER_SETUP_TOKENS; i++)
{
char full_token[100];
{
char full_token[100];
@@
-2570,14
+2570,14
@@
static void decodeSetupFileHash(SetupFileHash *setup_file_hash)
/* system setup */
syi = setup.system;
/* system setup */
syi = setup.system;
- for (i
=0; i<
NUM_SYSTEM_SETUP_TOKENS; i++)
+ for (i
= 0; i <
NUM_SYSTEM_SETUP_TOKENS; i++)
setSetupInfo(system_setup_tokens, i,
getHashEntry(setup_file_hash, system_setup_tokens[i].text));
setup.system = syi;
/* options setup */
soi = setup.options;
setSetupInfo(system_setup_tokens, i,
getHashEntry(setup_file_hash, system_setup_tokens[i].text));
setup.system = syi;
/* options setup */
soi = setup.options;
- for (i
=0; i<
NUM_OPTIONS_SETUP_TOKENS; i++)
+ for (i
= 0; i <
NUM_OPTIONS_SETUP_TOKENS; i++)
setSetupInfo(options_setup_tokens, i,
getHashEntry(setup_file_hash, options_setup_tokens[i].text));
setup.options = soi;
setSetupInfo(options_setup_tokens, i,
getHashEntry(setup_file_hash, options_setup_tokens[i].text));
setup.options = soi;
@@
-2633,7
+2633,7
@@
void SaveSetup()
/* global setup */
si = setup;
/* global setup */
si = setup;
- for (i
=0; i<
NUM_GLOBAL_SETUP_TOKENS; i++)
+ for (i
= 0; i <
NUM_GLOBAL_SETUP_TOKENS; i++)
{
/* just to make things nicer :) */
if (i == SETUP_TOKEN_PLAYER_NAME + 1 ||
{
/* just to make things nicer :) */
if (i == SETUP_TOKEN_PLAYER_NAME + 1 ||
@@
-2646,17
+2646,17
@@
void SaveSetup()
/* editor setup */
sei = setup.editor;
fprintf(file, "\n");
/* editor setup */
sei = setup.editor;
fprintf(file, "\n");
- for (i
=0; i<
NUM_EDITOR_SETUP_TOKENS; i++)
+ for (i
= 0; i <
NUM_EDITOR_SETUP_TOKENS; i++)
fprintf(file, "%s\n", getSetupLine(editor_setup_tokens, "", i));
/* shortcut setup */
ssi = setup.shortcut;
fprintf(file, "\n");
fprintf(file, "%s\n", getSetupLine(editor_setup_tokens, "", i));
/* shortcut setup */
ssi = setup.shortcut;
fprintf(file, "\n");
- for (i
=0; i<
NUM_SHORTCUT_SETUP_TOKENS; i++)
+ for (i
= 0; i <
NUM_SHORTCUT_SETUP_TOKENS; i++)
fprintf(file, "%s\n", getSetupLine(shortcut_setup_tokens, "", i));
/* player setup */
fprintf(file, "%s\n", getSetupLine(shortcut_setup_tokens, "", i));
/* player setup */
- for (pnr
=0; pnr<
MAX_PLAYERS; pnr++)
+ for (pnr
= 0; pnr <
MAX_PLAYERS; pnr++)
{
char prefix[30];
{
char prefix[30];
@@
-2664,20
+2664,20
@@
void SaveSetup()
fprintf(file, "\n");
sii = setup.input[pnr];
fprintf(file, "\n");
sii = setup.input[pnr];
- for (i
=0; i<
NUM_PLAYER_SETUP_TOKENS; i++)
+ for (i
= 0; i <
NUM_PLAYER_SETUP_TOKENS; i++)
fprintf(file, "%s\n", getSetupLine(player_setup_tokens, prefix, i));
}
/* system setup */
syi = setup.system;
fprintf(file, "\n");
fprintf(file, "%s\n", getSetupLine(player_setup_tokens, prefix, i));
}
/* system setup */
syi = setup.system;
fprintf(file, "\n");
- for (i
=0; i<
NUM_SYSTEM_SETUP_TOKENS; i++)
+ for (i
= 0; i <
NUM_SYSTEM_SETUP_TOKENS; i++)
fprintf(file, "%s\n", getSetupLine(system_setup_tokens, "", i));
/* options setup */
soi = setup.options;
fprintf(file, "\n");
fprintf(file, "%s\n", getSetupLine(system_setup_tokens, "", i));
/* options setup */
soi = setup.options;
fprintf(file, "\n");
- for (i
=0; i<
NUM_OPTIONS_SETUP_TOKENS; i++)
+ for (i
= 0; i <
NUM_OPTIONS_SETUP_TOKENS; i++)
fprintf(file, "%s\n", getSetupLine(options_setup_tokens, "", i));
fclose(file);
fprintf(file, "%s\n", getSetupLine(options_setup_tokens, "", i));
fclose(file);
@@
-2691,7
+2691,7
@@
void LoadCustomElementDescriptions()
SetupFileHash *setup_file_hash;
int i;
SetupFileHash *setup_file_hash;
int i;
- for (i
=0; i<
NUM_FILE_ELEMENTS; i++)
+ for (i
= 0; i <
NUM_FILE_ELEMENTS; i++)
{
if (element_info[i].custom_description != NULL)
{
{
if (element_info[i].custom_description != NULL)
{
@@
-2703,7
+2703,7
@@
void LoadCustomElementDescriptions()
if ((setup_file_hash = loadSetupFileHash(filename)) == NULL)
return;
if ((setup_file_hash = loadSetupFileHash(filename)) == NULL)
return;
- for (i
=0; i<
NUM_FILE_ELEMENTS; i++)
+ for (i
= 0; i <
NUM_FILE_ELEMENTS; i++)
{
char *token = getStringCat2(element_info[i].token_name, ".name");
char *value = getHashEntry(setup_file_hash, token);
{
char *token = getStringCat2(element_info[i].token_name, ".name");
char *value = getHashEntry(setup_file_hash, token);
@@
-2724,8
+2724,8
@@
void LoadSpecialMenuDesignSettings()
int i, j;
/* always start with reliable default values from default config */
int i, j;
/* always start with reliable default values from default config */
- for (i
=
0; image_config_vars[i].token != NULL; i++)
- for (j
=
0; image_config[j].token != NULL; j++)
+ for (i
=
0; image_config_vars[i].token != NULL; i++)
+ for (j
=
0; image_config[j].token != NULL; j++)
if (strcmp(image_config_vars[i].token, image_config[j].token) == 0)
*image_config_vars[i].value =
get_auto_parameter_value(image_config_vars[i].token,
if (strcmp(image_config_vars[i].token, image_config[j].token) == 0)
*image_config_vars[i].value =
get_auto_parameter_value(image_config_vars[i].token,
@@
-2735,7
+2735,7
@@
void LoadSpecialMenuDesignSettings()
return;
/* special case: initialize with default values that may be overwritten */
return;
/* special case: initialize with default values that may be overwritten */
- for (i
=
0; i < NUM_SPECIAL_GFX_ARGS; i++)
+ for (i
=
0; i < NUM_SPECIAL_GFX_ARGS; i++)
{
char *value_x = getHashEntry(setup_file_hash, "menu.draw_xoffset");
char *value_y = getHashEntry(setup_file_hash, "menu.draw_yoffset");
{
char *value_x = getHashEntry(setup_file_hash, "menu.draw_xoffset");
char *value_y = getHashEntry(setup_file_hash, "menu.draw_yoffset");
@@
-2750,7
+2750,7
@@
void LoadSpecialMenuDesignSettings()
}
/* read (and overwrite with) values that may be specified in config file */
}
/* read (and overwrite with) values that may be specified in config file */
- for (i
=
0; image_config_vars[i].token != NULL; i++)
+ for (i
=
0; image_config_vars[i].token != NULL; i++)
{
char *value = getHashEntry(setup_file_hash, image_config_vars[i].token);
{
char *value = getHashEntry(setup_file_hash, image_config_vars[i].token);
@@
-2792,7
+2792,7
@@
void LoadUserDefinedEditorElementList(int **elements, int *num_elements)
element_hash = newSetupFileHash();
element_hash = newSetupFileHash();
- for (i
=
0; i < NUM_FILE_ELEMENTS; i++)
+ for (i
=
0; i < NUM_FILE_ELEMENTS; i++)
setHashEntry(element_hash, element_info[i].token_name, itoa(i));
/* determined size may be larger than needed (due to unknown elements) */
setHashEntry(element_hash, element_info[i].token_name, itoa(i));
/* determined size may be larger than needed (due to unknown elements) */
@@
-2840,13
+2840,13
@@
void LoadUserDefinedEditorElementList(int **elements, int *num_elements)
#if 0
/* TEST-ONLY */
#if 0
/* TEST-ONLY */
- for (i
=
0; i < *num_elements; i++)
+ for (i
=
0; i < *num_elements; i++)
printf("editor: element '%s' [%d]\n",
element_info[(*elements)[i]].token_name, (*elements)[i]);
#endif
}
printf("editor: element '%s' [%d]\n",
element_info[(*elements)[i]].token_name, (*elements)[i]);
#endif
}
-static struct MusicFileInfo *get_music_file_info(char *basename)
+static struct MusicFileInfo *get_music_file_info(char *basename
, int music
)
{
SetupFileHash *setup_file_hash = NULL;
struct MusicFileInfo tmp_music_file_info, *new_music_file_info;
{
SetupFileHash *setup_file_hash = NULL;
struct MusicFileInfo tmp_music_file_info, *new_music_file_info;
@@
-2911,14
+2911,19
@@
static struct MusicFileInfo *get_music_file_info(char *basename)
/* ---------- music file info found ---------- */
/* ---------- music file info found ---------- */
+ memset(&tmp_music_file_info, 0, sizeof(struct MusicFileInfo));
+
for (i = 0; token_to_value_ptr[i].token != NULL; i++)
{
char *value = getHashEntry(setup_file_hash, token_to_value_ptr[i].token);
for (i = 0; token_to_value_ptr[i].token != NULL; i++)
{
char *value = getHashEntry(setup_file_hash, token_to_value_ptr[i].token);
- *token_to_value_ptr[i].value_ptr = getStringCopy(value); /* may be NULL */
+ *token_to_value_ptr[i].value_ptr =
+ getStringCopy(value != NULL ? value : UNKNOWN_NAME);
}
}
- new_music_file_info = checked_calloc(sizeof(struct MusicFileInfo));
+ tmp_music_file_info.music = music;
+
+ new_music_file_info = checked_malloc(sizeof(struct MusicFileInfo));
*new_music_file_info = tmp_music_file_info;
return new_music_file_info;
*new_music_file_info = tmp_music_file_info;
return new_music_file_info;
@@
-2928,6
+2933,7
@@
void LoadMusicInfo()
{
char *music_directory = getCustomMusicDirectory();
int num_music = getMusicListSize();
{
char *music_directory = getCustomMusicDirectory();
int num_music = getMusicListSize();
+ int num_music_noconf = 0;
DIR *dir;
struct dirent *dir_entry;
struct FileInfo *music;
DIR *dir;
struct dirent *dir_entry;
struct FileInfo *music;
@@
-2956,18
+2962,22
@@
void LoadMusicInfo()
new = &music_file_info;
new = &music_file_info;
- for (i
=
0; i < num_music; i++)
+ for (i
=
0; i < num_music; i++)
{
music = getMusicListEntry(i);
if (strcmp(music->filename, UNDEFINED_FILENAME) == 0)
continue;
{
music = getMusicListEntry(i);
if (strcmp(music->filename, UNDEFINED_FILENAME) == 0)
continue;
+ /* a configured file may be not recognized as music */
+ if (!FileIsMusic(music->filename))
+ continue;
+
#if 0
#if 0
- printf("::: -> '%s'\n", music->filename);
+ printf("::: -> '%s'
(configured)
\n", music->filename);
#endif
#endif
- *new = get_music_file_info(music->filename);
+ *new = get_music_file_info(music->filename
, i
);
if (*new != NULL)
new = &(*new)->next;
}
if (*new != NULL)
new = &(*new)->next;
}
@@
-2984,7
+2994,7
@@
void LoadMusicInfo()
boolean music_already_used = FALSE;
int i;
boolean music_already_used = FALSE;
int i;
- for (i
=
0; i < num_music; i++)
+ for (i
=
0; i < num_music; i++)
{
music = getMusicListEntry(i);
{
music = getMusicListEntry(i);
@@
-2998,16
+3008,18
@@
void LoadMusicInfo()
if (music_already_used)
continue;
if (music_already_used)
continue;
- if (!FileIs
Sound(basename) && !FileIs
Music(basename))
+ if (!FileIsMusic(basename))
continue;
#if 0
continue;
#if 0
- printf("::: -> '%s'\n", basename);
+ printf("::: -> '%s'
(found in directory)
\n", basename);
#endif
#endif
- *new = get_music_file_info(basename);
+ *new = get_music_file_info(basename
, MAP_NOCONF_MUSIC(num_music_noconf)
);
if (*new != NULL)
new = &(*new)->next;
if (*new != NULL)
new = &(*new)->next;
+
+ num_music_noconf++;
}
closedir(dir);
}
closedir(dir);
@@
-3019,16
+3031,16
@@
void LoadMusicInfo()
#endif
}
#endif
}
-void add_
demo_anim
(int element, int action, int direction, int delay,
- int *num_list_entries)
+void add_
helpanim_entry
(int element, int action, int direction, int delay,
+
int *num_list_entries)
{
{
- struct
Demo
AnimInfo *new_list_entry;
+ struct
Help
AnimInfo *new_list_entry;
(*num_list_entries)++;
(*num_list_entries)++;
-
demo_
anim_info =
- checked_realloc(
demo_
anim_info,
- *num_list_entries * sizeof(struct
Demo
AnimInfo));
- new_list_entry = &
demo_
anim_info[*num_list_entries - 1];
+
help
anim_info =
+ checked_realloc(
help
anim_info,
+ *num_list_entries * sizeof(struct
Help
AnimInfo));
+ new_list_entry = &
help
anim_info[*num_list_entries - 1];
new_list_entry->element = element;
new_list_entry->action = action;
new_list_entry->element = element;
new_list_entry->action = action;
@@
-3054,9
+3066,9
@@
void print_unknown_token_end(int token_nr)
Error(ERR_RETURN_LINE, "-");
}
Error(ERR_RETURN_LINE, "-");
}
-void Load
Demo
AnimInfo()
+void Load
Help
AnimInfo()
{
{
- char *filename = get
DemoAnimInfo
Filename();
+ char *filename = get
HelpAnim
Filename();
SetupFileList *setup_file_list, *list;
SetupFileHash *element_hash, *action_hash, *direction_hash;
int num_list_entries = 0;
SetupFileList *setup_file_list, *list;
SetupFileHash *element_hash, *action_hash, *direction_hash;
int num_list_entries = 0;
@@
-3069,28
+3081,28
@@
void LoadDemoAnimInfo()
SetupFileList *insert_ptr;
insert_ptr = setup_file_list =
SetupFileList *insert_ptr;
insert_ptr = setup_file_list =
- newSetupFileList(
demo_anim_info
_config[0].token,
-
demo_anim_info
_config[0].value);
+ newSetupFileList(
helpanim
_config[0].token,
+
helpanim
_config[0].value);
- for (i
=1; demo_anim_info
_config[i].token; i++)
+ for (i
= 1; helpanim
_config[i].token; i++)
insert_ptr = addListEntry(insert_ptr,
insert_ptr = addListEntry(insert_ptr,
-
demo_anim_info
_config[i].token,
-
demo_anim_info
_config[i].value);
+
helpanim
_config[i].token,
+
helpanim
_config[i].value);
}
element_hash = newSetupFileHash();
action_hash = newSetupFileHash();
direction_hash = newSetupFileHash();
}
element_hash = newSetupFileHash();
action_hash = newSetupFileHash();
direction_hash = newSetupFileHash();
- for (i
=
0; i < MAX_NUM_ELEMENTS; i++)
+ for (i
=
0; i < MAX_NUM_ELEMENTS; i++)
setHashEntry(element_hash, element_info[i].token_name, itoa(i));
setHashEntry(element_hash, element_info[i].token_name, itoa(i));
- for (i
=
0; i < NUM_ACTIONS; i++)
+ for (i
=
0; i < NUM_ACTIONS; i++)
setHashEntry(action_hash, element_action_info[i].suffix,
itoa(element_action_info[i].value));
/* do not store direction index (bit) here, but direction value! */
setHashEntry(action_hash, element_action_info[i].suffix,
itoa(element_action_info[i].value));
/* do not store direction index (bit) here, but direction value! */
- for (i
=
0; i < NUM_DIRECTIONS; i++)
+ for (i
=
0; i < NUM_DIRECTIONS; i++)
setHashEntry(direction_hash, element_direction_info[i].suffix,
itoa(1 << element_direction_info[i].value));
setHashEntry(direction_hash, element_direction_info[i].suffix,
itoa(1 << element_direction_info[i].value));
@@
-3102,7
+3114,7
@@
void LoadDemoAnimInfo()
if (strcmp(list->token, "end") == 0)
{
if (strcmp(list->token, "end") == 0)
{
- add_
demo_anim(-1
, -1, -1, -1, &num_list_entries);
+ add_
helpanim_entry(HELPANIM_LIST_NEXT
, -1, -1, -1, &num_list_entries);
continue;
}
continue;
}
@@
-3113,7
+3125,7
@@
void LoadDemoAnimInfo()
if (element_value != NULL)
{
/* element found */
if (element_value != NULL)
{
/* element found */
- add_
demo_anim(atoi(element_value), -1, -1, delay,
&num_list_entries);
+ add_
helpanim_entry(atoi(element_value), -1, -1, delay,
&num_list_entries);
continue;
}
continue;
}
@@
-3146,7
+3158,7
@@
void LoadDemoAnimInfo()
if (action_value != NULL)
{
/* action found */
if (action_value != NULL)
{
/* action found */
- add_
demo_anim
(atoi(element_value), atoi(action_value), -1, delay,
+ add_
helpanim_entry
(atoi(element_value), atoi(action_value), -1, delay,
&num_list_entries);
free(element_token);
&num_list_entries);
free(element_token);
@@
-3159,8
+3171,8
@@
void LoadDemoAnimInfo()
if (direction_value != NULL)
{
/* direction found */
if (direction_value != NULL)
{
/* direction found */
- add_
demo_anim
(atoi(element_value), -1, atoi(direction_value), delay,
- &num_list_entries);
+ add_
helpanim_entry
(atoi(element_value), -1, atoi(direction_value), delay,
+
&num_list_entries);
free(element_token);
continue;
free(element_token);
continue;
@@
-3196,8
+3208,8
@@
void LoadDemoAnimInfo()
if (direction_value != NULL)
{
/* direction found */
if (direction_value != NULL)
{
/* direction found */
- add_
demo_anim
(atoi(element_value), atoi(action_value),
- atoi(direction_value), delay, &num_list_entries);
+ add_
helpanim_entry
(atoi(element_value), atoi(action_value),
+
atoi(direction_value), delay, &num_list_entries);
free(element_token);
free(action_token);
free(element_token);
free(action_token);
@@
-3212,7
+3224,7
@@
void LoadDemoAnimInfo()
print_unknown_token_end(num_unknown_tokens);
print_unknown_token_end(num_unknown_tokens);
- add_
demo_anim(-999, -999, -999, -999
, &num_list_entries);
+ add_
helpanim_entry(HELPANIM_LIST_END, -1, -1, -1
, &num_list_entries);
freeSetupFileList(setup_file_list);
freeSetupFileHash(element_hash);
freeSetupFileList(setup_file_list);
freeSetupFileHash(element_hash);
@@
-3221,36
+3233,37
@@
void LoadDemoAnimInfo()
#if 0
/* TEST ONLY */
#if 0
/* TEST ONLY */
- for (i
=
0; i < num_list_entries; i++)
+ for (i
=
0; i < num_list_entries; i++)
printf("::: %d, %d, %d => %d\n",
printf("::: %d, %d, %d => %d\n",
-
demo_
anim_info[i].element,
-
demo_
anim_info[i].action,
-
demo_
anim_info[i].direction,
-
demo_
anim_info[i].delay);
+
help
anim_info[i].element,
+
help
anim_info[i].action,
+
help
anim_info[i].direction,
+
help
anim_info[i].delay);
#endif
}
#endif
}
-void Load
DemoAnimText
()
+void Load
HelpTextInfo
()
{
{
- char *filename = get
DemoAnim
TextFilename();
+ char *filename = get
Help
TextFilename();
int i;
int i;
- if (
demo_anim_text
!= NULL)
- freeSetupFileHash(
demo_anim_text
);
+ if (
helptext_info
!= NULL)
+ freeSetupFileHash(
helptext_info
);
- if ((
demo_anim_text
= loadSetupFileHash(filename)) == NULL)
+ if ((
helptext_info
= loadSetupFileHash(filename)) == NULL)
{
/* use reliable default values from static configuration */
{
/* use reliable default values from static configuration */
-
demo_anim_text
= newSetupFileHash();
+
helptext_info
= newSetupFileHash();
- for (i=0; demo_anim_text_config[i].token; i++)
- setHashEntry(demo_anim_text, demo_anim_text_config[i].token,
- demo_anim_text_config[i].value);
+ for (i = 0; helptext_config[i].token; i++)
+ setHashEntry(helptext_info,
+ helptext_config[i].token,
+ helptext_config[i].value);
}
#if 0
/* TEST ONLY */
}
#if 0
/* TEST ONLY */
- BEGIN_HASH_ITERATION(
demo_anim_text
, itr)
+ BEGIN_HASH_ITERATION(
helptext_info
, itr)
{
printf("::: '%s' => '%s'\n",
HASH_ITERATION_TOKEN(itr), HASH_ITERATION_VALUE(itr));
{
printf("::: '%s' => '%s'\n",
HASH_ITERATION_TOKEN(itr), HASH_ITERATION_VALUE(itr));