Merge branch 'master' of https://github.com/Windblade-GR01/Ikemen-GO …

…into main
ikemen-engine · Nov 3, 2021 · 951d075 · 951d075
2 parents 3e4d5b4 + e86ee09
commit 951d075
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/build/build.cmd b/build/build.cmd
@@ -3,10 +3,6 @@ cd ..
 set CGO_ENABLED = 1
 set GOOS = windows
 
-echo Using Zig for compilation.
-set CC = zig cc
-set CCX = zig c++
-
 if not exist go.mod (
 	echo Missing dependencies, please run get.cmd
 	echo.

diff --git a/src/image.go b/src/image.go
@@ -961,7 +961,7 @@ func (s *Sprite) readV2(f *os.File, offset int64, datasize uint32) error {
 				px = pi.Pix
 			}
 		case 11, 12:
-			var ok bool
+			var ok bool = false
 			isPng = true
 
 			// Decode PNG image to RGBA
@@ -984,7 +984,7 @@ func (s *Sprite) readV2(f *os.File, offset int64, datasize uint32) error {
 		if !isPng {
 			s.SetPxl(px)
 		} else {
-			s.SetPng(rgba, int32(rect.Max.X-rect.Min.X), int32(rect.Max.Y-rect.Min.Y),)
+			s.SetPng(rgba, int32(rect.Max.X-rect.Min.X), int32(rect.Max.Y-rect.Min.Y))
 		}
 	}
 	return nil

diff --git a/src/script.go b/src/script.go
@@ -1694,6 +1694,7 @@ func systemScriptInit(l *lua.LState) {
 		if err != nil {
 			l.RaiseError(err.Error())
 		}
+		sys.runMainThreadTask()
 		l.Push(newUserData(l, sff))
 		return 1
 	})