Editor: move spritefile init after game load into a separate function

ivan-mogilko · Aug 15, 2024 · ab8f5db · ab8f5db
1 parent 9c09ae9
commit ab8f5db
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 22 deletions.
diff --git a/Editor/AGS.Editor/Tasks.cs b/Editor/AGS.Editor/Tasks.cs
@@ -129,6 +129,36 @@ public bool LoadGameFromDisk(string gameToLoad, bool interactive)
  SetDefaultValuesForNewFeatures(game);
  Utilities.EnsureStandardSubFoldersExist();
 
+ InitSpritesAfterGameLoad(game, errors);
+
+ // Process after game load operations
+ RecentGame recentGame = new RecentGame(game.Settings.GameName, gameDirectory);
+ if (Factory.AGSEditor.Settings.RecentGames.Contains(recentGame))
+ {
+ Factory.AGSEditor.Settings.RecentGames.Remove(recentGame);
+ }
+ Factory.AGSEditor.Settings.RecentGames.Insert(0, recentGame);
+
+ Factory.Events.OnGamePostLoad(game);
+
+ // WARNING: this is where the "global" Factory.AGSEditor.CurrentGame is set;
+ // any tasks and events that expect to reference it must be called after!
+ Factory.AGSEditor.RefreshEditorAfterGameLoad(game, errors);
+ if (needToSave)
+ {
+ Factory.AGSEditor.SaveGameFiles();
+ }
+
+ Factory.AGSEditor.ReportGameLoad(errors);
+ return true;
+ }
+
+ /// <summary>
+ /// Initializes sprite file after loading a new game.
+ /// Tests if the file exists and suggests to recreate if one is missing.
+ /// </summary>
+ private static void InitSpritesAfterGameLoad(Game game, CompileMessages errors)
+ {
  // Load the sprite file
  bool isNewSpriteFile = false;
  if (!File.Exists(Path.Combine(game.DirectoryPath, AGSEditor.SPRITE_FILE_NAME)))
@@ -155,27 +185,6 @@ public bool LoadGameFromDisk(string gameToLoad, bool interactive)
  if (!isNewSpriteFile)
  CreateNewSpriteFile();
  }
-
- // Process after game load operations
- RecentGame recentGame = new RecentGame(game.Settings.GameName, gameDirectory);
- if (Factory.AGSEditor.Settings.RecentGames.Contains(recentGame))
- {
- Factory.AGSEditor.Settings.RecentGames.Remove(recentGame);
- }
- Factory.AGSEditor.Settings.RecentGames.Insert(0, recentGame);
-
- Factory.Events.OnGamePostLoad(game);
-
- // WARNING: this is where the "global" Factory.AGSEditor.CurrentGame is set;
- // any tasks and events that expect to reference it must be called after!
- Factory.AGSEditor.RefreshEditorAfterGameLoad(game, errors);
- if (needToSave)
- {
- Factory.AGSEditor.SaveGameFiles();
- }
-
- Factory.AGSEditor.ReportGameLoad(errors);
- return true;
  }
 
  public static void CreateNewSpriteFile()

diff --git a/Editor/AGS.Native/agsnative.cpp b/Editor/AGS.Native/agsnative.cpp
@@ -2413,7 +2413,7 @@ Common::Bitmap *CreateNativeBitmap(System::Drawing::Bitmap^ bmp, int spriteImpor
  flags |= SPF_ALPHACHANNEL;
  if (tempsprite->GetColorDepth() == 32)
  {
- BitmapHelper::ReplaceAlphaWithRGBMask(tempsprite);
+ BitmapHelper::ReplaceZeroAlphaWithRGBMask(tempsprite);
  }
  }
  else if (tempsprite->GetColorDepth() == 32)