mirror of
https://git.do.srb2.org/STJr/UltimateZoneBuilder.git
synced 2024-11-27 06:02:11 +00:00
- Reset default drawing textures when map options are changed
- Fixed some minor bugs in the choice of default drawing textures
This commit is contained in:
parent
2485c5b184
commit
e62146f464
2 changed files with 24 additions and 13 deletions
|
@ -425,16 +425,19 @@ namespace CodeImp.DoomBuilder.Config
|
|||
}
|
||||
|
||||
// Pick the first FLOOR from the list.
|
||||
foreach(string s in General.Map.Data.FlatNames)
|
||||
if(!foundone)
|
||||
{
|
||||
if(s.StartsWith("FLOOR"))
|
||||
foreach(string s in General.Map.Data.FlatNames)
|
||||
{
|
||||
foundone = true;
|
||||
defaultfloortexture = s;
|
||||
break;
|
||||
if(s.StartsWith("FLOOR"))
|
||||
{
|
||||
foundone = true;
|
||||
defaultfloortexture = s;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Otherwise just pick the first
|
||||
if(!foundone)
|
||||
{
|
||||
|
@ -454,17 +457,20 @@ namespace CodeImp.DoomBuilder.Config
|
|||
defaultceiltexture = General.GetByIndex(General.Map.Map.Sectors, 0).CeilTexture;
|
||||
}
|
||||
|
||||
// Pick the first FLOOR from the list.
|
||||
foreach(string s in General.Map.Data.FlatNames)
|
||||
// Pick the first CEIL from the list.
|
||||
if(!foundone)
|
||||
{
|
||||
if(s.StartsWith("FLOOR"))
|
||||
foreach(string s in General.Map.Data.FlatNames)
|
||||
{
|
||||
foundone = true;
|
||||
defaultceiltexture = s;
|
||||
break;
|
||||
if(s.StartsWith("CEIL"))
|
||||
{
|
||||
foundone = true;
|
||||
defaultceiltexture = s;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Otherwise just pick the first
|
||||
if(!foundone)
|
||||
{
|
||||
|
|
|
@ -183,6 +183,11 @@ namespace CodeImp.DoomBuilder.Windows
|
|||
options.StrictPatches = strictpatches.Checked;
|
||||
options.CopyResources(datalocations.GetResources());
|
||||
|
||||
// Reset default drawing textures
|
||||
General.Settings.DefaultTexture = null;
|
||||
General.Settings.DefaultFloorTexture = null;
|
||||
General.Settings.DefaultCeilingTexture = null;
|
||||
|
||||
// Hide window
|
||||
this.DialogResult = DialogResult.OK;
|
||||
this.Close();
|
||||
|
|
Loading…
Reference in a new issue