stjr/ZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git synced 2024-11-12 23:54:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged in GZDB r2478.

Browse source
This commit is contained in:
MascaraSnake 2016-01-23 09:40:17 +01:00
parent 76cf91e418
commit 287d1fe968
4 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Source/Core/Data/DataManager.cs
View file

@ -366,8 +366,7 @@ namespace CodeImp.DoomBuilder.Data
LoadSprites(); LoadSprites();
//mxd. Load MAPINFO. Should happen before parisng DECORATE //mxd. Load MAPINFO. Should happen before parisng DECORATE
Dictionary<int, string> spawnnums; Dictionary<int, string> spawnnums, doomednums;
Dictionary<int, string> doomednums;
LoadMapInfo(out spawnnums, out doomednums); LoadMapInfo(out spawnnums, out doomednums);
int thingcount = LoadDecorateThings(spawnnums, doomednums); int thingcount = LoadDecorateThings(spawnnums, doomednums);
@ -2083,6 +2082,13 @@ namespace CodeImp.DoomBuilder.Data
skyboxes = parser.Skyboxes; skyboxes = parser.Skyboxes;
} }
//mxd. This updates mapinfo class only
internal void ReloadMapInfoPartial()
{
Dictionary<int, string> spawnnums, doomednums;
LoadMapInfo(out spawnnums, out doomednums);
}
//mxd. This loads (Z)MAPINFO //mxd. This loads (Z)MAPINFO
private void LoadMapInfo(out Dictionary<int, string> spawnnums, out Dictionary<int, string> doomednums) private void LoadMapInfo(out Dictionary<int, string> spawnnums, out Dictionary<int, string> doomednums)
{ {

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

@ -1242,26 +1242,6 @@ namespace CodeImp.DoomBuilder
ChangeMapForm changemapwindow = new ChangeMapForm(map.FilePathName, map.Options); ChangeMapForm changemapwindow = new ChangeMapForm(map.FilePathName, map.Options);
if(changemapwindow.ShowDialog(mainwindow) != DialogResult.OK) return; if(changemapwindow.ShowDialog(mainwindow) != DialogResult.OK) return;
// If resources don't match, perform regular map loading
bool resourcesmismatch = changemapwindow.Options.Resources.Count != map.Options.Resources.Count;
if(!resourcesmismatch)
{
for(int i = 0; i < changemapwindow.Options.Resources.Count; i++)
{
if(changemapwindow.Options.Resources[i].location != map.Options.Resources[i].location)
{
resourcesmismatch = true;
break;
}
}
}
if(resourcesmismatch)
{
OpenMapFileWithOptions(map.FilePathName, changemapwindow.Options);
return;
}
// Display status // Display status
mainwindow.DisplayStatus(StatusType.Busy, "Switching to map '" + changemapwindow.Options.CurrentName + "'..."); mainwindow.DisplayStatus(StatusType.Busy, "Switching to map '" + changemapwindow.Options.CurrentName + "'...");
WriteLogLine("Switching to map '" + changemapwindow.Options.CurrentName + "'..."); WriteLogLine("Switching to map '" + changemapwindow.Options.CurrentName + "'...");

3
Source/Core/General/MapManager.cs
View file

@ -527,6 +527,9 @@ namespace CodeImp.DoomBuilder
// Sector textures may've been changed // Sector textures may've been changed
data.UpdateUsedTextures(); data.UpdateUsedTextures();
// This will update DataManager.mapinfo only
data.ReloadMapInfoPartial();
// Skybox may've been changed // Skybox may've been changed
data.SetupSkybox(); data.SetupSkybox();

1
Source/Core/Windows/ChangeMapForm.cs
View file

@ -198,6 +198,7 @@ namespace CodeImp.DoomBuilder.Windows
MapOptions newoptions = new MapOptions(mapsettings, mapslist.SelectedItems[0].Text, options.UseLongTextureNames); MapOptions newoptions = new MapOptions(mapsettings, mapslist.SelectedItems[0].Text, options.UseLongTextureNames);
newoptions.ConfigFile = options.ConfigFile; newoptions.ConfigFile = options.ConfigFile;
newoptions.ScriptCompiler = options.ScriptCompiler; newoptions.ScriptCompiler = options.ScriptCompiler;
newoptions.CopyResources(options.Resources);
options = newoptions; options = newoptions;
// Hide window // Hide window