actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixed pump noteskin to not set zero delay on receptor sprites. Changed error messages from Sprite to give 1-indexed state numbers.

Browse Source
This commit is contained in:
Kyzentun
2015-01-28 07:53:55 -07:00
parent 0778e7b35e
commit 58d3fd2b6f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NoteSkins/pump/default/UpLeft Receptor.lua
+2 -2
View File
@@ -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);
src/Sprite.cpp
+2 -2
View File
@@ -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 );