projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4691763
)
renamed constant
author
Holger Schemel
<info@artsoft.org>
Wed, 19 Feb 2020 15:10:06 +0000
(16:10 +0100)
committer
Holger Schemel
<info@artsoft.org>
Tue, 19 May 2020 16:19:58 +0000
(18:19 +0200)
src/game_em/cave.c
patch
|
blob
|
history
src/game_em/cave.h
patch
|
blob
|
history
src/game_em/convert.c
patch
|
blob
|
history
src/game_em/emerald.h
patch
|
blob
|
history
src/game_em/export.h
patch
|
blob
|
history
src/game_em/graphics.c
patch
|
blob
|
history
src/game_em/logic.c
patch
|
blob
|
history
src/game_em/main_em.h
patch
|
blob
|
history
src/game_em/reademc.c
patch
|
blob
|
history
src/tools.c
patch
|
blob
|
history
diff --git
a/src/game_em/cave.c
b/src/game_em/cave.c
index ed5dc9426101925efaffd6877b8bdf66d5fd8960..fc872e9c8b994838bf7f7b6a9a7882b9f6b61e21 100644
(file)
--- a/
src/game_em/cave.c
+++ b/
src/game_em/cave.c
@@
-76,7
+76,7
@@
void setLevelInfoToDefaults_EM(void)
for (j = 0; j < 8; j++)
cav.ball_array[i][j] = Cblank;
for (j = 0; j < 8; j++)
cav.ball_array[i][j] = Cblank;
- for (i = 0; i < TILE_MAX; i++)
+ for (i = 0; i <
GAME_
TILE_MAX; i++)
cav.android_array[i] = Cblank;
for (x = 0; x < CAVE_WIDTH; x++)
cav.android_array[i] = Cblank;
for (x = 0; x < CAVE_WIDTH; x++)
diff --git
a/src/game_em/cave.h
b/src/game_em/cave.h
index 59b795d81700e776885f2e1e7bd04e3ffdf470b3..0e3704d94ec75b3d1dd003f4f521edb20c142749 100644
(file)
--- a/
src/game_em/cave.h
+++ b/
src/game_em/cave.h
@@
-262,7
+262,7
@@
struct CAVE
short eater_array[8][9]; /* eater data */
short ball_array[8][8]; /* ball data */
short eater_array[8][9]; /* eater data */
short ball_array[8][8]; /* ball data */
- short android_array[
TILE_MAX];
/* android clone data */
+ short android_array[
GAME_TILE_MAX];
/* android clone data */
short cave[CAVE_WIDTH][CAVE_HEIGHT]; /* cave data */
};
short cave[CAVE_WIDTH][CAVE_HEIGHT]; /* cave data */
};
diff --git
a/src/game_em/convert.c
b/src/game_em/convert.c
index 9b4b75682c7c02f3b995750434769fef8a0b9b7b..9ebf6f4c825afcc395df46714d44120b9d5e084b 100644
(file)
--- a/
src/game_em/convert.c
+++ b/
src/game_em/convert.c
@@
-223,7
+223,7
@@
int map_em_element_C_to_X(int element_em_cave)
int map_em_element_X_to_C(int element_em_game)
{
int map_em_element_X_to_C(int element_em_game)
{
- static unsigned short map_reverse[TILE_MAX];
+ static unsigned short map_reverse[
GAME_
TILE_MAX];
static boolean map_reverse_initialized = FALSE;
if (!map_reverse_initialized)
static boolean map_reverse_initialized = FALSE;
if (!map_reverse_initialized)
@@
-231,7
+231,7
@@
int map_em_element_X_to_C(int element_em_game)
int i;
// return "Cblank" for all undefined elements in mapping array
int i;
// return "Cblank" for all undefined elements in mapping array
- for (i = 0; i < TILE_MAX; i++)
+ for (i = 0; i <
GAME_
TILE_MAX; i++)
map_reverse[i] = Cblank;
for (i = 0; i < CAVE_TILE_MAX; i++)
map_reverse[i] = Cblank;
for (i = 0; i < CAVE_TILE_MAX; i++)
@@
-240,7
+240,7
@@
int map_em_element_X_to_C(int element_em_game)
map_reverse_initialized = TRUE;
}
map_reverse_initialized = TRUE;
}
- if (element_em_game >= 0 && element_em_game < TILE_MAX)
+ if (element_em_game >= 0 && element_em_game <
GAME_
TILE_MAX)
{
int element_em_cave = map_reverse[element_em_game];
{
int element_em_cave = map_reverse[element_em_game];
@@
-360,7
+360,7
@@
void prepare_em_level(void)
for (j = 0; j < 8; j++)
lev.ball_array[i][j] = map[cav.ball_array[i][j]];
for (j = 0; j < 8; j++)
lev.ball_array[i][j] = map[cav.ball_array[i][j]];
- for (i = 0; i < TILE_MAX; i++)
+ for (i = 0; i <
GAME_
TILE_MAX; i++)
lev.android_array[i] = map[cav.android_array[i]];
/* determine number of players in this level */
lev.android_array[i] = map[cav.android_array[i]];
/* determine number of players in this level */
diff --git
a/src/game_em/emerald.h
b/src/game_em/emerald.h
index 581d8b8d1aa0d63ff4c4ff4c8e2323bb7696f1e3..0bb0993b34e9dc46312a9255c0f6dc77a0845b5f 100644
(file)
--- a/
src/game_em/emerald.h
+++ b/
src/game_em/emerald.h
@@
-543,7
+543,7
@@
enum
Ygrass_blank,
Ydirt_blank,
Ygrass_blank,
Ydirt_blank,
- TILE_MAX
+
GAME_
TILE_MAX
};
/* other definitions */
};
/* other definitions */
@@
-684,7
+684,7
@@
struct LOGIC
short eater_array[8][9]; /* eater data */
short ball_array[8][8]; /* ball data */
short eater_array[8][9]; /* eater data */
short ball_array[8][8]; /* ball data */
- short android_array[
TILE_MAX];
/* android clone data */
+ short android_array[
GAME_TILE_MAX];
/* android clone data */
short cavebuf[CAVE_BUFFER_WIDTH][CAVE_BUFFER_HEIGHT];
short nextbuf[CAVE_BUFFER_WIDTH][CAVE_BUFFER_HEIGHT];
short cavebuf[CAVE_BUFFER_WIDTH][CAVE_BUFFER_HEIGHT];
short nextbuf[CAVE_BUFFER_WIDTH][CAVE_BUFFER_HEIGHT];
diff --git
a/src/game_em/export.h
b/src/game_em/export.h
index b769d9dc10fba0cf64c3d5cc0b7fada874369aa7..4766101bbba223798c96361b7e77fd9575042749 100644
(file)
--- a/
src/game_em/export.h
+++ b/
src/game_em/export.h
@@
-93,7
+93,7
@@
struct EngineSnapshotInfo_EM
extern struct GlobalInfo_EM global_em_info;
extern struct GameInfo_EM game_em;
extern struct LevelInfo_EM native_em_level;
extern struct GlobalInfo_EM global_em_info;
extern struct GameInfo_EM game_em;
extern struct LevelInfo_EM native_em_level;
-extern struct GraphicInfo_EM graphic_info_em_object[TILE_MAX][8];
+extern struct GraphicInfo_EM graphic_info_em_object[
GAME_
TILE_MAX][8];
extern struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8];
extern struct EngineSnapshotInfo_EM engine_snapshot_em;
extern struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8];
extern struct EngineSnapshotInfo_EM engine_snapshot_em;
diff --git
a/src/game_em/graphics.c
b/src/game_em/graphics.c
index d1567b4a7e9356e9291ecd2eec2f4deaf5c9d11c..859fc298916b1b42926017fb16364d918b18dcb8 100644
(file)
--- a/
src/game_em/graphics.c
+++ b/
src/game_em/graphics.c
@@
-46,7
+46,7
@@
static int screen_tiles[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2];
static int crumbled_state[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2];
/* graphic info for game objects/frames and players/actions/frames */
static int crumbled_state[MAX_PLAYFIELD_WIDTH + 2][MAX_PLAYFIELD_HEIGHT + 2];
/* graphic info for game objects/frames and players/actions/frames */
-struct GraphicInfo_EM graphic_info_em_object[TILE_MAX][8];
+struct GraphicInfo_EM graphic_info_em_object[
GAME_
TILE_MAX][8];
struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8];
int getFieldbufferOffsetX_EM(void)
struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8];
int getFieldbufferOffsetX_EM(void)
diff --git
a/src/game_em/logic.c
b/src/game_em/logic.c
index 9e3b690f2a9c6b70127f3645faaeeafc770fc0bc..cd2028c9e97e56ccd905c4e5fc249379609be22d 100644
(file)
--- a/
src/game_em/logic.c
+++ b/
src/game_em/logic.c
@@
-20,7
+20,7
@@
static short **cave, **next, **boom;
static unsigned int seed;
static int score;
static unsigned int seed;
static int score;
-static const byte is_blank[TILE_MAX] =
+static const byte is_blank[
GAME_
TILE_MAX] =
{
[Xblank] = 1,
[Xsplash_e] = 1,
{
[Xblank] = 1,
[Xsplash_e] = 1,
@@
-35,7
+35,7
@@
static const byte is_blank[TILE_MAX] =
[Xfake_acid_8] = 1
};
[Xfake_acid_8] = 1
};
-static const byte is_blank_or_acid[TILE_MAX] =
+static const byte is_blank_or_acid[
GAME_
TILE_MAX] =
{
[Xblank] = 1,
[Xsplash_e] = 1,
{
[Xblank] = 1,
[Xsplash_e] = 1,
@@
-58,7
+58,7
@@
static const byte is_blank_or_acid[TILE_MAX] =
[Xacid_8] = 1
};
[Xacid_8] = 1
};
-static const byte is_fake_acid[TILE_MAX] =
+static const byte is_fake_acid[
GAME_
TILE_MAX] =
{
[Xfake_acid_1] = 1,
[Xfake_acid_2] = 1,
{
[Xfake_acid_1] = 1,
[Xfake_acid_2] = 1,
@@
-70,7
+70,7
@@
static const byte is_fake_acid[TILE_MAX] =
[Xfake_acid_8] = 1
};
[Xfake_acid_8] = 1
};
-static const byte is_amoeba[TILE_MAX] =
+static const byte is_amoeba[
GAME_
TILE_MAX] =
{
[Xfake_amoeba] = 1,
[Yfake_amoeba] = 1,
{
[Xfake_amoeba] = 1,
[Yfake_amoeba] = 1,
@@
-84,7
+84,7
@@
static const byte is_amoeba[TILE_MAX] =
[Xamoeba_8] = 1
};
[Xamoeba_8] = 1
};
-static const byte is_android_walkable[TILE_MAX] =
+static const byte is_android_walkable[
GAME_
TILE_MAX] =
{
[Xblank] = 1,
[Xsplash_e] = 1,
{
[Xblank] = 1,
[Xsplash_e] = 1,
diff --git
a/src/game_em/main_em.h
b/src/game_em/main_em.h
index 11341158a207f204abc1d4d549f8e91630ec8a37..ab135ec00b2f39826b98db474e4e60648d795c75 100644
(file)
--- a/
src/game_em/main_em.h
+++ b/
src/game_em/main_em.h
@@
-90,7
+90,7
@@
extern struct LOGIC lev;
extern struct PLAYER ply[MAX_PLAYERS];
extern struct LevelInfo_EM native_em_level;
extern struct PLAYER ply[MAX_PLAYERS];
extern struct LevelInfo_EM native_em_level;
-extern struct GraphicInfo_EM graphic_info_em_object[TILE_MAX][8];
+extern struct GraphicInfo_EM graphic_info_em_object[
GAME_
TILE_MAX][8];
extern struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8];
extern struct GameInfo_EM game_em;
extern struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8];
extern struct GameInfo_EM game_em;
diff --git
a/src/game_em/reademc.c
b/src/game_em/reademc.c
index 58733ee79cd13814828fa740b4d1de73fe92224b..62f9976fc321d7ffcf8bbb3fc2205ee28e557459 100644
(file)
--- a/
src/game_em/reademc.c
+++ b/
src/game_em/reademc.c
@@
-142,7
+142,7
@@
static void init_android_clone_table(short android_clone_bits)
boolean android_dynamite = (android_clone_bits & 4096) != 0;
int i;
boolean android_dynamite = (android_clone_bits & 4096) != 0;
int i;
- for (i = 0; i < TILE_MAX; i++)
+ for (i = 0; i <
GAME_
TILE_MAX; i++)
cav.android_array[i] = Cblank;
if (android_eater)
cav.android_array[i] = Cblank;
if (android_eater)
diff --git
a/src/tools.c
b/src/tools.c
index a5638485e4b365b529d8f697d37fe8e56f6c73ae..d7298fc11971b0c6d43d5c909b99f0531269de25 100644
(file)
--- a/
src/tools.c
+++ b/
src/tools.c
@@
-5736,7
+5736,7
@@
static struct Mapping_EM_to_RND_object
int action;
int direction;
}
int action;
int direction;
}
-em_object_mapping_list[TILE_MAX + 1] =
+em_object_mapping_list[
GAME_
TILE_MAX + 1] =
{
{
Zborder, FALSE, FALSE,
{
{
Zborder, FALSE, FALSE,
@@
-7740,7
+7740,7
@@
int map_element_RND_to_EM_cave(int element_rnd)
int map_element_EM_to_RND_cave(int element_em_cave)
{
int map_element_EM_to_RND_cave(int element_em_cave)
{
- static unsigned short mapping_EM_to_RND[TILE_MAX];
+ static unsigned short mapping_EM_to_RND[
GAME_
TILE_MAX];
static boolean mapping_initialized = FALSE;
if (!mapping_initialized)
static boolean mapping_initialized = FALSE;
if (!mapping_initialized)
@@
-7748,7
+7748,7
@@
int map_element_EM_to_RND_cave(int element_em_cave)
int i;
// return "EL_UNKNOWN" for all undefined elements in mapping array
int i;
// return "EL_UNKNOWN" for all undefined elements in mapping array
- for (i = 0; i < TILE_MAX; i++)
+ for (i = 0; i <
GAME_
TILE_MAX; i++)
mapping_EM_to_RND[i] = EL_UNKNOWN;
for (i = 0; em_object_mapping_list[i].element_em != -1; i++)
mapping_EM_to_RND[i] = EL_UNKNOWN;
for (i = 0; em_object_mapping_list[i].element_em != -1; i++)
@@
-7768,7
+7768,7
@@
int map_element_EM_to_RND_cave(int element_em_cave)
int map_element_EM_to_RND_game(int element_em_game)
{
int map_element_EM_to_RND_game(int element_em_game)
{
- static unsigned short mapping_EM_to_RND[TILE_MAX];
+ static unsigned short mapping_EM_to_RND[
GAME_
TILE_MAX];
static boolean mapping_initialized = FALSE;
if (!mapping_initialized)
static boolean mapping_initialized = FALSE;
if (!mapping_initialized)
@@
-7776,7
+7776,7
@@
int map_element_EM_to_RND_game(int element_em_game)
int i;
// return "EL_UNKNOWN" for all undefined elements in mapping array
int i;
// return "EL_UNKNOWN" for all undefined elements in mapping array
- for (i = 0; i < TILE_MAX; i++)
+ for (i = 0; i <
GAME_
TILE_MAX; i++)
mapping_EM_to_RND[i] = EL_UNKNOWN;
for (i = 0; em_object_mapping_list[i].element_em != -1; i++)
mapping_EM_to_RND[i] = EL_UNKNOWN;
for (i = 0; em_object_mapping_list[i].element_em != -1; i++)
@@
-7786,7
+7786,7
@@
int map_element_EM_to_RND_game(int element_em_game)
mapping_initialized = TRUE;
}
mapping_initialized = TRUE;
}
- if (element_em_game >= 0 && element_em_game < TILE_MAX)
+ if (element_em_game >= 0 && element_em_game <
GAME_
TILE_MAX)
return mapping_EM_to_RND[element_em_game];
Error(ERR_WARN, "invalid EM game element %d", element_em_game);
return mapping_EM_to_RND[element_em_game];
Error(ERR_WARN, "invalid EM game element %d", element_em_game);
@@
-7800,7
+7800,7
@@
void map_android_clone_elements_RND_to_EM(struct LevelInfo *level)
struct CAVE *cav = level_em->cav;
int i, j;
struct CAVE *cav = level_em->cav;
int i, j;
- for (i = 0; i < TILE_MAX; i++)
+ for (i = 0; i <
GAME_
TILE_MAX; i++)
cav->android_array[i] = Cblank;
for (i = 0; i < level->num_android_clone_elements; i++)
cav->android_array[i] = Cblank;
for (i = 0; i < level->num_android_clone_elements; i++)
@@
-7823,7
+7823,7
@@
void map_android_clone_elements_EM_to_RND(struct LevelInfo *level)
level->num_android_clone_elements = 0;
level->num_android_clone_elements = 0;
- for (i = 0; i < TILE_MAX; i++)
+ for (i = 0; i <
GAME_
TILE_MAX; i++)
{
int element_em_cave = cav->android_array[i];
int element_rnd;
{
int element_em_cave = cav->android_array[i];
int element_rnd;
@@
-8278,7
+8278,7
@@
unsigned int InitRND(int seed)
return InitEngineRandom_RND(seed);
}
return InitEngineRandom_RND(seed);
}
-static struct Mapping_EM_to_RND_object object_mapping[TILE_MAX];
+static struct Mapping_EM_to_RND_object object_mapping[
GAME_
TILE_MAX];
static struct Mapping_EM_to_RND_player player_mapping[MAX_PLAYERS][PLY_MAX];
static int get_effective_element_EM(int tile, int frame_em)
static struct Mapping_EM_to_RND_player player_mapping[MAX_PLAYERS][PLY_MAX];
static int get_effective_element_EM(int tile, int frame_em)
@@
-8624,7
+8624,7
@@
void InitGraphicInfo_EM(void)
int i, j, p;
// always start with reliable default values
int i, j, p;
// always start with reliable default values
- for (i = 0; i < TILE_MAX; i++)
+ for (i = 0; i <
GAME_
TILE_MAX; i++)
{
object_mapping[i].element_rnd = EL_UNKNOWN;
object_mapping[i].is_backside = FALSE;
{
object_mapping[i].element_rnd = EL_UNKNOWN;
object_mapping[i].is_backside = FALSE;
@@
-8673,7
+8673,7
@@
void InitGraphicInfo_EM(void)
MV_DIR_FROM_BIT(em_player_mapping_list[i].direction);
}
MV_DIR_FROM_BIT(em_player_mapping_list[i].direction);
}
- for (i = 0; i < TILE_MAX; i++)
+ for (i = 0; i <
GAME_
TILE_MAX; i++)
{
int element = object_mapping[i].element_rnd;
int action = object_mapping[i].action;
{
int element = object_mapping[i].element_rnd;
int action = object_mapping[i].action;
@@
-8938,7
+8938,7
@@
void InitGraphicInfo_EM(void)
}
}
}
}
- for (i = 0; i < TILE_MAX; i++)
+ for (i = 0; i <
GAME_
TILE_MAX; i++)
{
for (j = 0; j < 8; j++)
{
{
for (j = 0; j < 8; j++)
{