提交: 9e140f37a85e2800a17cccde72623e3d4d53dc28 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• 修订版: 9e140f37a85e2800a17cccde72623e3d4d53dc28 (tree)
• 时间: 2019-10-26 18:58:56
• 作者: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

Windblade氏の更新に対応

更改概述

• modified: script/options.lua
• modified: script/select.lua
• modified: src/bytecode.go
• modified: src/char.go
• modified: src/compiler.go
• modified: src/input.go
• modified: src/script.go
• modified: src/sound.go
• modified: src/system.go

差异

--- a/script/options.lua
+++ b/script/options.lua
@@ -397,9 +397,9 @@ function options.f_mainCfg()
 			elseif t[item].itemname == 'defaultvalues' then
 				sndPlay(motif.files.snd_data, motif.option_info.cursor_done_snd[1], motif.option_info.cursor_done_snd[2])
 				config.HelperMax = 56
-				config.PlayerProjectileMax = 50
-				config.ExplodMax = 256
-				config.AfterImageMax = 8
+				config.PlayerProjectileMax = 256
+				config.ExplodMax = 512
+				config.AfterImageMax = 128
 				config['Attack.LifeToPowerMul'] = 0.7
 				config['GetHit.LifeToPowerMul'] = 0.6
 				config.Width = 640

--- a/script/select.lua
+++ b/script/select.lua
@@ -827,7 +827,7 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 			end
 			--victory screen
 			if main.gameMode == 'arcade' or main.gameMode == 'teamcoop' or main.gameMode == 'netplayteamcoop' then
-				if main.t_selChars[t_p2Selected[1].cel + 1].winscreen == nil or main.t_selChars[t_p2Selected[1].cel + 1].winscreen == 1 then
+				if motif.victory_screen.enabled == 1 and (main.t_selChars[t_p2Selected[1].cel + 1].winscreen == nil or main.t_selChars[t_p2Selected[1].cel + 1].winscreen == 1) then
 					select.f_selectVictory()
 				end
 			end
@@ -869,7 +869,7 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 			looseCnt = looseCnt + 1
 			--victory screen
 			if main.gameMode == 'arcade' or main.gameMode == 'teamcoop' or main.gameMode == 'netplayteamcoop' then
-				if winner >= 1 and (main.t_selChars[t_p2Selected[1].cel + 1].winscreen == nil or main.t_selChars[t_p2Selected[1].cel + 1].winscreen == 1) then
+				if motif.victory_screen.enabled == 1 and winner >= 1 and (main.t_selChars[t_p2Selected[1].cel + 1].winscreen == nil or main.t_selChars[t_p2Selected[1].cel + 1].winscreen == 1) then
 					select.f_selectVictory()
 				end
 			end
@@ -890,7 +890,7 @@ getSpriteInfo('chars/kfm/kfm.sff', 0, 1)
 			--counter
 			looseCnt = looseCnt + 1
 			--victory screen
-			if winner >= 1 and (main.t_selChars[t_p2Selected[1].cel + 1].winscreen == nil or main.t_selChars[t_p2Selected[1].cel + 1].winscreen == 1) then
+			if motif.victory_screen.enabled == 1 and winner >= 1 and (main.t_selChars[t_p2Selected[1].cel + 1].winscreen == nil or main.t_selChars[t_p2Selected[1].cel + 1].winscreen == 1) then
 				select.f_selectVictory()
 			end
 			--continue screen
@@ -2540,12 +2540,9 @@ local txt_credits = main.f_createTextImg(
 )
 
 function select.f_continue()
-	main.f_resetBG(motif.continue_screen, motif.continuebgdef, motif.music.continue_bgm, motif.music.continue_bgm_loop, motif.music.continue_bgm_volume, motif.music.continue_bgm_loopstart, motif.music.continue_bgm_loopend)
-	animReset(motif.continue_screen.continue_anim_data)
-	animUpdate(motif.continue_screen.continue_anim_data)
 	continue = false
-	local text = main.f_extractText(motif.continue_screen.credits_text, main.credits)
-	textImgSetText(txt_credits, text[1])
+	playBGM(motif.music.continue_bgm, true, motif.music.continue_bgm_loop, motif.music.continue_bgm_volume, motif.music.continue_bgm_loopstart or "0", motif.music.continue_bgm_loopend or "0")
+	--textImgSetText(txt_credits, text[1])
 	main.f_cmdInput()
 	while true do
 		--draw clearcolor (disabled to not cover area)

--- a/src/bytecode.go
+++ b/src/bytecode.go
@@ -3704,6 +3704,7 @@ func (sc projectile) Run(c *Char, _ []int32) bool {
 			p.hits = exp[0].evalI(c)
 		case projectile_projpriority:
 			p.priority = exp[0].evalI(c)
+			p.priorityPoints = p.priority
 		case projectile_projhitanim:
 			p.hitanim = exp[0].evalI(c)
 		case projectile_projremanim:

--- a/src/char.go
+++ b/src/char.go
@@ -1103,7 +1103,7 @@ type Projectile struct {
 	hits            int32
 	misstime        int32
 	priority        int32
-	prioritypoint   int32
+	priorityPoints   int32
 	sprpriority     int32
 	edgebound       int32
 	stagebound      int32
@@ -1138,7 +1138,7 @@ func (p *Projectile) clear() {
 	*p = Projectile{id: IErr, hitanim: -1, remanim: IErr, cancelanim: IErr,
 		scale: [...]float32{1, 1}, clsnScale: [...]float32{1, 1}, remove: true, localscl: 1,
 		removetime: -1, velmul: [...]float32{1, 1}, hits: 1, priority: 1,
-		prioritypoint: 1, sprpriority: 3, edgebound: 40, stagebound: 40,
+		priorityPoints: 1, sprpriority: 3, edgebound: 40, stagebound: 40,
 		heightbound: [...]int32{-240, 1}, facing: 1, aimg: *newAfterImage(), platformFence: true}
 	p.hitdef.clear()
 }
@@ -1235,27 +1235,19 @@ func (p *Projectile) clsn(playerNo int) {
 	if p.ani == nil || len(p.ani.frames) == 0 {
 		return
 	}
-	cancel := func(prioritypoint *int32, priority int32, hits *int32,
-		oppprioritypoint int32) {
-		if oppprioritypoint > *prioritypoint || *hits <= 0 {
-			*hits = -2
-			return
-		}
-		if oppprioritypoint == *prioritypoint {
-			if *hits <= 1 {
-				*hits = -2
-			} else {
-				*hits = int32(int64(*hits)*3/4 - 1)
-				if *hits <= 0 {
-					(*prioritypoint)--
-				} else {
-					*prioritypoint = priority
-				}
-			}
+
+	cancel := func(priorityPoints *int32, hits *int32, oppPriorityPoints int32) {
+		if *priorityPoints > oppPriorityPoints {
+			(*priorityPoints)--
 		} else {
-			(*prioritypoint)--
+			(*hits)--
+		}
+
+		if *hits <= 0 {
+			*hits = -2
 		}
 	}
+
 	for i := 0; i < playerNo && p.hits >= 0; i++ {
 		for j, pr := range sys.projs[i] {
 			if pr.hits < 0 || pr.id < 0 || (pr.hitdef.affectteam != 0 &&
@@ -1269,9 +1261,11 @@ func (p *Projectile) clsn(playerNo int) {
 				[...]float32{pr.pos[0] * pr.localscl, pr.pos[1] * pr.localscl}, pr.facing,
 				clsn2, [...]float32{p.clsnScale[0] * p.localscl, p.clsnScale[1] * p.localscl},
 				[...]float32{p.pos[0] * p.localscl, p.pos[1] * p.localscl}, p.facing) {
-				opp, pp := &sys.projs[i][j], p.prioritypoint
-				cancel(&p.prioritypoint, p.priority, &p.hits, opp.prioritypoint)
-				cancel(&opp.prioritypoint, opp.priority, &opp.hits, pp)
+				
+				opp, pp := &sys.projs[i][j], p.priorityPoints
+				cancel(&p.priorityPoints, &p.hits, opp.priorityPoints)
+				cancel(&opp.priorityPoints, &opp.hits, pp)
+				
 				if p.hits < 0 {
 					break
 				}

--- a/src/compiler.go
+++ b/src/compiler.go
@@ -306,7 +306,9 @@ func (c *Compiler) operator(in *string) error {
 			if opp < 0 || ((!c.usiroOp || c.token[0] != '(') &&
 				(c.token[0] < 'A' || c.token[0] > 'Z') &&
 				(c.token[0] < 'a' || c.token[0] > 'z')) {
-				return Error(c.maeOp + "が不正です")
+				return Error(c.maeOp + "が不正です" +
+							" / " +
+							c.maeOp + " is invalid")
 			}
 			*in = c.token + " " + *in
 			c.token = c.maeOp
@@ -326,7 +328,9 @@ func (c *Compiler) integer2(in *string) (int32, error) {
 	}
 	for _, c := range istr {
 		if c < '0' || c > '9' {
-			return 0, Error(istr + "が整数でありません")
+			return 0, Error(istr + "が整数でありません" +
+							" / " +
+							istr + " is not an integer")
 		}
 	}
 	i := Atoi(istr)
@@ -384,7 +388,9 @@ func (c *Compiler) attr(text string, hitdef bool) (int32, error) {
 				(a < 'a' || a > 'z') {
 				return flg, nil
 			}
-			return 0, Error(string(a) + "が無効な値です")
+			return 0, Error(string(a) + "が無効な値です" +
+							" / " +
+							string(a) + " is an invalid value")
 		}
 	}
 	hitdefflg := flg
@@ -431,7 +437,9 @@ func (c *Compiler) attr(text string, hitdef bool) (int32, error) {
 				}
 				return flg, nil
 			}
-			return 0, Error(a + "が無効な値です")
+			return 0, Error(a + "が無効な値です" +
+							" / " +
+							a + " is an invalid value")
 		}
 		if i == 0 {
 			hitdefflg = flg
@@ -466,7 +474,9 @@ func (c *Compiler) trgAttr(in *string) (int32, error) {
 		case 'A', 'a':
 			flg |= int32(ST_A)
 		default:
-			return 0, Error(att + "が不正な属性値です")
+			return 0, Error(att + "が不正な属性値です" +
+							" / " +
+							att + " is an invalid attribute value")
 		}
 	}
 	for len(*in) > 0 && (*in)[0] == ',' {
@@ -521,7 +531,9 @@ func (c *Compiler) trgAttr(in *string) (int32, error) {
 }
 func (c *Compiler) kakkohiraku(in *string) error {
 	if c.tokenizer(in) != "(" {
-		return Error(c.token + "の次に'('がありません")
+		return Error(c.token + "の次に'('がありません" +
+						" / " +
+						"Missing '(' after " + c.token)
 	}
 	c.token = c.tokenizer(in)
 	return nil
@@ -529,7 +541,9 @@ func (c *Compiler) kakkohiraku(in *string) error {
 func (c *Compiler) kakkotojiru() error {
 	c.usiroOp = true
 	if c.token != ")" {
-		return Error(c.token + "の前に')'がありません")
+		return Error(c.token + "の前に')'がありません" +
+					" / " + 
+					"There is no ')' before " + c.token)
 	}
 	return nil
 }
@@ -549,7 +563,9 @@ func (c *Compiler) kyuushiki(in *string) (not bool, err error) {
 				continue
 			}
 		}
-		return false, Error("'='か'!='がありません")
+		return false, Error("'='か'!='がありません" +
+							" / " +
+							"Missing '=' or '! ='")
 	}
 	c.token = c.tokenizer(in)
 	return
@@ -562,7 +578,9 @@ func (c *Compiler) intRange(in *string) (minop OpCode, maxop OpCode,
 	case "[":
 		minop = OC_ge
 	default:
-		err = Error("'['か'('がありません")
+		err = Error("'['か'('がありません" +
+					" / " +
+					"Missing '[' or '('")
 		return
 	}
 	var intf func(in *string) (int32, error)
@@ -575,7 +593,9 @@ func (c *Compiler) intRange(in *string) (minop OpCode, maxop OpCode,
 				c.token = c.tokenizer(in)
 			}
 			if len(c.token) == 0 || c.token[0] < '0' || c.token[0] > '9' {
-				return 0, Error("数字の読み込みエラーです")
+				return 0, Error("数字の読み込みエラーです" +
+								" / " +
+								"Error reading number")
 			}
 			i := Atoi(c.token)
 			if minus {
@@ -598,7 +618,9 @@ func (c *Compiler) intRange(in *string) (minop OpCode, maxop OpCode,
 		c.token = c.tokenizer(in)
 	}
 	if c.token != "," {
-		err = Error("','がありません")
+		err = Error("','がありません" +
+					" / " +
+					"There is not ','")
 		return
 	}
 	if max, err = intf(in); err != nil {
@@ -618,7 +640,9 @@ func (c *Compiler) intRange(in *string) (minop OpCode, maxop OpCode,
 	case "]":
 		maxop = OC_le
 	default:
-		err = Error("']'か')'がありません")
+		err = Error("']'か')'がありません" +
+					" / " +
+					"Missing ']' or ')'")
 		return
 	}
 	c.token = c.tokenizer(in)
@@ -666,7 +690,9 @@ func (c *Compiler) kyuushikiSuperDX(out *BytecodeExp, in *string,
 		case "=":
 		default:
 			if hissu && !comma {
-				return Error("比較演算子がありません")
+				return Error("比較演算子がありません" +
+							" / " +
+							"No comparison operator")
 			}
 			hikaku = false
 		}
@@ -709,7 +735,9 @@ func (c *Compiler) kyuushikiSuperDX(out *BytecodeExp, in *string,
 	n, err := c.integer2(in)
 	if err != nil {
 		if hissu && !hikaku {
-			return Error("比較演算子がありません")
+			return Error("比較演算子がありません"+
+						" / " +
+						"No comparison operator")
 		}
 		if hikaku {
 			return err
@@ -728,7 +756,9 @@ func (c *Compiler) oneArg(out *BytecodeExp, in *string,
 	mae := c.token
 	if c.token = c.tokenizer(in); c.token != "(" {
 		if len(defval) == 0 || defval[0].IsNone() {
-			return bvNone(), Error(mae + "の次に'('がありません")
+			return bvNone(), Error(mae + "の次に'('がありません" +
+									" / " +
+									"Missing '(' after " + mae)
 		}
 		*in = c.token + " " + *in
 		bv = defval[0]
@@ -853,7 +883,9 @@ func (c *Compiler) expValue(out *BytecodeExp, in *string,
 	text := func() error {
 		i := strings.Index(*in, "\"")
 		if c.token != "\"" || i < 0 {
-			return Error("\"で囲まれていません")
+			return Error("\"で囲まれていません" +
+						" / " +
+						"Not enclosed in \"")
 		}
 		c.token = (*in)[:i]
 		*in = (*in)[i+1:]
@@ -901,7 +933,9 @@ func (c *Compiler) expValue(out *BytecodeExp, in *string,
 	var err error
 	switch c.token {
 	case "":
-		return bvNone(), Error("空です")
+		return bvNone(), Error("空です" +
+								" / " +
+								"Empty")
 	case "root", "parent", "helper", "target", "partner",
 		"enemy", "enemynear", "playerid":
 		switch c.token {
@@ -944,7 +978,9 @@ func (c *Compiler) expValue(out *BytecodeExp, in *string,
 				case OC_partner, OC_enemy, OC_enemynear:
 					be1.appendValue(BytecodeInt(0))
 				case OC_playerid:
-					return bvNone(), Error("playeridの次に'('がありません")
+					return bvNone(), Error("playeridの次に'('がありません" +
+											" / " +
+											"There is no '(' after playerid")
 				}
 			}
 			if rd {
@@ -953,7 +989,9 @@ func (c *Compiler) expValue(out *BytecodeExp, in *string,
 			out.append(be1...)
 		}
 		if c.token != "," {
-			return bvNone(), Error(",がありません")
+			return bvNone(), Error(",がありません" +
+									" / " +
+									"Missing ','" )
 		}
 		c.token = c.tokenizer(in)
 		if bv2, err = c.expValue(&be2, in, true); err != nil {
@@ -969,7 +1007,9 @@ func (c *Compiler) expValue(out *BytecodeExp, in *string,
 			c.token += c.tokenizer(in)
 			bv = c.number(c.token)
 			if bv.IsNone() {
-				return bvNone(), Error(c.token + "が不正です")
+				return bvNone(), Error(c.token + "が不正です" +
+										" / " +
+										c.token + " is invalid")
 			}
 		} else {
 			c.token = c.tokenizer(in)
@@ -2111,11 +2151,11 @@ func (c *Compiler) expValue(out *BytecodeExp, in *string,
 		} else if len(c.token) >= 2 && c.token[0] == '$' && c.token != "$_" {
 			vi, ok := c.vars[c.token[1:]]
 			if !ok {
-				return bvNone(), Error(c.token + "は定義されていません")
+				return bvNone(), Error(c.token + "は定義されていません" + " / " + c.token + "Is not defined")
 			}
 			out.append(OC_localvar, OpCode(vi))
 		} else {
-			return bvNone(), Error(c.token + "が不正です")
+			return bvNone(), Error(c.token + "が不正です"  + " / " + c.token + "It is illegal")
 		}
 	}
 	c.token = c.tokenizer(in)

--- a/src/input.go
+++ b/src/input.go
@@ -628,11 +628,17 @@ func JoystickState(joy, button int) bool {
 		if (button == 8 || button == 10) && glfw.GetJoystickName(joystick[joy]) == "Xbox 360 Controller" { //Xbox360コントローラーのLRトリガー判定
 			return axes[button/2] > 0
 		}
+
+		// Ignore trigger axis on PS4 (We already have buttons)
+		if (button >= 6 && button <= 9) && glfw.GetJoystickName(joystick[joy]) == "Wireless Controller" {
+			return false
+		}
+
 		switch button & 1 {
-		case 0:
-			return axes[button/2] < -0.2
-		case 1:
-			return axes[button/2] > 0.2
+			case 0:
+				return axes[button/2] < -0.2
+			case 1:
+				return axes[button/2] > 0.2
 		}
 	}
 	if len(btns) <= button {

--- a/src/script.go
+++ b/src/script.go
@@ -1227,10 +1227,13 @@ func systemScriptInit(l *lua.LState) {
 							s = strconv.Itoa(-i*2 - 1)
 						}
 					} else {
-						if axes[i] < -0.2 {
-							s = strconv.Itoa(-i*2 - 1)
-						} else if axes[i] > 0.2 {
-							s = strconv.Itoa(-i*2 - 2)
+						// PS4 Controller support
+						if glfw.GetJoystickName(joystick[j]) != "Wireless Controller" || !(i == 3 || i == 4) {
+							if axes[i] < -0.2 {
+								s = strconv.Itoa(-i*2 - 1)
+							} else if axes[i] > 0.2 {
+								s = strconv.Itoa(-i*2 - 2)
+							}
 						}
 					}
 				}

--- a/src/sound.go
+++ b/src/sound.go
@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/binary"
 	"fmt"
+	"io"
 	"math"
 	"os"
 	"path/filepath"
@@ -15,6 +16,7 @@ import (
 	"github.com/faiface/beep/mp3"
 	"github.com/faiface/beep/speaker"
 	"github.com/faiface/beep/vorbis"
+	"github.com/faiface/beep/wav"
 )
 
 const (
@@ -237,17 +239,21 @@ func (n *NormalizerLR) process(bai float64, sam *float32) float64 {
 
 type Bgm struct {
 	filename            string
+	bgmVolume           int
 	bgmLoopStart        int
 	bgmLoopEnd          int
 	defaultFilename     string
 	defaultBgmVolume    int
 	defaultbgmLoopStart int
 	defaultbgmLoopEnd   int
+	loop                int
 	sampleRate          beep.SampleRate
 	streamer            beep.StreamSeekCloser
 	ctrl                *beep.Ctrl
 	resampler           *beep.Resampler
 	volume              *effects.Volume
+	format              string
+	tempfile            io.ReadCloser
 }
 
 func newBgm() *Bgm {
@@ -266,6 +272,10 @@ func (bgm *Bgm) IsFLAC() bool {
 	return bgm.IsFormat(".flac")
 }
 
+func (bgm *Bgm) IsWAVE() bool {
+	return bgm.IsFormat(".wav")
+}
+
 func (bgm *Bgm) IsFormat(extension string) bool {
 	return filepath.Ext(bgm.filename) == extension
 }
@@ -275,6 +285,8 @@ func (bgm *Bgm) Open(filename string, isDefaultBGM bool, loop, bgmVolume, bgmLoo
 		return
 	}
 	bgm.filename = filename
+	bgm.loop = loop
+	bgm.bgmVolume = bgmVolume
 	bgm.bgmLoopStart = bgmLoopStart
 	bgm.bgmLoopEnd = bgmLoopEnd
 	if isDefaultBGM {
@@ -290,7 +302,9 @@ func (bgm *Bgm) Open(filename string, isDefaultBGM bool, loop, bgmVolume, bgmLoo
 	} else if bgm.IsMp3() {
 		bgm.ReadMp3(loop, bgmVolume)
 	} else if bgm.IsFLAC() {
-		bgm.ReadFLAC(loop, bgmVolume)
+		bgm.ConvertFLAC(loop, bgmVolume)
+	} else if bgm.IsWAVE() {
+		bgm.ReadWav(loop, bgmVolume)
 	}
 
 }
@@ -299,6 +313,7 @@ func (bgm *Bgm) ReadMp3(loop int, bgmVolume int) {
 	f, _ := os.Open(bgm.filename)
 	s, format, err := mp3.Decode(f)
 	bgm.streamer = s
+	bgm.format = "mp3"
 	if err != nil {
 		return
 	}
@@ -309,6 +324,42 @@ func (bgm *Bgm) ReadFLAC(loop int, bgmVolume int) {
 	f, _ := os.Open(bgm.filename)
 	s, format, err := flac.Decode(f)
 	bgm.streamer = s
+	bgm.format = "flac"
+
+	if err != nil {
+		return
+	}
+	bgm.ReadFormat(format, loop, bgmVolume)
+}
+
+// SCREW THE FLAC.SEEK FUNCTION, IT DOES NOT WORK SO WE ARE GOING TO CONVERT THIS TO WAV
+func (bgm *Bgm) ConvertFLAC(loop int, bgmVolume int) {
+	// We open the flac
+	f1, _ := os.Open(bgm.filename)
+	// And create a temp one
+	f2, _ := os.Create("save/tempaudio.wav")
+
+	// Open decode and convert
+	s, format, err := flac.Decode(f1)
+	wav.Encode(f2, s, format)
+ 
+	bgm.filename = "save/tempaudio.wav"
+	//bgm.tempfile = f2
+	bgm.format = "flac"
+
+	s.Close()
+
+	if err != nil {
+		return
+	}
+
+	sys.FLAC_FrameWait = 120
+}
+
+func (bgm *Bgm) PlayMemAudio(loop int, bgmVolume int) {
+	f, _ := os.Open(bgm.filename)
+	s, format, err := wav.Decode(f)
+	bgm.streamer = s
 	if err != nil {
 		return
 	}
@@ -319,6 +370,18 @@ func (bgm *Bgm) ReadVorbis(loop int, bgmVolume int) {
 	f, _ := os.Open(bgm.filename)
 	s, format, err := vorbis.Decode(f)
 	bgm.streamer = s
+	bgm.format = "ogg"
+	if err != nil {
+		return
+	}
+	bgm.ReadFormat(format, loop, bgmVolume)
+}
+
+func (bgm *Bgm) ReadWav(loop int, bgmVolume int) {
+	f, _ := os.Open(bgm.filename)
+	s, format, err := wav.Decode(f)
+	bgm.streamer = s
+	bgm.format = "wav"
 	if err != nil {
 		return
 	}

--- a/src/system.go
+++ b/src/system.go
@@ -64,6 +64,7 @@ var sys = System{
 	keyInput:              glfw.KeyUnknown,
 	keyString:             "",
 	comboExtraFrameWindow: 1,
+	FLAC_FrameWait:       -1,
 	// Localcoord sceenpack
 	luaSpriteScale:        1,
 	luaSmallPortraitScale: 1,
@@ -248,6 +249,7 @@ type System struct {
 	wavVolume               int
 	bgmVolume               int
 	AudioDucking            bool
+	FLAC_FrameWait          int
 	// Localcoord sceenpack
 	luaSpriteScale        float64
 	luaSmallPortraitScale float32
@@ -433,7 +435,7 @@ func (s *System) soundWrite() {
 			processed = true
 		}
 		if !s.nomusic {
-			if s.bgm.ctrl != nil {
+			if s.bgm.ctrl != nil && s.bgm.streamer != nil {
 				s.bgm.ctrl.Paused = false
 				if s.bgm.bgmLoopEnd > 0 && s.bgm.streamer.Position() >= s.bgm.bgmLoopEnd {
 					s.bgm.streamer.Seek(s.bgm.bgmLoopStart)
@@ -445,6 +447,12 @@ func (s *System) soundWrite() {
 			}
 		}
 
+		if s.FLAC_FrameWait >= 0 {
+			if s.FLAC_FrameWait == 0 {
+				s.bgm.PlayMemAudio(s.bgm.loop, s.bgm.bgmVolume)
+			}
+			s.FLAC_FrameWait--
+		}
 	}
 	src.Delete()
 	openal.NullContext.Activate()
@@ -1379,7 +1387,20 @@ func (s *System) fight() (reload bool) {
 			}
 			put(&y, s.stage.def)
 			if s.debugWC != nil {
-				put(&y, fmt.Sprintf("<P%v:%v>", s.debugWC.playerNo+1, s.debugWC.name))
+				//put(&y, fmt.Sprintf("<P%v:%v>", s.debugWC.playerNo+1, s.debugWC.name))
+				if s.bgm.streamer != nil {
+					put(&y, fmt.Sprintf("BgmPos: %v", s.bgm.streamer.Position()))
+					put(&y, fmt.Sprintf("BgmLen: %v", s.bgm.streamer.Len()))
+					if s.nomusic == false {
+						put(&y, fmt.Sprintf("BgmPlayback: enabled"))
+					} else {
+						put(&y, fmt.Sprintf("BgmPlayback: disabled"))
+					}
+					put(&y, fmt.Sprintf("BgmLoopEnd: %v", s.bgm.bgmLoopEnd))
+					put(&y, fmt.Sprintf("BgmLoopStart: %v", s.bgm.bgmLoopStart))
+				} else {
+					put(&y, fmt.Sprintf("BgmPlayback: disabled"))
+				}
 			}
 			for i, p := range s.chars {
 				if len(p) > 0 {