teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-16 01:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mapster32: disallow joining non-adjacent sectors when expert mode is disabled.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2753 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-06-13 23:13:15 +00:00
parent d8721f743e
commit 88d7a77fdc
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
polymer/eduke32/build/src/build.c
View file

@ -3811,7 +3811,7 @@ void overheadeditor(void)
if (SECTORFLD(highlightsector[i],z, cf) != thez) if (SECTORFLD(highlightsector[i],z, cf) != thez)
{ {
message("Sector %d's %s height doesn't match sector %d's\n", message("Sector %d's %s height doesn't match sector %d's",
highlightsector[i], cfs[cf], highlightsector[0]); highlightsector[i], cfs[cf], highlightsector[0]);
goto end_yax; goto end_yax;
} }
@ -5743,20 +5743,32 @@ end_point_dragging:
// v----------------v // v----------------v
if (s1to0wall == -1 && i != joinsector[0]) if (s1to0wall == -1 && i != joinsector[0])
{ {
int32_t good = 1;
#ifdef YAX_ENABLE #ifdef YAX_ENABLE
if (jbn[0][0]>=0 || jbn[0][1]>=0 || jbn[1][0]>=0 || jbn[1][1]>=0) if (jbn[0][0]>=0 || jbn[0][1]>=0 || jbn[1][0]>=0 || jbn[1][1]>=0)
{ {
message("Joining non-adjacent extended sectors not allowed!"); message("Joining non-adjacent extended sectors not allowed!");
good = 0;
}
#endif
if (!m32_script_expertmode)
{
message("Joining non-adjacent disabled in non-expert mode");
good = 0;
}
if (!good)
{
joinsector[0] = joinsector[1] = -1; joinsector[0] = joinsector[1] = -1;
goto end_join_sectors; goto end_join_sectors;
} }
#endif
{ {
fillsector(i, editorcolors[9]); fillsector(i, editorcolors[9]);
fillsector(joinsector[0], editorcolors[9]); fillsector(joinsector[0], editorcolors[9]);
fade_editor_screen(editorcolors[9]); fade_editor_screen(editorcolors[9]);
if (!ask_if_sure("Join non-adjacent sectors? (Y/N)", 0)) if (!ask_if_sure("Really join non-adjacent sectors? (Y/N)", 0))
joinsector[1] = joinsector[0]; joinsector[1] = joinsector[0];
} }
} }