zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enable undo/redo in Mapster32 3d mode. Not incredibly well tested.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7301 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-01-12 00:21:40 +00:00
parent a8c613c995
commit a401dfed47
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
source/duke3d/src/astub.cpp
View file

@ -7201,21 +7201,7 @@ static void Keys2d(void)
} }
} }
searchsector = tcursectornum; searchsector = tcursectornum;
#if M32_UNDO
if (eitherCTRL && PRESSED_KEYSC(Z)) // CTRL+Z
{
if (eitherSHIFT)
{
if (map_undoredo(1)) message("Nothing to redo!");
else message("Redo: restored revision %d", map_revision-1);
}
else
{
if (map_undoredo(0)) message("Nothing to undo!");
else message("Undo: restored revision %d", map_revision-1);
}
}
#endif
if (keystatus[KEYSC_TAB]) //TAB if (keystatus[KEYSC_TAB]) //TAB
{ {
if (eitherCTRL) if (eitherCTRL)
@ -10692,6 +10678,7 @@ void ExtAnalyzeSprites(int32_t ourx, int32_t oury, int32_t oura, int32_t smoothr
static void Keys2d3d(void) static void Keys2d3d(void)
{ {
int32_t i; int32_t i;
#if M32_UNDO #if M32_UNDO
if (mapstate == NULL) if (mapstate == NULL)
{ {
@ -10774,6 +10761,26 @@ static void Keys2d3d(void)
if (PRESSED_KEYSC(P)) // Ctrl-P: Map playtesting if (PRESSED_KEYSC(P)) // Ctrl-P: Map playtesting
test_map(eitherALT); test_map(eitherALT);
if (PRESSED_KEYSC(Z)) // CTRL+Z
{
if (eitherSHIFT)
{
if (map_undoredo(1)) message("Nothing to redo!");
else message("Redo: restored revision %d", map_revision-1);
}
else
{
if (map_undoredo(0)) message("Nothing to undo!");
else message("Undo: restored revision %d", map_revision-1);
}
updatesectorz(pos.x, pos.y, pos.z, &cursectnum);
// kick the user back to 2d mode if the sector they were in was deleted by the undo/redo operation
if (cursectnum == -1 && (in3dmode() && !m32_is2d3dmode()))
keystatus[buildkeys[BK_MODE2D_3D]] = 1;
}
if (keystatus[KEYSC_S]) // S if (keystatus[KEYSC_S]) // S
{ {
if (levelname[0]) if (levelname[0])