projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup of EM engine cave size definition names
[rocksndiamonds.git]
/
src
/
game_em
/
logic.c
diff --git
a/src/game_em/logic.c
b/src/game_em/logic.c
index 6183555a4f7d1a19648817a1b4e37166aba96470..da397d56e98a1c38c23f508f26ea32b917b7c242 100644
(file)
--- a/
src/game_em/logic.c
+++ b/
src/game_em/logic.c
@@
-85,7
+85,7
@@
static boolean player_killed(struct PLAYER *ply)
if (lev.killed_out_of_time && setup.time_limit)
return TRUE;
if (lev.killed_out_of_time && setup.time_limit)
return TRUE;
- switch(cave[x][y-1])
+ switch
(cave[x][y-1])
{
case Xbug_1_n:
case Xbug_1_e:
{
case Xbug_1_n:
case Xbug_1_e:
@@
-106,7
+106,7
@@
static boolean player_killed(struct PLAYER *ply)
return TRUE;
}
return TRUE;
}
- switch(cave[x+1][y])
+ switch
(cave[x+1][y])
{
case Xbug_1_n:
case Xbug_1_e:
{
case Xbug_1_n:
case Xbug_1_e:
@@
-127,7
+127,7
@@
static boolean player_killed(struct PLAYER *ply)
return TRUE;
}
return TRUE;
}
- switch(cave[x][y+1])
+ switch
(cave[x][y+1])
{
case Xbug_1_n:
case Xbug_1_e:
{
case Xbug_1_n:
case Xbug_1_e:
@@
-148,7
+148,7
@@
static boolean player_killed(struct PLAYER *ply)
return TRUE;
}
return TRUE;
}
- switch(cave[x-1][y])
+ switch
(cave[x-1][y])
{
case Xbug_1_n:
case Xbug_1_e:
{
case Xbug_1_n:
case Xbug_1_e:
@@
-169,7
+169,7
@@
static boolean player_killed(struct PLAYER *ply)
return TRUE;
}
return TRUE;
}
- switch(cave[x][y])
+ switch
(cave[x][y])
{
case Xblank:
case Xacid_splash_e:
{
case Xblank:
case Xacid_splash_e:
@@
-202,7
+202,7
@@
static void kill_player(struct PLAYER *ply)
ply->alive = 0;
ply->alive = 0;
- switch(cave[x][y-1])
+ switch
(cave[x][y-1])
{
case Xbug_1_n:
case Xbug_1_e:
{
case Xbug_1_n:
case Xbug_1_e:
@@
-227,7
+227,7
@@
static void kill_player(struct PLAYER *ply)
break;
}
break;
}
- switch(cave[x+1][y])
+ switch
(cave[x+1][y])
{
case Xbug_1_n:
case Xbug_1_e:
{
case Xbug_1_n:
case Xbug_1_e:
@@
-252,7
+252,7
@@
static void kill_player(struct PLAYER *ply)
break;
}
break;
}
- switch(cave[x][y+1])
+ switch
(cave[x][y+1])
{
case Xbug_1_n:
case Xbug_1_e:
{
case Xbug_1_n:
case Xbug_1_e:
@@
-277,7
+277,7
@@
static void kill_player(struct PLAYER *ply)
break;
}
break;
}
- switch(cave[x-1][y])
+ switch
(cave[x-1][y])
{
case Xbug_1_n:
case Xbug_1_e:
{
case Xbug_1_n:
case Xbug_1_e:
@@
-302,7
+302,7
@@
static void kill_player(struct PLAYER *ply)
break;
}
break;
}
- switch(cave[x][y])
+ switch
(cave[x][y])
{
case Xexit_1:
case Xexit_2:
{
case Xexit_1:
case Xexit_2:
@@
-317,7
+317,7
@@
static void kill_player(struct PLAYER *ply)
break;
}
break;
}
- switch(cave[x][y])
+ switch
(cave[x][y])
{
#ifdef USE_CHANGED_ACID_STUFF
case Xacid_1:
{
#ifdef USE_CHANGED_ACID_STUFF
case Xacid_1:
@@
-357,7
+357,7
@@
static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
{
int element = cave[x][y];
{
int element = cave[x][y];
- switch(cave[x][y])
+ switch
(cave[x][y])
{
/* fire is released */
case Xblank:
{
/* fire is released */
case Xblank:
@@
-564,7
+564,7
@@
static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
if (dy)
break;
if (dy)
break;
- switch(cave[x+dx][y])
+ switch
(cave[x+dx][y])
{
case Xblank:
case Xacid_splash_e:
{
case Xblank:
case Xacid_splash_e:
@@
-603,7
+603,7
@@
static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
if (dy)
break;
if (dy)
break;
- switch(cave[x+dx][y])
+ switch
(cave[x+dx][y])
{
case Xblank:
case Xacid_splash_e:
{
case Xblank:
case Xacid_splash_e:
@@
-642,7
+642,7
@@
static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
if (dy)
break;
if (dy)
break;
- switch(cave[x+dx][y])
+ switch
(cave[x+dx][y])
{
case Xblank:
case Xacid_splash_e:
{
case Xblank:
case Xacid_splash_e:
@@
-681,7
+681,7
@@
static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
if (dy)
break;
if (dy)
break;
- switch(cave[x+dx][y])
+ switch
(cave[x+dx][y])
{
case Xblank:
case Xacid_splash_e:
{
case Xblank:
case Xacid_splash_e:
@@
-742,7
+742,7
@@
static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
break;
case Xballoon:
break;
case Xballoon:
- switch(cave[x+dx][y+dy])
+ switch
(cave[x+dx][y+dy])
{
case Xblank:
case Xacid_splash_e:
{
case Xblank:
case Xacid_splash_e:
@@
-789,7
+789,7
@@
static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
case Xandroid_2_s:
case Xandroid_1_w:
case Xandroid_2_w:
case Xandroid_2_s:
case Xandroid_1_w:
case Xandroid_2_w:
- switch(cave[x+dx][y+dy])
+ switch
(cave[x+dx][y+dy])
{
case Xblank:
case Xacid_splash_e:
{
case Xblank:
case Xacid_splash_e:
@@
-972,7
+972,7
@@
static boolean player_digfield(struct PLAYER *ply, int dx, int dy)
{
int element = cave[x][y];
{
int element = cave[x][y];
- switch(cave[x][y])
+ switch
(cave[x][y])
{
/* fire is pressed */
{
/* fire is pressed */
@@
-1228,7
+1228,7
@@
static void check_player(struct PLAYER *ply)
static void set_nearest_player_xy(int x, int y, int *dx, int *dy)
{
static void set_nearest_player_xy(int x, int y, int *dx, int *dy)
{
- int distance, distance_shortest =
EM_MAX_CAVE_WIDTH + EM_MAX_
CAVE_HEIGHT;
+ int distance, distance_shortest =
CAVE_WIDTH +
CAVE_HEIGHT;
int i;
/* default values if no players are alive anymore */
int i;
/* default values if no players are alive anymore */
@@
-6210,9
+6210,9
@@
void logic_1(void)
int start_check_nr;
int i;
int start_check_nr;
int i;
- cave =
C
ave;
- next =
N
ext;
- boom =
B
oom;
+ cave =
lev.c
ave;
+ next =
lev.n
ext;
+ boom =
lev.b
oom;
game_em.any_player_moving = FALSE;
game_em.any_player_snapping = FALSE;
game_em.any_player_moving = FALSE;
game_em.any_player_snapping = FALSE;
@@
-6266,15
+6266,15
@@
void logic_2(void)
{
int x, y;
{
int x, y;
- cave =
C
ave;
- next =
N
ext;
- boom =
B
oom;
+ cave =
lev.c
ave;
+ next =
lev.n
ext;
+ boom =
lev.b
oom;
seed = RandomEM;
score = 0;
seed = RandomEM;
score = 0;
- for (y = 1; y < HEIGHT - 1; y++)
- for (x = 0; x < WIDTH; x++)
+ for (y = 1; y <
CAVE_
HEIGHT - 1; y++)
+ for (x = 0; x <
CAVE_
WIDTH; x++)
handle_tile(x, y);
if (ply[0].alive || ply[1].alive || ply[2].alive || ply[3].alive)
handle_tile(x, y);
if (ply[0].alive || ply[1].alive || ply[2].alive || ply[3].alive)
@@
-6285,10
+6285,10
@@
void logic_2(void)
RandomEM = seed;
/* triple buffering */
RandomEM = seed;
/* triple buffering */
- void *temp =
C
ave;
-
Cave = N
ext;
-
Next = D
raw;
-
D
raw = temp;
+ void *temp =
lev.c
ave;
+
lev.cave = lev.n
ext;
+
lev.next = lev.d
raw;
+
lev.d
raw = temp;
}
void logic_3(void)
}
void logic_3(void)
@@
-6298,9
+6298,9
@@
void logic_3(void)
int count;
unsigned int random;
int count;
unsigned int random;
- cave =
C
ave;
- next =
N
ext;
- boom =
B
oom;
+ cave =
lev.c
ave;
+ next =
lev.n
ext;
+ boom =
lev.b
oom;
/* update variables */
/* update variables */
@@
-6334,8
+6334,8
@@
void logic_3(void)
for (count = lev.amoeba_time; count--;)
{
for (count = lev.amoeba_time; count--;)
{
- x = (random >> 10) % (WIDTH - 2);
- y = (random >> 20) % (HEIGHT - 2);
+ x = (random >> 10) % (
CAVE_
WIDTH - 2);
+ y = (random >> 20) % (
CAVE_
HEIGHT - 2);
Lamoeba(x, y);
Lamoeba(x, y);
@@
-6346,13
+6346,13
@@
void logic_3(void)
/* handle explosions */
/* handle explosions */
- for (y = 1; y < HEIGHT - 1; y++)
- for (x = 1; x < WIDTH - 1; x++)
+ for (y = 1; y <
CAVE_
HEIGHT - 1; y++)
+ for (x = 1; x <
CAVE_
WIDTH - 1; x++)
Lexplode(x, y);
/* triple buffering */
Lexplode(x, y);
/* triple buffering */
- for (y = 0; y < HEIGHT; y++)
- for (x = 0; x < WIDTH; x++)
-
Next[x][y] = C
ave[x][y];
+ for (y = 0; y <
CAVE_
HEIGHT; y++)
+ for (x = 0; x <
CAVE_
WIDTH; x++)
+
next[x][y] = c
ave[x][y];
}
}