Cleaning up the max sprite API and NewCanvas API().

PixelVision8 · Dec 14, 2019 · d94b952 · d94b952
1 parent b41d9cc
commit d94b952
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/Runners/PixelVision8/Runner/Editors/GameEditor.cs b/Runners/PixelVision8/Runner/Editors/GameEditor.cs
@@ -498,7 +498,7 @@ public int ColorsPerSprite()
         /// <returns></returns>
         public int MaxSpriteCount(int? total)
         {
-            if (total.HasValue) gameChip.MaxSpriteCount(total.Value);
+            if (total.HasValue) targetGame.spriteChip.maxSpriteCount = total.Value;
 
             return gameChip.MaxSpriteCount();
         }

diff --git a/SDK/Engine/Chips/Game/GameChip.cs b/SDK/Engine/Chips/Game/GameChip.cs
@@ -1502,9 +1502,9 @@ public int TotalSprites(bool ignoreEmpty = true)
         /// </summary>
         /// <param name="total"></param>
         /// <returns>Returns an int representing the total number of sprites on the screen at once.</returns>
-        public int MaxSpriteCount(int? total = null)
+        public int MaxSpriteCount()
         {
-            if (total.HasValue) spriteChip.maxSpriteCount = total.Value;
+//            if (total.HasValue) spriteChip.maxSpriteCount = total.Value;
 
             return spriteChip.maxSpriteCount;
         }

diff --git a/SDK/Engine/Chips/Game/LuaGameChip.cs b/SDK/Engine/Chips/Game/LuaGameChip.cs
@@ -173,6 +173,7 @@ public override void Reset()
             luaScript.Globals["PlaySound"] = new Action<int, int>(PlaySound);
             luaScript.Globals["PlayRawSound"] = new Action<string, int, float>(soundChip.PlayRawSound);
 
+            luaScript.Globals["IsChannelPlaying"] = new Func<int, bool>(IsChannelPlaying);
             luaScript.Globals["PlayPattern"] = new Action<int, bool>(PlayPattern);
             luaScript.Globals["PlayPatterns"] = new Action<int[], bool>(PlayPatterns);
             luaScript.Globals["PlaySong"] = new Action<int, bool, int>(PlaySong);
@@ -189,6 +190,7 @@ public override void Reset()
             luaScript.Globals["Sprites"] = new Func<int[], int, int[]>(Sprites);
             luaScript.Globals["SpriteSize"] = new Func<int?, int?, Point>(SpriteSize);
             luaScript.Globals["TotalSprites"] = new Func<bool, int>(TotalSprites);
+            luaScript.Globals["MaxSpriteCount"] = new Func<int>(MaxSpriteCount); 
 
             #endregion
 

diff --git a/SDK/Engine/Data/Canvas.cs b/SDK/Engine/Data/Canvas.cs
@@ -54,10 +54,10 @@ public Canvas(int width, int height, GameChip gameChip = null) : base(width, hei
             spriteSize = gameChip.SpriteSize();
         }
 
-        public void LinePattern(int a, int b)
+        public void LinePattern(int x, int y)
         {
-            linePattern.X = a;
-            linePattern.Y = b;
+            linePattern.X = x;
+            linePattern.Y = y;
         }
 
         public bool DrawCentered(bool? newValue = null)