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

Changed GetAttrPath to not warn on optional paths.

Browse Source
This commit is contained in:
Kyzentun
2014-08-25 03:38:22 -06:00
parent 96433cc3e4
commit a41d9c0467
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Themerdocs/Examples/Example_Actors/ActorScroller.lua
+3 -3
View File
@@ -36,7 +36,7 @@ Def.ActorScroller{
Def.ActorFrame{ Def.ActorFrame{
Def.BitmapText{ Def.BitmapText{
Name="ScrollItem1", Name="ScrollItem1",
Font="Common normal", Font="Common Normal",
Text="Scroll Item 1", Text="Scroll Item 1",
InitCommand=cmd(diffuse,color("#FF0000")), InitCommand=cmd(diffuse,color("#FF0000")),
}, },
@@ -44,14 +44,14 @@ Def.ActorScroller{
Def.ActorFrame{ Def.ActorFrame{
Def.BitmapText{ Def.BitmapText{
Name="ScrollItem2", Name="ScrollItem2",
Font="Common normal", Font="Common Normal",
Text="Scroll Item 2", Text="Scroll Item 2",
InitCommand=cmd(glow,color("#00FF0088")), InitCommand=cmd(glow,color("#00FF0088")),
}, },
}, },
Def.BitmapText{ Def.BitmapText{
Name="ScrollItem3", Name="ScrollItem3",
Font="Common normal", Font="Common Normal",
Text="Scroll Item 3", Text="Scroll Item 3",
InitCommand=cmd(bob;effectmagnitude,8,0,4), InitCommand=cmd(bob;effectmagnitude,8,0,4),
}, },
Themes/_fallback/Scripts/04 SetBGFitHelpers.lua
+1 -1
View File
@@ -46,7 +46,7 @@ function BGFitChoiceExample(params)
{{-hw, -hh, 0}, params.soutline_color}, {{-hw, -hh, 0}, params.soutline_color},
} }
self:SetVertices(verts) self:SetVertices(verts)
self:SetLineWidth(1) self:SetLineWidth(2)
self:SetDrawState{Mode= "DrawMode_LineStrip"} self:SetDrawState{Mode= "DrawMode_LineStrip"}
end end
}, },
src/ActorUtil.cpp
+4 -1
View File
@@ -417,7 +417,10 @@ bool ActorUtil::GetAttrPath( const XNode *pNode, const RString &sName, RString &
RString sDir; RString sDir;
if( !pNode->GetAttrValue("_Dir", sDir) ) if( !pNode->GetAttrValue("_Dir", sDir) )
{ {
LOG->Warn( "Relative path \"%s\", but path is unknown", sOut.c_str() ); if(!optional)
{
LOG->Warn( "Relative path \"%s\", but path is unknown", sOut.c_str() );
}
return false; return false;
} }
sOut = sDir+sOut; sOut = sDir+sOut;