projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added separate initial and runtime level structure definitions for EM engine
[rocksndiamonds.git]
/
src
/
tools.c
diff --git
a/src/tools.c
b/src/tools.c
index 651fbb164f3ec7a1efa72f87bddeab3ba0424829..3f8c3adf8c08ce6b85adb645b1b5dc848f98b58f 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-297,7
+297,7
@@
static int getLevelFromScreenY_RND(int sy)
static int getLevelFromScreenX_EM(int sx)
{
static int getLevelFromScreenX_EM(int sx)
{
- int level_xsize = level.native_em_level->
le
v->width;
+ int level_xsize = level.native_em_level->
ca
v->width;
int full_xsize = level_xsize * TILESIZE_VAR;
sx -= (full_xsize < SXSIZE ? (SXSIZE - full_xsize) / 2 : 0);
int full_xsize = level_xsize * TILESIZE_VAR;
sx -= (full_xsize < SXSIZE ? (SXSIZE - full_xsize) / 2 : 0);
@@
-314,7
+314,7
@@
static int getLevelFromScreenX_EM(int sx)
static int getLevelFromScreenY_EM(int sy)
{
static int getLevelFromScreenY_EM(int sy)
{
- int level_ysize = level.native_em_level->
le
v->height;
+ int level_ysize = level.native_em_level->
ca
v->height;
int full_ysize = level_ysize * TILESIZE_VAR;
sy -= (full_ysize < SYSIZE ? (SYSIZE - full_ysize) / 2 : 0);
int full_ysize = level_ysize * TILESIZE_VAR;
sy -= (full_ysize < SYSIZE ? (SYSIZE - full_ysize) / 2 : 0);
@@
-7751,11
+7751,11
@@
int map_element_EM_to_RND(int element_em)
void map_android_clone_elements_RND_to_EM(struct LevelInfo *level)
{
struct LevelInfo_EM *level_em = level->native_em_level;
void map_android_clone_elements_RND_to_EM(struct LevelInfo *level)
{
struct LevelInfo_EM *level_em = level->native_em_level;
- struct
LEVEL *lev = level_em->le
v;
+ struct
CAVE *cav = level_em->ca
v;
int i, j;
for (i = 0; i < TILE_MAX; i++)
int i, j;
for (i = 0; i < TILE_MAX; i++)
-
le
v->android_array[i] = Xblank;
+
ca
v->android_array[i] = Xblank;
for (i = 0; i < level->num_android_clone_elements; i++)
{
for (i = 0; i < level->num_android_clone_elements; i++)
{
@@
-7764,21
+7764,21
@@
void map_android_clone_elements_RND_to_EM(struct LevelInfo *level)
for (j = 0; em_object_mapping_list[j].element_em != -1; j++)
if (em_object_mapping_list[j].element_rnd == element_rnd)
for (j = 0; em_object_mapping_list[j].element_em != -1; j++)
if (em_object_mapping_list[j].element_rnd == element_rnd)
-
le
v->android_array[em_object_mapping_list[j].element_em] = element_em;
+
ca
v->android_array[em_object_mapping_list[j].element_em] = element_em;
}
}
void map_android_clone_elements_EM_to_RND(struct LevelInfo *level)
{
struct LevelInfo_EM *level_em = level->native_em_level;
}
}
void map_android_clone_elements_EM_to_RND(struct LevelInfo *level)
{
struct LevelInfo_EM *level_em = level->native_em_level;
- struct
LEVEL *lev = level_em->le
v;
+ struct
CAVE *cav = level_em->ca
v;
int i, j;
level->num_android_clone_elements = 0;
for (i = 0; i < TILE_MAX; i++)
{
int i, j;
level->num_android_clone_elements = 0;
for (i = 0; i < TILE_MAX; i++)
{
- int element_em =
le
v->android_array[i];
+ int element_em =
ca
v->android_array[i];
int element_rnd;
boolean element_found = FALSE;
int element_rnd;
boolean element_found = FALSE;