From 71b0d0754db4049d4fd24d5cfa00a5f2b05e8cd7 Mon Sep 17 00:00:00 2001 From: MaxED Date: Fri, 23 Aug 2013 13:28:55 +0000 Subject: [PATCH] Fixed: acs script was not complied when the map was located in the root directory. Fixed "Snap Map Element to Grid" documentation. --- Help/gzdb/actions.html | 2 +- .../{mode_snapverts.html => mode_snapelements.html} | 0 Help/gzdb/features/features.html | 2 +- Source/Core/Compilers/AccCompiler.cs | 1 + Source/Plugins/BuilderModes/ClassicModes/SnapVerticesMode.cs | 2 +- 5 files changed, 4 insertions(+), 3 deletions(-) rename Help/gzdb/features/classic_modes/{mode_snapverts.html => mode_snapelements.html} (100%) diff --git a/Help/gzdb/actions.html b/Help/gzdb/actions.html index b8c342a4..724c810e 100644 --- a/Help/gzdb/actions.html +++ b/Help/gzdb/actions.html @@ -900,7 +900,7 @@ Opens the window, which lets user to change textures, which will be used in next drawing operations. -Snap Selected Map Elements to Grid +Snap Selected Map Elements to Grid
Snaps selected map elements to grid. diff --git a/Help/gzdb/features/classic_modes/mode_snapverts.html b/Help/gzdb/features/classic_modes/mode_snapelements.html similarity index 100% rename from Help/gzdb/features/classic_modes/mode_snapverts.html rename to Help/gzdb/features/classic_modes/mode_snapelements.html diff --git a/Help/gzdb/features/features.html b/Help/gzdb/features/features.html index cdd991f3..06e9c7a6 100644 --- a/Help/gzdb/features/features.html +++ b/Help/gzdb/features/features.html @@ -100,7 +100,7 @@
  • Draw Ellipse mode.
  • [new] Draw Curve mode.
  • Bridge mode.
  • -
  • Snap vertices mode.
  • +
  • Snap map elements mode.
  • [new] 3D floor indication (color can be changed in Preferences -> Appearance -> 3D Floors, the setting can be disabled in Preferences)
    diff --git a/Source/Core/Compilers/AccCompiler.cs b/Source/Core/Compilers/AccCompiler.cs index 34e87c4b..3b91bfbc 100644 --- a/Source/Core/Compilers/AccCompiler.cs +++ b/Source/Core/Compilers/AccCompiler.cs @@ -104,6 +104,7 @@ namespace CodeImp.DoomBuilder.Compilers args = args.Replace("%FS", sourcefile); args = args.Replace("%PT", this.tempdir.FullName); args = args.Replace("%PS", sourcedir); + args = args.Replace(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar); //mxd. This fixes include path when the map is in a root directory // Setup process info processinfo = new ProcessStartInfo(); diff --git a/Source/Plugins/BuilderModes/ClassicModes/SnapVerticesMode.cs b/Source/Plugins/BuilderModes/ClassicModes/SnapVerticesMode.cs index ed629a7c..ec92a842 100644 --- a/Source/Plugins/BuilderModes/ClassicModes/SnapVerticesMode.cs +++ b/Source/Plugins/BuilderModes/ClassicModes/SnapVerticesMode.cs @@ -34,7 +34,7 @@ namespace CodeImp.DoomBuilder.BuilderModes.ClassicModes //check things List things = General.Map.Map.GetMarkedThings(true); if (things.Count == 0) { - General.Interface.DisplayStatus(StatusType.Warning, "Select some map elements first!"); + General.Interface.DisplayStatus(StatusType.Warning, "Select any map element first!"); base.OnCancel(); General.Editing.ChangeMode(General.Editing.PreviousStableMode.Name); } else {