From a41d9c046753f3b35e56a6c2b475d6cfc44881ed Mon Sep 17 00:00:00 2001 From: Kyzentun Date: Mon, 25 Aug 2014 03:38:22 -0600 Subject: [PATCH] Changed GetAttrPath to not warn on optional paths. --- Docs/Themerdocs/Examples/Example_Actors/ActorScroller.lua | 6 +++--- Themes/_fallback/Scripts/04 SetBGFitHelpers.lua | 2 +- src/ActorUtil.cpp | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Docs/Themerdocs/Examples/Example_Actors/ActorScroller.lua b/Docs/Themerdocs/Examples/Example_Actors/ActorScroller.lua index 27a0a1817a..433e7c9e3d 100644 --- a/Docs/Themerdocs/Examples/Example_Actors/ActorScroller.lua +++ b/Docs/Themerdocs/Examples/Example_Actors/ActorScroller.lua @@ -36,7 +36,7 @@ Def.ActorScroller{ Def.ActorFrame{ Def.BitmapText{ Name="ScrollItem1", - Font="Common normal", + Font="Common Normal", Text="Scroll Item 1", InitCommand=cmd(diffuse,color("#FF0000")), }, @@ -44,14 +44,14 @@ Def.ActorScroller{ Def.ActorFrame{ Def.BitmapText{ Name="ScrollItem2", - Font="Common normal", + Font="Common Normal", Text="Scroll Item 2", InitCommand=cmd(glow,color("#00FF0088")), }, }, Def.BitmapText{ Name="ScrollItem3", - Font="Common normal", + Font="Common Normal", Text="Scroll Item 3", InitCommand=cmd(bob;effectmagnitude,8,0,4), }, diff --git a/Themes/_fallback/Scripts/04 SetBGFitHelpers.lua b/Themes/_fallback/Scripts/04 SetBGFitHelpers.lua index bdd0bee819..336e4f18ed 100644 --- a/Themes/_fallback/Scripts/04 SetBGFitHelpers.lua +++ b/Themes/_fallback/Scripts/04 SetBGFitHelpers.lua @@ -46,7 +46,7 @@ function BGFitChoiceExample(params) {{-hw, -hh, 0}, params.soutline_color}, } self:SetVertices(verts) - self:SetLineWidth(1) + self:SetLineWidth(2) self:SetDrawState{Mode= "DrawMode_LineStrip"} end }, diff --git a/src/ActorUtil.cpp b/src/ActorUtil.cpp index 2fb3b5ffda..6bbeb84e42 100644 --- a/src/ActorUtil.cpp +++ b/src/ActorUtil.cpp @@ -417,7 +417,10 @@ bool ActorUtil::GetAttrPath( const XNode *pNode, const RString &sName, RString & RString 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; } sOut = sDir+sOut;