Editor: reload bitmap font after import

Author: ivan-mogilko

Editor/AGS.Editor/NativeProxy.cs

@@ -195,9 +195,9 @@ public void ImportSCIFont(string fileName, int fontSlot)
             _native.ImportSCIFont(fileName, fontSlot);
         }
 
-        public void ReloadTTFFont(int fontSlot)
+        public void ReloadFont(int fontSlot)
         {
-            _native.ReloadTTFFont(fontSlot);
+            _native.ReloadFont(fontSlot);
         }
 
         public void OnFontUpdated(Game game, int fontSlot, bool forceUpdate)

Editor/AGS.Editor/Panes/FontEditor.cs

@@ -82,7 +82,7 @@ private void ImportTTFFont(string fileName, string newTTFName, string newWFNName
                     {
                         Factory.AGSEditor.DeleteFileOnDiskAndSourceControl(newWFNName);
                     }
-                    Factory.NativeProxy.ReloadTTFFont(_item.ID);
+                    Factory.NativeProxy.ReloadFont(_item.ID);
                     _item.PointSize = fontSize;
                     _item.SizeMultiplier = 1;
                     _item.SourceFilename = Utilities.GetRelativeToProjectPath(fileName);
@@ -112,7 +112,7 @@ private void ImportWFNFont(string fileName, string newTTFName, string newWFNName
                 {
                     Factory.NativeProxy.ImportSCIFont(fileName, _item.ID);
                 }
-
+                Factory.NativeProxy.ReloadFont(_item.ID);
                 _item.PointSize = 0;
                 _item.SizeMultiplier = 1;
                 _item.SourceFilename = Utilities.GetRelativeToProjectPath(fileName);

Editor/AGS.Native/NativeMethods.cpp

@@ -238,11 +238,11 @@ namespace AGS
 			}
 		}
 
-    void NativeMethods::ReloadTTFFont(int fontSlot)
+    void NativeMethods::ReloadFont(int fontSlot)
     {
       if (!reload_font(fontSlot))
       {
-        throw gcnew AGSEditorException("Unable to load the TTF font file. The renderer was unable to load the font.");
+        throw gcnew AGSEditorException(String::Format("Unable to load font {0}. No supported font renderer was able to load the font.", fontSlot));
       }
     }
 

Editor/AGS.Native/NativeMethods.h

@@ -53,7 +53,7 @@ namespace AGS
 			void Shutdown();
 			Game^ ImportOldGameFile(String^ fileName);
 			void ImportSCIFont(String ^fileName, int fontSlot);
-      void ReloadTTFFont(int fontSlot);
+            void ReloadFont(int fontSlot);
             void OnGameFontUpdated(Game^ game, int fontSlot, bool forceUpdate);
 			Dictionary<int,Sprite^>^ LoadAllSpriteDimensions();
 			void LoadNewSpriteFile();