Updater? What updater?

Build/Updater.ini

@@ -1,3 +0,0 @@
-URL http://devbuilds.drdteam.org/doombuilder2-gzdb/
-FileName Builder.exe
-UpdateName GZDoom_Builder-r[REVNUM].7z

Setup/zonebuilder_setup.iss

@@ -39,8 +39,6 @@ Source: Setup\dxwebsetup.exe; DestDir: {tmp}; Flags: dontcopy
 Source: Setup\vcredist_x86.exe; DestDir: {tmp}; Flags: dontcopy
 Source: Builder.exe; DestDir: {app}; Flags: ignoreversion
 Source: ZoneBuilder.default.cfg; DestDir: {app}; Flags: ignoreversion
-Source: Updater.exe; DestDir: {app}; Flags: ignoreversion
-Source: Updater.ini; DestDir: {app}; Flags: ignoreversion
 Source: Refmanual.chm; DestDir: {app}; Flags: ignoreversion
 Source: DevIL.dll; DestDir: {app}; Flags: ignoreversion
 Source: SharpCompress.3.5.dll; DestDir: {app}; Flags: ignoreversion

Source/Core/Config/ProgramConfiguration.cs

@@ -354,7 +354,7 @@ namespace CodeImp.DoomBuilder.Config
 				autoClearSideTextures = cfg.ReadSetting("autoclearsidetextures", true);
 				storeSelectedEditTab = cfg.ReadSetting("storeselectededittab", true);
                 maxbackups = cfg.ReadSetting("maxbackups", 3);
-                checkforupdates = cfg.ReadSetting("checkforupdates", false); //mxd
+                checkforupdates = false; //No update checking for Zone Builder
 				rendercomments = cfg.ReadSetting("rendercomments", true); //mxd
 				rendergrid = cfg.ReadSetting("rendergrid", true); //mxd
                 rendernightspath = cfg.ReadSetting("rendernightspath", true);
@@ -463,7 +463,7 @@ namespace CodeImp.DoomBuilder.Config
 			cfg.WriteSetting("autoclearsidetextures", autoClearSideTextures);
 			cfg.WriteSetting("storeselectededittab", storeSelectedEditTab);
             cfg.WriteSetting("maxbackups", maxbackups);
-            cfg.WriteSetting("checkforupdates", checkforupdates); //mxd
+            //cfg.WriteSetting("checkforupdates", checkforupdates); //mxd
 			cfg.WriteSetting("rendercomments", rendercomments); //mxd
 			cfg.WriteSetting("rendergrid", rendergrid); //mxd
             cfg.WriteSetting("rendernightspath", rendernightspath); //mxd

Source/Core/Controls/ScriptEditorControl.cs

@@ -108,6 +108,7 @@ namespace CodeImp.DoomBuilder.Controls
         private bool skiptextinsert; //mxd. Gross hacks
         private bool expandcodeblock; //mxd. More gross hacks
         private string highlightedword; //mxd
+        private Encoding encoding; //mxd
 
         #endregion
 
@@ -133,6 +134,9 @@ namespace CodeImp.DoomBuilder.Controls
             // Initialize
             InitializeComponent();
 
+            //mxd. ASCII with cyrillic support...
+            encoding = Encoding.GetEncoding(1251);
+
             // Script editor properties
             //TODO: use ScintillaNET properties instead when they become available
             scriptedit.DirectMessage(NativeMethods.SCI_SETBACKSPACEUNINDENTS, new IntPtr(1));
@@ -581,12 +585,12 @@ namespace CodeImp.DoomBuilder.Controls
 
         public byte[] GetText()
         {
-            return Encoding.ASCII.GetBytes(scriptedit.Text); //mxd TODO: other encodings?..
+            return encoding.GetBytes(scriptedit.Text); //mxd TODO: other encodings?..
         }
 
         public void SetText(byte[] text)
         {
-            scriptedit.Text = Encoding.ASCII.GetString(text); //mxd TODO: other encodings?..
+            scriptedit.Text = encoding.GetString(text); //mxd TODO: other encodings?..
         }
 
         //mxd
@@ -1300,10 +1304,18 @@ namespace CodeImp.DoomBuilder.Controls
                     }
                 }
             }
-            //mxd. Handle screenshot saving
-            else if (DelayedForm.ProcessSaveScreenshotAction((int)e.KeyData))
+            else
             {
-                skiptextinsert = true;
+                //mxd. Skip text insert when "save screenshot" action's keys are pressed
+                Actions.Action[] actions = General.Actions.GetActionsByKey((int)e.KeyData);
+                foreach (Actions.Action action in actions)
+                {
+                    if (action.ShortName == "savescreenshot" || action.ShortName == "saveeditareascreenshot")
+                    {
+                        skiptextinsert = true;
+                        return;
+                    }
+                }
             }
         }