projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed unused bitmaps from EM engine
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 16b2179131918569244e3aa315cc4dfb7b3bbcac..4590665ecfe94e65d9d87eb3f1dc765661f59bb8 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-3519,8
+3519,8
@@
static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
struct PLAYER **ply = level_em->ply;
int i, j, x, y;
struct PLAYER **ply = level_em->ply;
int i, j, x, y;
- lev->width = MIN(level->fieldx,
EM_MAX_CAVE
_WIDTH);
- lev->height = MIN(level->fieldy,
EM_MAX_CAVE
_HEIGHT);
+ lev->width = MIN(level->fieldx,
MAX_PLAYFIELD
_WIDTH);
+ lev->height = MIN(level->fieldy,
MAX_PLAYFIELD
_HEIGHT);
lev->time_seconds = level->time;
lev->required_initial = level->gems_needed;
lev->time_seconds = level->time;
lev->required_initial = level->gems_needed;
@@
-3576,33
+3576,23
@@
static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
// first fill the complete playfield with the default border element
for (y = 0; y < EM_MAX_CAVE_HEIGHT; y++)
for (x = 0; x < EM_MAX_CAVE_WIDTH; x++)
// first fill the complete playfield with the default border element
for (y = 0; y < EM_MAX_CAVE_HEIGHT; y++)
for (x = 0; x < EM_MAX_CAVE_WIDTH; x++)
- level_em->cave[x][y] = ZBORDER;
-
- if (BorderElement == EL_STEELWALL)
- {
- for (y = 0; y < lev->height + 2; y++)
- for (x = 0; x < lev->width + 2; x++)
- level_em->cave[x + 1][y + 1] = map_element_RND_to_EM(EL_STEELWALL);
- }
+ level_em->cave[x][y] = Zborder;
// then copy the real level contents from level file into the playfield
for (y = 0; y < lev->height; y++) for (x = 0; x < lev->width; x++)
{
int new_element = map_element_RND_to_EM(level->field[x][y]);
// then copy the real level contents from level file into the playfield
for (y = 0; y < lev->height; y++) for (x = 0; x < lev->width; x++)
{
int new_element = map_element_RND_to_EM(level->field[x][y]);
- int offset = (BorderElement == EL_STEELWALL ? 1 : 0);
- int xx = x + 1 + offset;
- int yy = y + 1 + offset;
if (level->field[x][y] == EL_AMOEBA_DEAD)
new_element = map_element_RND_to_EM(EL_AMOEBA_WET);
if (level->field[x][y] == EL_AMOEBA_DEAD)
new_element = map_element_RND_to_EM(EL_AMOEBA_WET);
- level_em->cave[x
x][y
y] = new_element;
+ level_em->cave[x
][
y] = new_element;
}
for (i = 0; i < MAX_PLAYERS; i++)
{
}
for (i = 0; i < MAX_PLAYERS; i++)
{
- ply[i]->x_initial =
0
;
- ply[i]->y_initial =
0
;
+ ply[i]->x_initial =
-1
;
+ ply[i]->y_initial =
-1
;
}
// initialize player positions and delete players from the playfield
}
// initialize player positions and delete players from the playfield
@@
-3611,22
+3601,13
@@
static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level)
if (ELEM_IS_PLAYER(level->field[x][y]))
{
int player_nr = GET_PLAYER_NR(level->field[x][y]);
if (ELEM_IS_PLAYER(level->field[x][y]))
{
int player_nr = GET_PLAYER_NR(level->field[x][y]);
- int offset = (BorderElement == EL_STEELWALL ? 1 : 0);
- int xx = x + 1 + offset;
- int yy = y + 1 + offset;
- ply[player_nr]->x_initial = x
x
;
- ply[player_nr]->y_initial = y
y
;
+ ply[player_nr]->x_initial = x;
+ ply[player_nr]->y_initial = y;
- level_em->cave[x
x][y
y] = map_element_RND_to_EM(EL_EMPTY);
+ level_em->cave[x
][
y] = map_element_RND_to_EM(EL_EMPTY);
}
}
}
}
-
- if (BorderElement == EL_STEELWALL)
- {
- lev->width += 2;
- lev->height += 2;
- }
}
static void CopyNativeLevel_EM_to_RND(struct LevelInfo *level)
}
static void CopyNativeLevel_EM_to_RND(struct LevelInfo *level)
@@
-3705,7
+3686,7
@@
static void CopyNativeLevel_EM_to_RND(struct LevelInfo *level)
// convert the playfield (some elements need special treatment)
for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
{
// convert the playfield (some elements need special treatment)
for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++)
{
- int new_element = map_element_EM_to_RND(level_em->cave[x
+ 1][y + 1
]);
+ int new_element = map_element_EM_to_RND(level_em->cave[x
][y
]);
if (new_element == EL_AMOEBA_WET && level->amoeba_speed == 0)
new_element = EL_AMOEBA_DEAD;
if (new_element == EL_AMOEBA_WET && level->amoeba_speed == 0)
new_element = EL_AMOEBA_DEAD;
@@
-3717,8
+3698,8
@@
static void CopyNativeLevel_EM_to_RND(struct LevelInfo *level)
{
// in case of all players set to the same field, use the first player
int nr = MAX_PLAYERS - i - 1;
{
// in case of all players set to the same field, use the first player
int nr = MAX_PLAYERS - i - 1;
- int jx = ply[nr]->x_initial
- 1
;
- int jy = ply[nr]->y_initial
- 1
;
+ int jx = ply[nr]->x_initial;
+ int jy = ply[nr]->y_initial;
if (jx != -1 && jy != -1)
level->field[jx][jy] = EL_PLAYER_1 + nr;
if (jx != -1 && jy != -1)
level->field[jx][jy] = EL_PLAYER_1 + nr;
@@
-8951,6
+8932,10
@@
static struct TokenInfo internal_setup_tokens[] =
TYPE_BOOLEAN,
&setup.internal.show_scaling_in_title, "show_scaling_in_title"
},
TYPE_BOOLEAN,
&setup.internal.show_scaling_in_title, "show_scaling_in_title"
},
+ {
+ TYPE_BOOLEAN,
+ &setup.internal.create_user_levelset, "create_user_levelset"
+ },
{
TYPE_BOOLEAN,
&setup.internal.menu_game, "menu_game"
{
TYPE_BOOLEAN,
&setup.internal.menu_game, "menu_game"
@@
-9324,6
+9309,7
@@
static void setSetupInfoToDefaults(struct SetupInfo *si)
si->internal.default_level_series = getStringCopy(UNDEFINED_LEVELSET);
si->internal.choose_from_top_leveldir = FALSE;
si->internal.show_scaling_in_title = TRUE;
si->internal.default_level_series = getStringCopy(UNDEFINED_LEVELSET);
si->internal.choose_from_top_leveldir = FALSE;
si->internal.show_scaling_in_title = TRUE;
+ si->internal.create_user_levelset = TRUE;
si->internal.default_window_width = WIN_XSIZE_DEFAULT;
si->internal.default_window_height = WIN_YSIZE_DEFAULT;
si->internal.default_window_width = WIN_XSIZE_DEFAULT;
si->internal.default_window_height = WIN_YSIZE_DEFAULT;