BACKSPACE key in 3D mode now deletes a red-wall link when aimed at a wall or mask.

With script_expertmode enabled, SHIFT-BACKSPACE clears the upwall link and CTRL-
BACKSPACE the downwall link. These functions are useful because the automatic
nextwall determination code sometimes gets it wrong (not corrupting anything) or
if you want to vertically displace a sector attached to a higher or lower level.
Also add the exploding ceiling example to the TROR test map.

git-svn-id: https://svn.eduke32.com/eduke32@1997 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-09-01 19:53:05 +00:00
parent 99ce725b60
commit 8db922737a
2 changed files with 44 additions and 3 deletions

Binary file not shown.

View file

@ -216,6 +216,9 @@ static char spritepals[MAXSPRITES];
static uint8_t wallflag[MAXWALLS>>3]; static uint8_t wallflag[MAXWALLS>>3];
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
static char *yupdownwall[2] = {"upwall","downwall"};
static char *YUPDOWNWALL[2] = {"UPWALL","DOWNWALL"};
static uint8_t havebunch[YAX_MAXBUNCHES]; static uint8_t havebunch[YAX_MAXBUNCHES];
static int32_t *tempzar[YAX_MAXBUNCHES]; static int32_t *tempzar[YAX_MAXBUNCHES];
@ -5251,6 +5254,47 @@ static void Keys3d(void)
} }
} }
if (PRESSED_KEYSC(BS)) // backspace
{
if (AIMING_AT_WALL_OR_MASK)
{
#ifdef YAX_ENABLE
int16_t ynw, cf=-1;
if (eitherSHIFT && !eitherCTRL)
cf = 0;
else if (!eitherSHIFT && eitherCTRL)
cf = 1;
if (cf >= 0)
{
// clear TROR uplink/downlink
ynw = yax_getnextwall(searchwall, cf);
if (ynw >= 0)
{
yax_setnextwall(ynw, !cf, -1);
yax_setnextwall(searchwall, cf, -1);
}
message("Cleared wall %d's %s link to wall %d", searchwall, yupdownwall[cf], ynw);
}
else
#endif
if (!eitherSHIFT && !eitherCTRL)
{
int32_t nw = wall[searchwall].nextwall;
if ((unsigned)nw < (unsigned)numwalls)
{
wall[nw].nextsector = wall[nw].nextwall = -1;
wall[searchwall].nextsector = wall[searchwall].nextwall = -1;
message("Cleared connection between wall %d and %d", searchwall, nw);
}
}
}
}
if (PRESSED_KEYSC(F6)) //F6 if (PRESSED_KEYSC(F6)) //F6
{ {
autospritehelp = !autospritehelp; autospritehelp = !autospritehelp;
@ -11246,9 +11290,6 @@ void ExtCheckKeys(void)
} while (0) } while (0)
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
static char *yupdownwall[2] = {"upwall","downwall"};
static char *YUPDOWNWALL[2] = {"UPWALL","DOWNWALL"};
static int32_t walls_have_equal_endpoints(int32_t w1, int32_t w2) static int32_t walls_have_equal_endpoints(int32_t w1, int32_t w2)
{ {
int32_t n1 = wall[w1].point2, n2 = wall[w2].point2; int32_t n1 = wall[w1].point2, n2 = wall[w2].point2;