projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030416-2-src
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index d13c28716f8a8fea115d496ca301432267ca3060..36380f92eef55a65368f4c6447240adb6680d06d 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-97,7
+97,7
@@
static void setLevelInfoToDefaults()
for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
{
level.custom_element_successor[i] = EL_EMPTY_SPACE;
for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
{
level.custom_element_successor[i] = EL_EMPTY_SPACE;
- Properties
1[EL_CUSTOM_START + i
] = EP_BITMASK_DEFAULT;
+ Properties
[EL_CUSTOM_START + i][EP_BITFIELD_BASE
] = EP_BITMASK_DEFAULT;
}
BorderElement = EL_STEELWALL;
}
BorderElement = EL_STEELWALL;
@@
-337,7
+337,7
@@
static int LoadLevel_CUS1(FILE *file, int chunk_size, struct LevelInfo *level)
int properties = getFile32BitBE(file);
if (IS_CUSTOM_ELEMENT(element))
int properties = getFile32BitBE(file);
if (IS_CUSTOM_ELEMENT(element))
- Properties
1[element
] = properties;
+ Properties
[element][EP_BITFIELD_BASE
] = properties;
else
Error(ERR_WARN, "invalid custom element number %d", element);
}
else
Error(ERR_WARN, "invalid custom element number %d", element);
}
@@
-726,12
+726,12
@@
static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level,
{
int element = EL_CUSTOM_START + i;
{
int element = EL_CUSTOM_START + i;
- if (Properties
1[element
] != EP_BITMASK_DEFAULT)
+ if (Properties
[element][EP_BITFIELD_BASE
] != EP_BITMASK_DEFAULT)
{
if (check < num_changed_custom_elements)
{
putFile16BitBE(file, element);
{
if (check < num_changed_custom_elements)
{
putFile16BitBE(file, element);
- putFile32BitBE(file, Properties
1[element
]);
+ putFile32BitBE(file, Properties
[element][EP_BITFIELD_BASE
]);
}
check++;
}
check++;
@@
-813,7
+813,7
@@
void SaveLevel(int level_nr)
/* check for non-standard custom elements and calculate "CUS1" chunk size */
for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
/* check for non-standard custom elements and calculate "CUS1" chunk size */
for (i=0; i < NUM_CUSTOM_ELEMENTS; i++)
- if (Properties
1[EL_CUSTOM_START + i
] != EP_BITMASK_DEFAULT)
+ if (Properties
[EL_CUSTOM_START +i][EP_BITFIELD_BASE
] != EP_BITMASK_DEFAULT)
num_changed_custom_elements1++;
/* check for non-standard custom elements and calculate "CUS2" chunk size */
num_changed_custom_elements1++;
/* check for non-standard custom elements and calculate "CUS2" chunk size */