From 8db922737a2288d9ae785ee5842080f49e788051 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Thu, 1 Sep 2011 19:53:05 +0000 Subject: [PATCH] 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 --- polymer/eduke32/samples/trueror1.map | Bin 37850 -> 42078 bytes polymer/eduke32/source/astub.c | 47 +++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/polymer/eduke32/samples/trueror1.map b/polymer/eduke32/samples/trueror1.map index cf87f66a6cda2f883a2295948585a6464645aa2d..9a99e3fd213622890cf013d2e07203152cc56dd7 100644 GIT binary patch literal 42078 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 delta 11295 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 X>mb}^lh#rZ{=|U~Y-{N9gWLTdPUstI diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index 3db5381f3..93c478b54 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -216,6 +216,9 @@ static char spritepals[MAXSPRITES]; static uint8_t wallflag[MAXWALLS>>3]; #ifdef YAX_ENABLE +static char *yupdownwall[2] = {"upwall","downwall"}; +static char *YUPDOWNWALL[2] = {"UPWALL","DOWNWALL"}; + static uint8_t havebunch[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 { autospritehelp = !autospritehelp; @@ -11246,9 +11290,6 @@ void ExtCheckKeys(void) } while (0) #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) { int32_t n1 = wall[w1].point2, n2 = wall[w2].point2;