diff options
author | Steven Noonan <steven@uplinklabs.net> | 2009-10-20 14:13:42 -0700 |
---|---|---|
committer | Steven Noonan <steven@uplinklabs.net> | 2009-10-20 14:13:42 -0700 |
commit | d6ea58e6f13e85f4121ab488c09721f6d388a977 (patch) | |
tree | 0eceed1e0820c08b3dc995002ccc32f112e084ba /crawl-ref/source/l_dgnbld.cc | |
parent | c0d232cd853f335b240b125380ed827f52c080ca (diff) | |
download | crawl-ref-d6ea58e6f13e85f4121ab488c09721f6d388a977.tar.gz crawl-ref-d6ea58e6f13e85f4121ab488c09721f6d388a977.zip |
cosmetic: strip trailing whitespace
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
Diffstat (limited to 'crawl-ref/source/l_dgnbld.cc')
-rw-r--r-- | crawl-ref/source/l_dgnbld.cc | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/crawl-ref/source/l_dgnbld.cc b/crawl-ref/source/l_dgnbld.cc index 2f3fd0816e..9071d95a95 100644 --- a/crawl-ref/source/l_dgnbld.cc +++ b/crawl-ref/source/l_dgnbld.cc @@ -16,17 +16,17 @@ static int dgn_grd_table(lua_State *ls) { MAP(ls, 1, map); - + map_def **mapref = clua_new_userdata<map_def *>(ls, MAPGRD_METATABLE); *mapref = map; - + return (1); } static int dgn_width(lua_State *ls) { MAP(ls, 1, map); - + lua_pushnumber(ls, map->map.width()); return (1); } @@ -34,7 +34,7 @@ static int dgn_width(lua_State *ls) static int dgn_height(lua_State *ls) { MAP(ls, 1, map); - + lua_pushnumber(ls, map->map.height()); return (1); } @@ -45,7 +45,7 @@ static void _clamp_to_bounds(int &x, int &y, bool edge_ok = false) x = std::min(std::max(x, X_BOUND_1 + edge_offset), X_BOUND_2 - edge_offset); y = std::min(std::max(y, Y_BOUND_1 + edge_offset), Y_BOUND_2 - edge_offset); } - + static int dgn_fill_area(lua_State *ls) { int x1 = luaL_checkint(ls, 1); @@ -53,18 +53,18 @@ static int dgn_fill_area(lua_State *ls) int x2 = luaL_checkint(ls, 3); int y2 = luaL_checkint(ls, 4); dungeon_feature_type feat = check_lua_feature(ls, 5); - + _clamp_to_bounds(x1, y1); _clamp_to_bounds(x2, y2); if (x2 < x1) std::swap(x1, x2); if (y2 < y1) std::swap(y1, y2); - + for (int y = y1; y <= y2; y++) for (int x = x1; x <= x2; x++) grd[x][y] = feat; - + return 0; } @@ -76,7 +76,7 @@ static int dgn_replace_area(lua_State *ls) int y2 = luaL_checkint(ls, 4); dungeon_feature_type search = check_lua_feature(ls, 5); dungeon_feature_type replace = check_lua_feature(ls, 6); - + // gracefully handle out of bound areas by truncating them. _clamp_to_bounds(x1, y1); _clamp_to_bounds(x2, y2); @@ -84,12 +84,12 @@ static int dgn_replace_area(lua_State *ls) std::swap(x1, x2); if (y2 < y1) std::swap(y1, y2); - + for (int y = y1; y <= y2; y++) for (int x = x1; x <= x2; x++) if (grd[x][y] == search) grd[x][y] = replace; - + return 0; } @@ -101,15 +101,15 @@ static int dgn_octa_room(lua_State *ls) int y2 = luaL_checkint(ls, 4); int oblique = luaL_checkint(ls, 5); dungeon_feature_type fill = check_lua_feature(ls, 6); - + spec_room sr; sr.tl.x = x1; sr.br.x = x2; sr.tl.y = y1; sr.br.y = y2; - + octa_room(sr, oblique, fill); - + return 0; } @@ -122,7 +122,7 @@ static int dgn_make_pillars(lua_State *ls) int big_radius = luaL_checkint(ls, 5); int pillar_radius = luaL_checkint(ls, 6); dungeon_feature_type fill = check_lua_feature(ls, 8); - + // [enne] The underscore is for DJGPP's brain damage. const float _PI = 3.14159265f; for (int n = 0; n < num; n++) @@ -130,16 +130,16 @@ static int dgn_make_pillars(lua_State *ls) float angle = n * 2 * _PI / (float)num; int x = (int)std::floor(std::cos(angle) * big_radius * scale_x + 0.5f); int y = (int)std::floor(std::sin(angle) * big_radius + 0.5f); - + lua_pushvalue(ls, 7); lua_pushnumber(ls, center_x + x); lua_pushnumber(ls, center_y + y); lua_pushnumber(ls, pillar_radius); lua_pushnumber(ls, fill); - + lua_call(ls, 4, 0); } - + return 0; } @@ -149,11 +149,11 @@ static int dgn_make_square(lua_State *ls) int center_y = luaL_checkint(ls, 2); int radius = std::abs(luaL_checkint(ls, 3)); dungeon_feature_type fill = check_lua_feature(ls, 4); - + for (int x = -radius; x <= radius; x++) for (int y = -radius; y <= radius; y++) grd[center_x + x][center_y + y] = fill; - + return 0; } @@ -163,12 +163,12 @@ static int dgn_make_rounded_square(lua_State *ls) int center_y = luaL_checkint(ls, 2); int radius = std::abs(luaL_checkint(ls, 3)); dungeon_feature_type fill = check_lua_feature(ls, 4); - + for (int x = -radius; x <= radius; x++) for (int y = -radius; y <= radius; y++) if (std::abs(x) != radius || std::abs(y) != radius) grd[center_x + x][center_y + y] = fill; - + return 0; } @@ -178,12 +178,12 @@ static int dgn_make_circle(lua_State *ls) int center_y = luaL_checkint(ls, 2); int radius = std::abs(luaL_checkint(ls, 3)); dungeon_feature_type fill = check_lua_feature(ls, 4); - + for (int x = -radius; x <= radius; x++) for (int y = -radius; y <= radius; y++) if (x * x + y * y < radius * radius) grd[center_x + x][center_y + y] = fill; - + return 0; } @@ -191,7 +191,7 @@ static int dgn_in_bounds(lua_State *ls) { int x = luaL_checkint(ls, 1); int y = luaL_checkint(ls, 2); - + lua_pushboolean(ls, in_bounds(x, y)); return 1; } @@ -204,7 +204,7 @@ static int dgn_replace_first(lua_State *ls) int dy = luaL_checkint(ls, 4); dungeon_feature_type search = check_lua_feature(ls, 5); dungeon_feature_type replace = check_lua_feature(ls, 6); - + _clamp_to_bounds(x, y); bool found = false; while (in_bounds(x, y)) @@ -215,11 +215,11 @@ static int dgn_replace_first(lua_State *ls) found = true; break; } - + x += dx; y += dy; } - + lua_pushboolean(ls, found); return 1; } @@ -228,7 +228,7 @@ static int dgn_replace_random(lua_State *ls) { dungeon_feature_type search = check_lua_feature(ls, 1); dungeon_feature_type replace = check_lua_feature(ls, 2); - + int x, y; do { @@ -236,9 +236,9 @@ static int dgn_replace_random(lua_State *ls) y = random2(GYM); } while (grd[x][y] != search); - + grd[x][y] = replace; - + return 0; } @@ -247,7 +247,7 @@ static int dgn_spotty_level(lua_State *ls) bool seeded = lua_toboolean(ls, 1); int iterations = luaL_checkint(ls, 2); bool boxy = lua_toboolean(ls, 3); - + spotty_level(seeded, iterations, boxy); return 0; } @@ -257,17 +257,17 @@ static int dgn_smear_feature(lua_State *ls) int iterations = luaL_checkint(ls, 1); bool boxy = lua_toboolean(ls, 2); dungeon_feature_type feat = check_lua_feature(ls, 3); - + int x1 = luaL_checkint(ls, 4); int y1 = luaL_checkint(ls, 5); int x2 = luaL_checkint(ls, 6); int y2 = luaL_checkint(ls, 7); - + _clamp_to_bounds(x1, y1, true); _clamp_to_bounds(x2, y2, true); - + smear_feature(iterations, boxy, feat, x1, y1, x2, y2); - + return 0; } @@ -278,7 +278,7 @@ static int dgn_count_feature_in_box(lua_State *ls) int x2 = luaL_checkint(ls, 3); int y2 = luaL_checkint(ls, 4); dungeon_feature_type feat = check_lua_feature(ls, 5); - + lua_pushnumber(ls, count_feature_in_box(x1, y1, x2, y2, feat)); return 1; } @@ -290,7 +290,7 @@ static int dgn_count_antifeature_in_box(lua_State *ls) int x2 = luaL_checkint(ls, 3); int y2 = luaL_checkint(ls, 4); dungeon_feature_type feat = check_lua_feature(ls, 5); - + lua_pushnumber(ls, count_antifeature_in_box(x1, y1, x2, y2, feat)); return 1; } @@ -300,7 +300,7 @@ static int dgn_count_neighbours(lua_State *ls) int x = luaL_checkint(ls, 1); int y = luaL_checkint(ls, 2); dungeon_feature_type feat = check_lua_feature(ls, 3); - + lua_pushnumber(ls, count_neighbours(x, y, feat)); return 1; } @@ -314,13 +314,13 @@ static int dgn_join_the_dots(lua_State *ls) // TODO enne - push map masks to lua? unsigned map_mask = MMT_VAULT; bool early_exit = lua_toboolean(ls, 5); - + coord_def from(from_x, from_y); coord_def to(to_x, to_y); - + bool ret = join_the_dots(from, to, map_mask, early_exit); lua_pushboolean(ls, ret); - + return 1; } @@ -330,11 +330,11 @@ static int dgn_fill_disconnected_zones(lua_State *ls) int from_y = luaL_checkint(ls, 2); int to_x = luaL_checkint(ls, 3); int to_y = luaL_checkint(ls, 4); - + dungeon_feature_type feat = check_lua_feature(ls, 5); - + process_disconnected_zones(from_x, from_y, to_x, to_y, true, feat); - + return 0; } |