Home Explore Help
Sign In
cpp
/
RmlUi
mirror of https://github.com/mikke89/RmlUi.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fix luainvaders template warnings

Michael Ragazzon 4 years ago
parent
5cfc628ada
commit
b866c72380
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      Samples/luainvaders/data/window.rml
  2. 1 1
      Source/Core/XMLNodeHandlerBody.cpp

+ 1 - 1
Samples/luainvaders/data/window.rml
View File 

@@ -19,6 +19,6 @@ function Window.LoadMenu(name,document)
 
 end
 
 end
 
 	</script>
 
 	</script>
 
 </head>
 
 </head>
 
-<body template="window" onload="Window.OnWindowLoad(document)">
 
+<body template="window">
 
 </body>
 
 </body>
 
 </template>
 
 </template>

+ 1 - 1
Source/Core/XMLNodeHandlerBody.cpp
View File 

@@ -56,7 +56,7 @@ Element* XMLNodeHandlerBody::ElementStart(XMLParser* parser, const String& RMLUI
 
 		for (auto& pair : attributes)
 
 		for (auto& pair : attributes)
 
 		{
 
 		{
 
 			Variant* attribute = document->GetAttribute(pair.first);
 
 			Variant* attribute = document->GetAttribute(pair.first);
 
-			if (attribute && *attribute != pair.second)
 
+			if (attribute && *attribute != pair.second && pair.first != "template")
 
 			{
 
 			{
 
 				Log::Message(Log::LT_WARNING, "Overriding attribute '%s' in element %s during template injection.", pair.first.c_str(), element->GetAddress().c_str());
 
 				Log::Message(Log::LT_WARNING, "Overriding attribute '%s' in element %s during template injection.", pair.first.c_str(), element->GetAddress().c_str());
 
 			}
 
 			}