projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20021210-1-src
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index fd392ec8abec1d554c94246e2dc520a3f2fa7ea5..e0446de5604e47c9569087d904856e86b508b3d8 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-58,7
+58,7
@@
static void setLevelInfoToDefaults()
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] = Ur[x][y] = EL_
ERDREICH
;
+ Feld[x][y] = Ur[x][y] = EL_
SAND
;
level.time = 100;
level.gems_needed = 0;
level.time = 100;
level.gems_needed = 0;
@@
-67,7
+67,7
@@
static void setLevelInfoToDefaults()
level.time_wheel = 10;
level.time_light = 10;
level.time_timegate = 10;
level.time_wheel = 10;
level.time_light = 10;
level.time_timegate = 10;
- level.amoeba_content = EL_DIAM
ANT
;
+ level.amoeba_content = EL_DIAM
OND
;
level.double_speed = FALSE;
level.gravity = FALSE;
level.em_slippery_gems = FALSE;
level.double_speed = FALSE;
level.gravity = FALSE;
level.em_slippery_gems = FALSE;
@@
-90,11
+90,11
@@
static void setLevelInfoToDefaults()
level.yam_content[i][x][y] =
(i < STD_ELEMENT_CONTENTS ? EL_ROCK : EL_EMPTY);
level.yam_content[i][x][y] =
(i < STD_ELEMENT_CONTENTS ? EL_ROCK : EL_EMPTY);
- Feld[0][0] = Ur[0][0] = EL_PLAYER;
+ Feld[0][0] = Ur[0][0] = EL_PLAYER
1
;
Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_EXIT_CLOSED;
Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] =
Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_EXIT_CLOSED;
- BorderElement = EL_
BETON
;
+ BorderElement = EL_
STEELWALL
;
/* try to determine better author name than 'anonymous' */
if (strcmp(leveldir_current->author, ANONYMOUS_NAME) != 0)
/* try to determine better author name than 'anonymous' */
if (strcmp(leveldir_current->author, ANONYMOUS_NAME) != 0)
@@
-129,11
+129,15
@@
static void setLevelInfoToDefaults()
static int checkLevelElement(int element)
{
static int checkLevelElement(int element)
{
- if (element >=
EL_FIRST_RUNTIME
)
+ if (element >=
NUM_FILE_ELEMENTS
)
{
Error(ERR_WARN, "invalid level element %d", element);
{
Error(ERR_WARN, "invalid level element %d", element);
- element = EL_CHAR_
FRAGE
;
+ element = EL_CHAR_
QUESTION
;
}
}
+ else if (element == EL_PLAYER_OBSOLETE)
+ element = EL_PLAYER1;
+ else if (element == EL_KEY_OBSOLETE)
+ element = EL_KEY1;
return element;
}
return element;
}
@@
-292,7
+296,7
@@
static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level)
for(x=0; x<3; x++)
level->yam_content[i][x][y] = content_array[i][x][y];
}
for(x=0; x<3; x++)
level->yam_content[i][x][y] = content_array[i][x][y];
}
- else if (element == EL_
AMOEBE_BD
)
+ else if (element == EL_
BD_AMOEBA
)
{
level->amoeba_content = content_array[0][0][0];
}
{
level->amoeba_content = content_array[0][0][0];
}
@@
-574,7
+578,7
@@
static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
for(x=0; x<3; x++)
content_array[i][x][y] = level->yam_content[i][x][y];
}
for(x=0; x<3; x++)
content_array[i][x][y] = level->yam_content[i][x][y];
}
- else if (element == EL_
AMOEBE_BD
)
+ else if (element == EL_
BD_AMOEBA
)
{
num_contents = 1;
content_xsize = 1;
{
num_contents = 1;
content_xsize = 1;
@@
-672,7
+676,7
@@
void SaveLevel(int level_nr)
if (level.encoding_16bit_amoeba)
{
putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE);
if (level.encoding_16bit_amoeba)
{
putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE);
- SaveLevel_CNT2(file, &level, EL_
AMOEBE_BD
);
+ SaveLevel_CNT2(file, &level, EL_
BD_AMOEBA
);
}
fclose(file);
}
fclose(file);