Merge branch 'paxed-lua-merged3' into paxed-lua-v2-merged
This commit is contained in:
40
src/mkmap.c
40
src/mkmap.c
@@ -8,20 +8,20 @@
|
||||
#define HEIGHT (ROWNO - 1)
|
||||
#define WIDTH (COLNO - 2)
|
||||
|
||||
STATIC_DCL void FDECL(init_map, (SCHAR_P));
|
||||
STATIC_DCL void FDECL(init_fill, (SCHAR_P, SCHAR_P));
|
||||
STATIC_DCL schar FDECL(get_map, (int, int, SCHAR_P));
|
||||
STATIC_DCL void FDECL(pass_one, (SCHAR_P, SCHAR_P));
|
||||
STATIC_DCL void FDECL(pass_two, (SCHAR_P, SCHAR_P));
|
||||
STATIC_DCL void FDECL(pass_three, (SCHAR_P, SCHAR_P));
|
||||
STATIC_DCL void NDECL(wallify_map);
|
||||
STATIC_DCL void FDECL(join_map, (SCHAR_P, SCHAR_P));
|
||||
STATIC_DCL void FDECL(finish_map,
|
||||
static void FDECL(init_map, (SCHAR_P));
|
||||
static void FDECL(init_fill, (SCHAR_P, SCHAR_P));
|
||||
static schar FDECL(get_map, (int, int, SCHAR_P));
|
||||
static void FDECL(pass_one, (SCHAR_P, SCHAR_P));
|
||||
static void FDECL(pass_two, (SCHAR_P, SCHAR_P));
|
||||
static void FDECL(pass_three, (SCHAR_P, SCHAR_P));
|
||||
static void NDECL(wallify_map);
|
||||
static void FDECL(join_map, (SCHAR_P, SCHAR_P));
|
||||
static void FDECL(finish_map,
|
||||
(SCHAR_P, SCHAR_P, BOOLEAN_P, BOOLEAN_P, BOOLEAN_P));
|
||||
STATIC_DCL void FDECL(remove_room, (unsigned));
|
||||
static void FDECL(remove_room, (unsigned));
|
||||
void FDECL(mkmap, (lev_init *));
|
||||
|
||||
STATIC_OVL void
|
||||
static void
|
||||
init_map(bg_typ)
|
||||
schar bg_typ;
|
||||
{
|
||||
@@ -34,7 +34,7 @@ schar bg_typ;
|
||||
}
|
||||
}
|
||||
|
||||
STATIC_OVL void
|
||||
static void
|
||||
init_fill(bg_typ, fg_typ)
|
||||
schar bg_typ, fg_typ;
|
||||
{
|
||||
@@ -53,7 +53,7 @@ schar bg_typ, fg_typ;
|
||||
}
|
||||
}
|
||||
|
||||
STATIC_OVL schar
|
||||
static schar
|
||||
get_map(col, row, bg_typ)
|
||||
int col, row;
|
||||
schar bg_typ;
|
||||
@@ -66,7 +66,7 @@ schar bg_typ;
|
||||
static const int dirs[16] = { -1, -1 /**/, -1, 0 /**/, -1, 1 /**/, 0, -1 /**/,
|
||||
0, 1 /**/, 1, -1 /**/, 1, 0 /**/, 1, 1 };
|
||||
|
||||
STATIC_OVL void
|
||||
static void
|
||||
pass_one(bg_typ, fg_typ)
|
||||
schar bg_typ, fg_typ;
|
||||
{
|
||||
@@ -100,7 +100,7 @@ schar bg_typ, fg_typ;
|
||||
|
||||
#define new_loc(i, j) *(g.new_locations + ((j) * (WIDTH + 1)) + (i))
|
||||
|
||||
STATIC_OVL void
|
||||
static void
|
||||
pass_two(bg_typ, fg_typ)
|
||||
schar bg_typ, fg_typ;
|
||||
{
|
||||
@@ -124,7 +124,7 @@ schar bg_typ, fg_typ;
|
||||
levl[i][j].typ = new_loc(i, j);
|
||||
}
|
||||
|
||||
STATIC_OVL void
|
||||
static void
|
||||
pass_three(bg_typ, fg_typ)
|
||||
schar bg_typ, fg_typ;
|
||||
{
|
||||
@@ -248,7 +248,7 @@ boolean anyroom;
|
||||
* If we have drawn a map without walls, this allows us to
|
||||
* auto-magically wallify it. Taken from lev_main.c.
|
||||
*/
|
||||
STATIC_OVL void
|
||||
static void
|
||||
wallify_map()
|
||||
{
|
||||
int x, y, xx, yy;
|
||||
@@ -267,7 +267,7 @@ wallify_map()
|
||||
}
|
||||
}
|
||||
|
||||
STATIC_OVL void
|
||||
static void
|
||||
join_map(bg_typ, fg_typ)
|
||||
schar bg_typ, fg_typ;
|
||||
{
|
||||
@@ -340,7 +340,7 @@ joinm:
|
||||
}
|
||||
}
|
||||
|
||||
STATIC_OVL void
|
||||
static void
|
||||
finish_map(fg_typ, bg_typ, lit, walled, icedpools)
|
||||
schar fg_typ, bg_typ;
|
||||
boolean lit, walled, icedpools;
|
||||
@@ -413,7 +413,7 @@ int lx, ly, hx, hy;
|
||||
* level structure contents corresponding to roomno have already been reset.
|
||||
* Currently handles only the removal of rooms that have no subrooms.
|
||||
*/
|
||||
STATIC_OVL void
|
||||
static void
|
||||
remove_room(roomno)
|
||||
unsigned roomno;
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user