提交: deb8e826f6c400a0990adf8b60dbbc3d72f19b59 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• 修訂: deb8e826f6c400a0990adf8b60dbbc3d72f19b59 (tree)
• 時間: 2019-12-05 22:41:45
• 作者: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

fvar(38)が参照できないバグを修正
QuickLaunchでのキャラセレでスプライトの読み込みを毎フレーム試みようとする場合があったのを修正

Change Summary

• modified: src/bytecode.go
• modified: src/compiler.go
• modified: src/script.go

差異

--- a/src/bytecode.go
+++ b/src/bytecode.go
@@ -367,6 +367,9 @@ const (
 	OC_ex_groundangle
 	OC_ex_stagefrontedge
 	OC_ex_stagebackedge
+	OC_ex_const240p
+	OC_ex_const480p
+	OC_ex_const720p
 	OC_ex_gethitvar_animtype
 	OC_ex_gethitvar_airtype
 	OC_ex_gethitvar_groundtype
@@ -398,12 +401,7 @@ const (
 	OC_ex_gethitvar_fall_envshake_freq
 	OC_ex_gethitvar_fall_envshake_ampl
 	OC_ex_gethitvar_fall_envshake_phase
-)
-const (
-	OC_ex_const240p OpCode = iota + 100
-	OC_ex_const480p
-	OC_ex_const720p
-	OC_ailevelf // float version of AILevel
+	OC_ex_ailevelf // float version of AILevel
 )
 const (
 	NumVar     = OC_sysvar0 - OC_var0
@@ -979,8 +977,6 @@ func (be BytecodeExp) run(c *Char) BytecodeValue {
 			sys.bcStack.Swap()
 		case OC_ailevel:
 			sys.bcStack.PushI(int32(c.aiLevel()))
-		case OC_ailevelf:
-			sys.bcStack.PushF(c.aiLevel())
 		case OC_alive:
 			sys.bcStack.PushB(c.alive())
 		case OC_anim:
@@ -1590,6 +1586,8 @@ func (be BytecodeExp) run_ex(c *Char, i *int, oc *Char) {
 		*sys.bcStack.Top() = c.constp(640, sys.bcStack.Top().ToF())
 	case OC_ex_const720p:
 		*sys.bcStack.Top() = c.constp(960, sys.bcStack.Top().ToF())
+	case OC_ex_ailevelf:
+		sys.bcStack.PushF(c.aiLevel())
 	default:
 		sys.errLog.Printf("%v\n", be[*i-1])
 		c.panic()

--- a/src/compiler.go
+++ b/src/compiler.go
@@ -1151,7 +1151,7 @@ func (c *Compiler) expValue(out *BytecodeExp, in *string,
 	case "ailevel":
 		out.append(OC_ailevel)
 	case "ailevelf":
-		out.append(OC_ailevelf)
+		out.append(OC_ex_, OC_ex_ailevelf)
 	case "alive":
 		out.append(OC_alive)
 	case "anim":

--- a/src/script.go
+++ b/src/script.go
@@ -698,6 +698,7 @@ func systemScriptInit(l *lua.LState) {
 					var err error
 					c.sportrait, err = loadFromSff(file, sys.sel.sportrait[0], sys.sel.sportrait[1])
 					if err != nil {
+						c.sportrait = newSprite()
 						return nil
 					}
 					if len(c.pal) == 0 {
@@ -1112,6 +1113,9 @@ func systemScriptInit(l *lua.LState) {
 				LoadFile(&c.sprite, c.def, func(file string) error {
 					var err error
 					c.lportrait, err = loadFromSff(file, sys.sel.lportrait[0], sys.sel.lportrait[1])
+					if err != nil {
+						c.lportrait = newSprite()
+					}
 					c.vsportrait, err = loadFromSff(file, sys.sel.vsportrait[0], sys.sel.vsportrait[1])
 					if err != nil {
 						c.vsportrait = c.lportrait
@@ -1119,6 +1123,7 @@ func systemScriptInit(l *lua.LState) {
 					c.vportrait, err = loadFromSff(file, sys.sel.vportrait[0], sys.sel.vportrait[1])
 					if err != nil {
 						c.vportrait = c.lportrait
+						return nil
 					}
 					if len(c.pal) == 0 {
 						c.pal, _ = selectablePalettes(file)