nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Improve the exclusion zone code

Browse Source 
I forgot to add the code to flip the exclusion zones when implementing them.
Also improve the zone coordinates so they're correct outside of map contents.
This commit is contained in:
Pasi Kallinen
2024-10-17 12:34:02 +03:00
parent 546c1101b0
commit 9e4b2c121b
1 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/sp_lev.c
View File

@@ -548,6 +548,7 @@ flip_level(
timer_element *timer;
boolean ball_active = FALSE, ball_fliparea = FALSE;
stairway *stway;
struct exclusion_zone *ez;
/* nothing to do unless (flp & 1) or (flp & 2) or both */
if ((flp & 3) == 0)
@@ -872,6 +873,28 @@ flip_level(
}
}
/* exclusion zones */
for (ez = sve.exclusion_zones; ez; ez = ez->next) {
if (flp & 1) {
ez->ly = FlipY(ez->ly);
ez->hy = FlipY(ez->hy);
if (ez->ly > ez->hy) {
itmp = ez->ly;
ez->ly = ez->hy;
ez->hy = itmp;
}
}
if (flp & 2) {
ez->lx = FlipX(ez->lx);
ez->hx = FlipX(ez->hx);
if (ez->lx > ez->hx) {
itmp = ez->lx;
ez->lx = ez->hx;
ez->hx = itmp;
}
}
}
if (extras) { /* for #wizfliplevel rather than during level creation */
/* flip hero location only if inside the flippable area */
if (inFlipArea(u.ux, u.uy)) {
@@ -5430,18 +5453,27 @@ lspo_exclusion(lua_State *L)
};
struct exclusion_zone *ez = (struct exclusion_zone *) alloc(sizeof *ez);
lua_Integer x1,y1,x2,y2;
coordxy a1,b1,a2,b2;
create_des_coder();
lcheck_param_table(L);
ez->zonetype = ez_types2i[get_table_option(L, "type", "teleport",
ez_types)];
get_table_region(L, "region", &x1, &y1, &x2, &y2, FALSE);
ez->lx = x1;
ez->ly = y1;
ez->hx = x2;
ez->hy = y2;
cvt_to_abscoord(&ez->lx, &ez->ly);
cvt_to_abscoord(&ez->hx, &ez->hy);
a1 = x1, b1 = y1;
a2 = x2, b2 = y2;
get_location_coord(&a1, &b1, ANY_LOC|NO_LOC_WARN, gc.coder->croom,
SP_COORD_PACK(a1, b1));
get_location_coord(&a2, &b2, ANY_LOC|NO_LOC_WARN, gc.coder->croom,
SP_COORD_PACK(a2, b2));
ez->lx = a1;
ez->ly = b1;
ez->hx = a2;
ez->hy = b2;
ez->next = sve.exclusion_zones;
sve.exclusion_zones = ez;
return 0;