stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-06-03 10:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: .dbs map configuration was not loaded when loading a map by dragging a wad file on top of GZDB shortcut/executable.

Browse source
This commit is contained in:
MaxED 2014-03-20 13:04:28 +00:00
parent 9220d5df3b
commit 82b868e5f5
2 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/Core/General/General.cs
View file

@ -1110,13 +1110,11 @@ namespace CodeImp.DoomBuilder
[BeginAction("openmap")] [BeginAction("openmap")]
internal static void OpenMap() internal static void OpenMap()
{ {
OpenFileDialog openfile;
// Cancel volatile mode, if any // Cancel volatile mode, if any
General.Editing.DisengageVolatileMode(); General.Editing.DisengageVolatileMode();
// Open map file dialog // Open map file dialog
openfile = new OpenFileDialog(); OpenFileDialog openfile = new OpenFileDialog();
openfile.Filter = "Doom WAD Files (*.wad)|*.wad"; openfile.Filter = "Doom WAD Files (*.wad)|*.wad";
openfile.Title = "Open Map"; openfile.Title = "Open Map";
openfile.AddExtension = false; openfile.AddExtension = false;
@ -1207,8 +1205,6 @@ namespace CodeImp.DoomBuilder
// This opens the specified file // This opens the specified file
internal static void OpenMapFile(string filename, MapOptions options) internal static void OpenMapFile(string filename, MapOptions options)
{ {
OpenMapOptionsForm openmapwindow;
// Cancel volatile mode, if any // Cancel volatile mode, if any
General.Editing.DisengageVolatileMode(); General.Editing.DisengageVolatileMode();
@ -1216,10 +1212,7 @@ namespace CodeImp.DoomBuilder
if(General.AskSaveMap()) if(General.AskSaveMap())
{ {
// Open map options dialog // Open map options dialog
if(options != null) OpenMapOptionsForm openmapwindow = (options != null ? new OpenMapOptionsForm(filename, options) : new OpenMapOptionsForm(filename));
openmapwindow = new OpenMapOptionsForm(filename, options);
else
openmapwindow = new OpenMapOptionsForm(filename);
if(openmapwindow.ShowDialog(mainwindow) == DialogResult.OK) if(openmapwindow.ShowDialog(mainwindow) == DialogResult.OK)
OpenMapFileWithOptions(filename, openmapwindow.Options); OpenMapFileWithOptions(filename, openmapwindow.Options);

5
Source/Core/Windows/MainForm.cs
View file

@ -449,11 +449,12 @@ namespace CodeImp.DoomBuilder.Windows
{ {
bool showdialog = false; bool showdialog = false;
MapOptions options = new MapOptions(); MapOptions options = new MapOptions();
Configuration mapsettings;
// Any of the options already given? // Any of the options already given?
if(General.AutoLoadMap != null) if(General.AutoLoadMap != null)
{ {
Configuration mapsettings;
// Try to find existing options in the settings file // Try to find existing options in the settings file
string dbsfile = General.AutoLoadFile.Substring(0, General.AutoLoadFile.Length - 4) + ".dbs"; string dbsfile = General.AutoLoadFile.Substring(0, General.AutoLoadFile.Length - 4) + ".dbs";
if(File.Exists(dbsfile)) if(File.Exists(dbsfile))
@ -486,7 +487,7 @@ namespace CodeImp.DoomBuilder.Windows
if(showdialog) if(showdialog)
{ {
// Show open dialog // Show open dialog
General.OpenMapFile(General.AutoLoadFile, options); General.OpenMapFile(General.AutoLoadFile, null);
} }
else else
{ {