From 58d3fd2b6fa4442c0e8f8b8ad122121230d31693 Mon Sep 17 00:00:00 2001 From: Kyzentun Date: Wed, 28 Jan 2015 07:53:55 -0700 Subject: [PATCH] Fixed pump noteskin to not set zero delay on receptor sprites. Changed error messages from Sprite to give 1-indexed state numbers. --- NoteSkins/pump/default/UpLeft Receptor.lua | 4 ++-- src/Sprite.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NoteSkins/pump/default/UpLeft Receptor.lua b/NoteSkins/pump/default/UpLeft Receptor.lua index 6b36007723..ebe2fbc70c 100644 --- a/NoteSkins/pump/default/UpLeft Receptor.lua +++ b/NoteSkins/pump/default/UpLeft Receptor.lua @@ -37,14 +37,14 @@ return Def.ActorFrame { NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ Name="Base"; Frames={ - { Frame = 0, Delay = 0 } + { Frame = 0 } }; PressCommand=cmd(finishtweening;linear,0.05;zoom,0.9;linear,0.1;zoom,1); }; NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{ Name="Glow"; Frames= { - { Frame = 1, Delay = 0 } + { Frame = 1 } }; InitCommand=cmd(blend,'BlendMode_Add'); PressCommand=cmd(finishtweening;linear,0.05;zoom,0.9;linear,0.1;zoom,1); diff --git a/src/Sprite.cpp b/src/Sprite.cpp index 60a723c3e8..307ec13e76 100644 --- a/src/Sprite.cpp +++ b/src/Sprite.cpp @@ -188,7 +188,7 @@ void Sprite::LoadFromNode( const XNode* pNode ) } if(newState.fDelay <= min_state_delay) { - LuaHelpers::ReportScriptErrorFmt("%s: State #%i has near-zero delay.", ActorUtil::GetWhere(pNode).c_str(), i); + LuaHelpers::ReportScriptErrorFmt("%s: State #%i has near-zero delay.", ActorUtil::GetWhere(pNode).c_str(), i+1); newState.fDelay= 0.1f; } @@ -196,7 +196,7 @@ void Sprite::LoadFromNode( const XNode* pNode ) if( iFrameIndex >= m_pTexture->GetNumFrames() ) { LuaHelpers::ReportScriptErrorFmt( "%s: State #%i is frame %d, but the texture \"%s\" only has %d frames", - ActorUtil::GetWhere(pNode).c_str(), i, iFrameIndex, sPath.c_str(), m_pTexture->GetNumFrames() ); + ActorUtil::GetWhere(pNode).c_str(), i+1, iFrameIndex, sPath.c_str(), m_pTexture->GetNumFrames() ); } newState.rect = *m_pTexture->GetTextureCoordRect( iFrameIndex );