Commit: 5285bac7ea45cec054b767200f9c770fe087df46 - ikemen_go (git)

Go で書き直した Ikemen

Commit MetaInfo

• Revision: 5285bac7ea45cec054b767200f9c770fe087df46 (tree)
• Zeit: 2019-09-15 02:31:15
• Autor: neatunsou <sisiy4excite@gmai...>
• Commiter: neatunsou

Log Message

StoryboardのBGCtrlの移動量がlocalcoordの影響を受けるように修正
StoryboardのCtrldef名が重複して上書きされる場合があったのを修正
Storyboardにskipbuttonオプションを追加
Targetbindの基準posにlocalcoordを考慮してなかったのを修正
AIRのinterploateオプションでアニメがloopした場合の動作を修正

Ändern Zusammenfassung

• modified: script/main.lua
• modified: script/options.lua
• modified: script/select.lua
• modified: script/storyboard.lua
• modified: src/anim.go
• modified: src/char.go

Diff

--- a/script/main.lua
+++ b/script/main.lua
@@ -569,7 +569,7 @@ function main.f_ctrlBG(t_bg, t_ctrl)
 end
 
 --draw background layers
-function main.f_drawBG(data, info, layerno, timer)
+function main.f_drawBG(data, info, layerno, timer, localcoord)
 	timer = timer or 0
 	--loop through all backgrounds
 	for i = 1, #data do
@@ -605,34 +605,38 @@ function main.f_drawBG(data, info, layerno, timer)
 							info[i].ctrl_flags.enabled = t.value
 						elseif k == 'velset' or k == 'posset' then
 							if t.x ~= nil then
-								info[i].ctrl_flags.velx = 0 - info[i].velocity[1] + t.x
+								info[i].ctrl_flags.velx = 0 - info[i].velocity[1] + t.x * 320/localcoord[1]
 							end
 							if t.y ~= nil then
-								info[i].ctrl_flags.vely = 0 - info[i].velocity[2] + t.y
+								info[i].ctrl_flags.vely = 0 - info[i].velocity[2] + t.y * 240/localcoord[2]
 							end
-						elseif k == 'veladd' or k == 'posadd' then
+						elseif k == 'veladd'  then --or k == 'posadd' then
 							if t.x ~= nil then
-								info[i].ctrl_flags.velx = info[i].ctrl_flags.velx + t.x
+								info[i].ctrl_flags.velx = info[i].ctrl_flags.velx + t.x * 320/localcoord[1]
 							end
 							if t.y ~= nil then
-								info[i].ctrl_flags.vely = info[i].ctrl_flags.vely + t.y
+								info[i].ctrl_flags.vely = info[i].ctrl_flags.vely + t.y * 240/localcoord[2]
 							end
+						elseif k == 'posadd' then
+							if t.x ~= nil then x = t.x * 320/localcoord[1] end
+							if t.y ~= nil then y = t.y * 240/localcoord[2] end
+							animAddPos(data[i], x, y)
 						--[[elseif k == 'posset' then
 							if t.x ~= nil then
-								x = t.x
+								x = t.x * 320/localcoord[1]
 							else
 								x = info[i].start[1]
 							end
-							if t.y == nil then
-								y = t.y
+							if t.y ~= nil then
+								y = t.y * 240/localcoord[2]
 							else
 								y = info[i].start[2]
 							end
 							animSetPos(data[i], x, y)
 							animAddPos(data[i], 160, 0) --for some reason needed in ikemen
 						elseif k == 'posadd' then
-							if t.x ~= nil then x = t.x end
-							if t.y ~= nil then y = t.y end
+							if t.x ~= nil then x = t.x * 320/localcoord[1] end
+							if t.y ~= nil then y = t.y * 240/localcoord[2] end
 							animAddPos(data[i], x, y)]]
 						--elseif k == 'anim' then --not supported yet
 						--elseif k == 'sinx' then --not supported yet
@@ -725,9 +729,9 @@ function main.f_warning(t, info, background, font_info, title, box)
 		--draw clearcolor
 		animDraw(background.bgclearcolor_data)
 		--draw layerno = 0 backgrounds
-		main.f_drawBG(background.bg_data, background.bg, 0, background.timer)
+		main.f_drawBG(background.bg_data, background.bg, 0, background.timer, {320,240})
 		--draw layerno = 1 backgrounds
-		main.f_drawBG(background.bg_data, background.bg, 1, background.timer)
+		main.f_drawBG(background.bg_data, background.bg, 1, background.timer, {320,240})
 		--draw menu box
 		animDraw(box)
 		--draw title
@@ -794,9 +798,9 @@ function main.f_input(t, info, background, type)
 		--draw clearcolor
 		animDraw(background.bgclearcolor_data)
 		--draw layerno = 0 backgrounds
-		main.f_drawBG(background.bg_data, background.bg, 0, background.timer)
+		main.f_drawBG(background.bg_data, background.bg, 0, background.timer, {320,240})
 		--draw layerno = 1 backgrounds
-		main.f_drawBG(background.bg_data, background.bg, 1, background.timer)
+		main.f_drawBG(background.bg_data, background.bg, 1, background.timer, {320,240})
 		--draw menu box
 		animDraw(main.warningBox)
 		--draw text
@@ -1106,7 +1110,7 @@ file:close()
 content = content:gsub('([^\r\n;]*)%s*;[^\r\n]*', '%1')
 content = content:gsub('\n%s*\n', '\n')
 for line in content:gmatch('[^\r\n]+') do
-	if chars + stages == 90 then
+	if chars + stages == 100 then
 		SetGCPercent(100)
 	end
 --for line in io.lines("data/select.def") do
@@ -1488,7 +1492,7 @@ function main.f_menuCommon2(cursorPosY, moveTxt, item, t)
 	--draw clearcolor
 	animDraw(motif.titlebgdef.bgclearcolor_data)
 	--draw layerno = 0 backgrounds
-	main.f_drawBG(motif.titlebgdef.bg_data, motif.titlebgdef.bg, 0, motif.titlebgdef.timer)
+	main.f_drawBG(motif.titlebgdef.bg_data, motif.titlebgdef.bg, 0, motif.titlebgdef.timer, {320,240})
 	--draw menu items
 	local items_shown = item + motif.title_info.menu_window_visibleitems - cursorPosY
 	if motif.title_info.menu_window_margins_y[2] ~= 0 and items_shown < #t then
@@ -1545,7 +1549,7 @@ function main.f_menuCommon2(cursorPosY, moveTxt, item, t)
 		animDraw(main.cursorBox)
 	end
 	--draw layerno = 1 backgrounds
-	main.f_drawBG(motif.titlebgdef.bg_data, motif.titlebgdef.bg, 1, motif.titlebgdef.timer)
+	main.f_drawBG(motif.titlebgdef.bg_data, motif.titlebgdef.bg, 1, motif.titlebgdef.timer, {320,240})
 	--footer draw
 	if motif.title_info.footer_boxbackground_visible == 1 then
 		animDraw(footerBox)
@@ -1738,9 +1742,9 @@ function main.f_connect(server, t)
 		--draw clearcolor
 		animDraw(motif.titlebgdef.bgclearcolor_data)
 		--draw layerno = 0 backgrounds
-		main.f_drawBG(motif.titlebgdef.bg_data, motif.titlebgdef.bg, 0, motif.titlebgdef.timer)
+		main.f_drawBG(motif.titlebgdef.bg_data, motif.titlebgdef.bg, 0, motif.titlebgdef.timer, {320,240})
 		--draw layerno = 1 backgrounds
-		main.f_drawBG(motif.titlebgdef.bg_data, motif.titlebgdef.bg, 1, motif.titlebgdef.timer)
+		main.f_drawBG(motif.titlebgdef.bg_data, motif.titlebgdef.bg, 1, motif.titlebgdef.timer, {320,240})
 		--draw menu box
 		animDraw(main.warningBox)
 		--draw text

--- a/script/options.lua
+++ b/script/options.lua
@@ -190,7 +190,7 @@ function options.f_menuCommon2(cursorPosY, moveTxt, item, t)
 	--draw clearcolor
 	animDraw(motif.optionbgdef.bgclearcolor_data)
 	--draw layerno = 0 backgrounds
-	main.f_drawBG(motif.optionbgdef.bg_data, motif.optionbgdef.bg, 0, motif.optionbgdef.timer)
+	main.f_drawBG(motif.optionbgdef.bg_data, motif.optionbgdef.bg, 0, motif.optionbgdef.timer, {320,240})
 	--draw menu box
 	if motif.option_info.menu_boxbackground_visible == 1 then
 		if #t > motif.option_info.menu_window_visibleitems and moveTxt == (#t - motif.option_info.menu_window_visibleitems) * motif.option_info.menu_item_spacing[2] then
@@ -295,7 +295,7 @@ function options.f_menuCommon2(cursorPosY, moveTxt, item, t)
 		animDraw(main.cursorBox)
 	end
 	--draw layerno = 1 backgrounds
-	main.f_drawBG(motif.optionbgdef.bg_data, motif.optionbgdef.bg, 1, motif.optionbgdef.timer)
+	main.f_drawBG(motif.optionbgdef.bg_data, motif.optionbgdef.bg, 1, motif.optionbgdef.timer, {320,240})
 	--draw fadein
 	animDraw(motif.option_info.fadein_data)
 	animUpdate(motif.option_info.fadein_data)

--- a/script/select.lua
+++ b/script/select.lua
@@ -1031,10 +1031,10 @@ function select.f_selectTournamentScreen()
 	--draw clearcolor
 	animDraw(motif.tournamentbgdef.bgclearcolor_data)
 	--draw layerno = 0 backgrounds
-	main.f_drawBG(motif.tournamentbgdef.bg_data, motif.tournamentbgdef.bg, 0, motif.tournamentbgdef.timer)
+	main.f_drawBG(motif.tournamentbgdef.bg_data, motif.tournamentbgdef.bg, 0, motif.tournamentbgdef.timer, {320,240})
 	
 	--draw layerno = 1 backgrounds
-	main.f_drawBG(motif.tournamentbgdef.bg_data, motif.tournamentbgdef.bg, 1, motif.tournamentbgdef.timer)
+	main.f_drawBG(motif.tournamentbgdef.bg_data, motif.tournamentbgdef.bg, 1, motif.tournamentbgdef.timer, {320,240})
 	--draw fadein
 	animDraw(motif.tournament_info.fadein_data)
 	animUpdate(motif.tournament_info.fadein_data)
@@ -1086,7 +1086,7 @@ function select.f_selectScreen()
 	--draw clearcolor
 	animDraw(motif.selectbgdef.bgclearcolor_data)
 	--draw layerno = 0 backgrounds
-	main.f_drawBG(motif.selectbgdef.bg_data, motif.selectbgdef.bg, 0, motif.selectbgdef.timer)
+	main.f_drawBG(motif.selectbgdef.bg_data, motif.selectbgdef.bg, 0, motif.selectbgdef.timer, {320,240})
 	--draw title
 	textImgDraw(main.txt_mainSelect)
 	if p1Cell then
@@ -1263,7 +1263,7 @@ function select.f_selectScreen()
 		end
 	end
 	--draw layerno = 1 backgrounds
-	main.f_drawBG(motif.selectbgdef.bg_data, motif.selectbgdef.bg, 1, motif.selectbgdef.timer)
+	main.f_drawBG(motif.selectbgdef.bg_data, motif.selectbgdef.bg, 1, motif.selectbgdef.timer, {320,240})
 	--draw fadein
 	animDraw(motif.select_info.fadein_data)
 	animUpdate(motif.select_info.fadein_data)
@@ -2195,7 +2195,7 @@ function select.f_selectVersus()
 			--draw clearcolor
 			animDraw(motif.versusbgdef.bgclearcolor_data)
 			--draw layerno = 0 backgrounds
-			main.f_drawBG(motif.versusbgdef.bg_data, motif.versusbgdef.bg, 0, motif.versusbgdef.timer)
+			main.f_drawBG(motif.versusbgdef.bg_data, motif.versusbgdef.bg, 0, motif.versusbgdef.timer, {320,240})
 			--draw portraits
 			select.f_drawPortrait(
 				t_p1Selected,
@@ -2253,7 +2253,7 @@ function select.f_selectVersus()
 				textImgDraw(txt_matchNo)
 			end
 			--draw layerno = 1 backgrounds
-			main.f_drawBG(motif.versusbgdef.bg_data, motif.versusbgdef.bg, 1, motif.versusbgdef.timer)
+			main.f_drawBG(motif.versusbgdef.bg_data, motif.versusbgdef.bg, 1, motif.versusbgdef.timer, {320,240})
 			--draw fadein
 			animDraw(motif.vs_screen.fadein_data)
 			animUpdate(motif.vs_screen.fadein_data)
@@ -2334,7 +2334,7 @@ function select.f_result(state)
 		--draw clearcolor
 		--animDraw(motif.resultsbgdef.bgclearcolor_data) --disabled to not cover game screen
 		--draw layerno = 0 backgrounds
-		main.f_drawBG(motif.resultsbgdef.bg_data, motif.resultsbgdef.bg, 0, motif.resultsbgdef.timer)
+		main.f_drawBG(motif.resultsbgdef.bg_data, motif.resultsbgdef.bg, 0, motif.resultsbgdef.timer, {320,240})
 		--draw text
 		for i = 1, #t_resultText do
 			textImgSetText(txt, t_resultText[i])
@@ -2346,7 +2346,7 @@ function select.f_result(state)
 			textImgDraw(txt)
 		end
 		--draw layerno = 1 backgrounds
-		main.f_drawBG(motif.resultsbgdef.bg_data, motif.resultsbgdef.bg, 1, motif.resultsbgdef.timer)
+		main.f_drawBG(motif.resultsbgdef.bg_data, motif.resultsbgdef.bg, 1, motif.resultsbgdef.timer, {320,240})
 		--draw fadein
 		animDraw(t.fadein_data)
 		animUpdate(t.fadein_data)
@@ -2440,7 +2440,7 @@ function select.f_selectVictory()
 		--draw clearcolor
 		animDraw(motif.victorybgdef.bgclearcolor_data)
 		--draw layerno = 0 backgrounds
-		main.f_drawBG(motif.victorybgdef.bg_data, motif.victorybgdef.bg, 0, motif.victorybgdef.timer)
+		main.f_drawBG(motif.victorybgdef.bg_data, motif.victorybgdef.bg, 0, motif.victorybgdef.timer, {320,240})
 		--draw portraits
 		if motif.victory_screen.p2_display == 0 then
 			drawVictoryPortrait(
@@ -2484,7 +2484,7 @@ function select.f_selectVictory()
 			motif.victory_screen.winquote_length
 		)
 		--draw layerno = 1 backgrounds
-		main.f_drawBG(motif.victorybgdef.bg_data, motif.victorybgdef.bg, 1, motif.victorybgdef.timer)
+		main.f_drawBG(motif.victorybgdef.bg_data, motif.victorybgdef.bg, 1, motif.victorybgdef.timer, {320,240})
 		--draw fadein
 		animDraw(motif.victory_screen.fadein_data)
 		animUpdate(motif.victory_screen.fadein_data)
@@ -2525,7 +2525,7 @@ function select.f_continue()
 		--draw clearcolor (disabled to not cover area)
 		--animDraw(motif.continuebgdef.bgclearcolor_data)
 		--draw layerno = 0 backgrounds
-		main.f_drawBG(motif.continuebgdef.bg_data, motif.continuebgdef.bg, 0, motif.continuebgdef.timer)
+		main.f_drawBG(motif.continuebgdef.bg_data, motif.continuebgdef.bg, 0, motif.continuebgdef.timer, {320,240})
 		--continue screen state
 		if esc() or motif.continuebgdef.timer > motif.continue_screen.endtime then
 			main.f_cmdInput()
@@ -2600,7 +2600,7 @@ function select.f_continue()
 		animUpdate(motif.continue_screen.continue_anim_data)
 		animDraw(motif.continue_screen.continue_anim_data)
 		--draw layerno = 1 backgrounds
-		main.f_drawBG(motif.continuebgdef.bg_data, motif.continuebgdef.bg, 1, motif.continuebgdef.timer)
+		main.f_drawBG(motif.continuebgdef.bg_data, motif.continuebgdef.bg, 1, motif.continuebgdef.timer, {320,240})
 		--draw fadein
 		animDraw(motif.continue_screen.fadein_data)
 		animUpdate(motif.continue_screen.fadein_data)

--- a/script/storyboard.lua
+++ b/script/storyboard.lua
@@ -54,7 +54,7 @@ local function f_play(t)
 		if k >= t.scenedef.startscene then
 			for i = 0, t.scene[k].end_time do
 				--end storyboard
-				if esc() or main.f_btnPalNo(main.p1Cmd) > 0 then
+				if esc() or main.f_btnPalNo(main.p1Cmd) > 0 and t.scenedef.skipbutton > 0 then
 					main.f_cmdInput()
 					refresh()
 					return
@@ -75,7 +75,7 @@ local function f_play(t)
 				animDraw(t.scene[k].clearcolor_data)
 				--draw layerno = 0 backgrounds
 				if t.scene[k].bg_name ~= '' then
-					main.f_drawBG(t.scene[k].bg_data, t[t.scene[k].bg_name .. 'def'], 0, i)
+					main.f_drawBG(t.scene[k].bg_data, t[t.scene[k].bg_name .. 'def'], 0, i, t.info.localcoord)
 				end
 				--loop through layers in order
 				for k2, v2 in main.f_sortKeys(t.scene[k].layer) do
@@ -103,7 +103,7 @@ local function f_play(t)
 				end
 				--draw layerno = 1 backgrounds
 				if t.scene[k].bg_name ~= '' then
-					main.f_drawBG(t.scene[k].bg_data, t[t.scene[k].bg_name .. 'def'], 1, i)
+					main.f_drawBG(t.scene[k].bg_data, t[t.scene[k].bg_name .. 'def'], 1, i, t.info.localcoord)
 				end
 				--fadein
 				if i <= t.scene[k].fadein_time then
@@ -115,6 +115,13 @@ local function f_play(t)
 					animDraw(t.scene[k].fadeout_data)
 					animUpdate(t.scene[k].fadeout_data)
 				end
+				if main.f_btnPalNo(main.p1Cmd) > 0 and t.scenedef.skipbutton <= 0 then
+					main.f_cmdInput()
+					refresh()
+					do
+						break
+					end
+				end
 				main.f_cmdInput()
 				refresh()
 			end
@@ -146,7 +153,7 @@ local function f_parse(path)
 	local t_default =
 	{
 		info = {localcoord = {320, 240}},
-		scenedef = {spr = '', snd = '', font = {[1] = 'font/f-6x9.fnt'}, font_height = {}, startscene = 0, font_data = {}},
+		scenedef = {spr = '', snd = '', font = {[1] = 'font/f-6x9.fnt'}, font_height = {}, startscene = 0, skipbutton = 1, font_data = {}},
 		scene = {},
 		ctrldef = {}
 	}
@@ -160,6 +167,9 @@ local function f_parse(path)
 			if row:match('.+ctrldef') then --matched ctrldef start
 				bgctrl = row
 				bgctrl_match = bgctrl:match('^(.-ctrl)def')
+				if t.ctrldef[bgdef .. 'def'][bgctrl] ~= nil then --Ctrldef名の重複を避ける
+					bgctrl = bgctrl..tostring(os.clock())
+				end
 				t.ctrldef[bgdef .. 'def'][bgctrl] = {}
 				t.ctrldef[bgdef .. 'def'][bgctrl].ctrl = {}
 				pos = t.ctrldef[bgdef .. 'def'][bgctrl]
@@ -225,6 +235,7 @@ local function f_parse(path)
 				t.scene[row] = {}
 				pos = t.scene[row]
 				pos.layer = {}
+				pos.sound = {}
 				t_default.scene[row] =
 				{
 					end_time = 0,
@@ -477,10 +488,10 @@ local function f_parse(path)
 					if t_bgdef[k2].window ~= nil then
 						animSetWindow(
 							anim,
-							t_bgdef[k2].window[1],
-							t_bgdef[k2].window[2],
-							t_bgdef[k2].window[3] - t_bgdef[k2].window[1] + 1,
-							t_bgdef[k2].window[4] - t_bgdef[k2].window[2] + 1
+							t_bgdef[k2].window[1] * 320/t.info.localcoord[1],
+							t_bgdef[k2].window[2] * 240/t.info.localcoord[2],
+							(t_bgdef[k2].window[3] - t_bgdef[k2].window[1] + 1)* 320/t.info.localcoord[1],
+							(t_bgdef[k2].window[4] - t_bgdef[k2].window[2] + 1) * 240/t.info.localcoord[2]
 						)
 					else
 						animSetWindow(anim, 0, 0, t.info.localcoord[1], t.info.localcoord[2])

--- a/src/anim.go
+++ b/src/anim.go
@@ -484,66 +484,68 @@ func (a *Animation) UpdateSprite() {
 			}
 		}
 	}
-	if int(a.drawidx) < len(a.frames)-1 {
-		for _, i := range a.interpolate_offset {
-			if a.drawidx+1 == i {
-				a.interpolate_offset_x = float32(a.frames[a.drawidx+1].X-a.frames[a.drawidx].X) / float32(a.curFrame().Time) * float32(a.time)
-				a.interpolate_offset_y = float32(a.frames[a.drawidx+1].Y-a.frames[a.drawidx].Y) / float32(a.curFrame().Time) * float32(a.time)
-				break
-			}
+	nextDrawidx := a.drawidx + 1
+	if int(a.drawidx) >= len(a.frames)-1 {
+		nextDrawidx = a.loopstart
+	}
+	for _, i := range a.interpolate_offset {
+		if nextDrawidx == i {
+			a.interpolate_offset_x = float32(a.frames[nextDrawidx].X-a.frames[a.drawidx].X) / float32(a.curFrame().Time) * float32(a.time)
+			a.interpolate_offset_y = float32(a.frames[nextDrawidx].Y-a.frames[a.drawidx].Y) / float32(a.curFrame().Time) * float32(a.time)
+			break
 		}
-		for _, i := range a.interpolate_scale {
-			if a.drawidx+1 == i {
-				var drawframe_scale_x, nextframe_scale_x, drawframe_scale_y, nextframe_scale_y float32 = 1, 1, 1, 1
-				if len(a.frames[a.drawidx].Ex) > 2 {
-					if len(a.frames[a.drawidx].Ex[2]) > 0 {
-						drawframe_scale_x = a.frames[a.drawidx].Ex[2][0]
-					}
-					if len(a.frames[a.drawidx].Ex[2]) > 1 {
-						drawframe_scale_y = a.frames[a.drawidx].Ex[2][1]
-					}
+	}
+	for _, i := range a.interpolate_scale {
+		if nextDrawidx == i {
+			var drawframe_scale_x, nextframe_scale_x, drawframe_scale_y, nextframe_scale_y float32 = 1, 1, 1, 1
+			if len(a.frames[a.drawidx].Ex) > 2 {
+				if len(a.frames[a.drawidx].Ex[2]) > 0 {
+					drawframe_scale_x = a.frames[a.drawidx].Ex[2][0]
 				}
-				if len(a.frames[a.drawidx+1].Ex) > 2 {
-					if len(a.frames[a.drawidx+1].Ex[2]) > 0 {
-						nextframe_scale_x = a.frames[a.drawidx+1].Ex[2][0]
-					}
-					if len(a.frames[a.drawidx+1].Ex[2]) > 1 {
-						nextframe_scale_y = a.frames[a.drawidx+1].Ex[2][1]
-					}
+				if len(a.frames[a.drawidx].Ex[2]) > 1 {
+					drawframe_scale_y = a.frames[a.drawidx].Ex[2][1]
+				}
+			}
+			if len(a.frames[nextDrawidx].Ex) > 2 {
+				if len(a.frames[nextDrawidx].Ex[2]) > 0 {
+					nextframe_scale_x = a.frames[nextDrawidx].Ex[2][0]
+				}
+				if len(a.frames[nextDrawidx].Ex[2]) > 1 {
+					nextframe_scale_y = a.frames[nextDrawidx].Ex[2][1]
 				}
-				a.scale_x += (nextframe_scale_x - drawframe_scale_x) / float32(a.curFrame().Time) * float32(a.time)
-				a.scale_y += (nextframe_scale_y - drawframe_scale_y) / float32(a.curFrame().Time) * float32(a.time)
-				break
 			}
+			a.scale_x += (nextframe_scale_x - drawframe_scale_x) / float32(a.curFrame().Time) * float32(a.time)
+			a.scale_y += (nextframe_scale_y - drawframe_scale_y) / float32(a.curFrame().Time) * float32(a.time)
+			break
 		}
-		for _, i := range a.interpolate_angle {
-			if a.drawidx+1 == i {
-				var drawframe_angle, nextframe_angle float32 = 0, 0
-				if len(a.frames[a.drawidx].Ex) > 2 {
-					if len(a.frames[a.drawidx].Ex[2]) > 2 {
-						drawframe_angle = a.frames[a.drawidx].Ex[2][2]
-					}
+	}
+	for _, i := range a.interpolate_angle {
+		if nextDrawidx == i {
+			var drawframe_angle, nextframe_angle float32 = 0, 0
+			if len(a.frames[a.drawidx].Ex) > 2 {
+				if len(a.frames[a.drawidx].Ex[2]) > 2 {
+					drawframe_angle = a.frames[a.drawidx].Ex[2][2]
 				}
-				if len(a.frames[a.drawidx+1].Ex) > 2 {
-					if len(a.frames[a.drawidx+1].Ex[2]) > 2 {
-						nextframe_angle = a.frames[a.drawidx+1].Ex[2][2]
-					}
+			}
+			if len(a.frames[nextDrawidx].Ex) > 2 {
+				if len(a.frames[nextDrawidx].Ex[2]) > 2 {
+					nextframe_angle = a.frames[nextDrawidx].Ex[2][2]
 				}
-				a.angle += (nextframe_angle - drawframe_angle) / float32(a.curFrame().Time) * float32(a.time)
-				break
 			}
+			a.angle += (nextframe_angle - drawframe_angle) / float32(a.curFrame().Time) * float32(a.time)
+			break
 		}
-		if byte(a.interpolate_blend_srcalpha) != 1 ||
-			byte(a.interpolate_blend_dstalpha) != 255 {
-			for _, i := range a.interpolate_blend {
-				if a.drawidx+1 == i {
-					a.interpolate_blend_srcalpha += (float32(a.frames[a.drawidx+1].SrcAlpha) - a.interpolate_blend_srcalpha) / float32(a.curFrame().Time) * float32(a.time)
-					a.interpolate_blend_dstalpha += (float32(a.frames[a.drawidx+1].DstAlpha) - a.interpolate_blend_dstalpha) / float32(a.curFrame().Time) * float32(a.time)
-					if byte(a.interpolate_blend_srcalpha) == 1 && byte(a.interpolate_blend_dstalpha) == 255 {
-						a.interpolate_blend_srcalpha = 0
-					}
-					break
+	}
+	if byte(a.interpolate_blend_srcalpha) != 1 ||
+		byte(a.interpolate_blend_dstalpha) != 255 {
+		for _, i := range a.interpolate_blend {
+			if nextDrawidx == i {
+				a.interpolate_blend_srcalpha += (float32(a.frames[nextDrawidx].SrcAlpha) - a.interpolate_blend_srcalpha) / float32(a.curFrame().Time) * float32(a.time)
+				a.interpolate_blend_dstalpha += (float32(a.frames[nextDrawidx].DstAlpha) - a.interpolate_blend_dstalpha) / float32(a.curFrame().Time) * float32(a.time)
+				if byte(a.interpolate_blend_srcalpha) == 1 && byte(a.interpolate_blend_dstalpha) == 255 {
+					a.interpolate_blend_srcalpha = 0
 				}
+				break
 			}
 		}
 	}

--- a/src/char.go
+++ b/src/char.go
@@ -4014,14 +4014,14 @@ func (c *Char) bind() {
 			if AbsF(c.bindFacing) == 2 {
 				f = c.bindFacing / 2
 			}
-			c.setX(bt.pos[0] + f*c.bindPos[0])
+			c.setX(bt.pos[0]*bt.localscl/c.localscl + f*c.bindPos[0])
 			c.drawPos[0] += bt.drawPos[0] - bt.pos[0]
 			c.oldPos[0] += bt.oldPos[0] - bt.pos[0]
 			c.pushed = c.pushed || bt.pushed
 			c.ghv.xoff = 0
 		}
 		if !math.IsNaN(float64(c.bindPos[1])) {
-			c.setY(bt.pos[1] + c.bindPos[1])
+			c.setY(bt.pos[1]*bt.localscl/c.localscl + c.bindPos[1])
 			c.drawPos[1] += bt.drawPos[1] - bt.pos[1]
 			c.oldPos[1] += bt.oldPos[1] - bt.pos[1]
 			c.ghv.yoff = 0