Make Door action: door texture can now be defined in a game configuration.

Make Door action: door and track textures are now stored while the editor is running.
Edit Selection Mode: pasted geometry was not merged with the rest of the map if the selection was not modified before applying the mode.
This commit is contained in:
MaxED 2014-03-06 09:08:21 +00:00
parent f7f8c1e894
commit 6de11ea3b1
7 changed files with 16 additions and 3 deletions

View file

@ -69,6 +69,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
private Dictionary<Sector, string[]> selectedEffectLabels;
private Dictionary<Sector, string[]> unselectedEffectLabels;
//mxd. "Make Door" textures
private static string doortex = "-";
private static string tracktex = "-";
#endregion
#region ================== Properties
@ -1303,8 +1307,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
ICollection<Sector> orderedselection = General.Map.Map.GetSelectedSectors(true);
if(orderedselection.Count > 0)
{
string doortex = "";
string tracktex = General.Map.Config.MakeDoorTrack;
if(doortex == "-") doortex = General.Map.Config.MakeDoorDoor; //mxd
if(tracktex == "-") tracktex = General.Map.Config.MakeDoorTrack; //mxd
string floortex = null;
string ceiltex = null;
bool resetoffsets = true;