Revision: 4792
http://cel.svn.sourceforge.net/cel/?rev=4792&view=rev
Author: jorrit
Date: 2012-03-23 09:30:23 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Fixed a bug in loading of parents for entity templates. The error checking
was wrong.
Modified Paths:
--------------
cel/trunk/plugins/addons/celentitytpl/celentitytpl.cpp
cel/trunk/plugins/stdphyslayer/entitytpl.cpp
Modified: cel/trunk/plugins/addons/celentitytpl/celentitytpl.cpp
===================================================================
--- cel/trunk/plugins/addons/celentitytpl/celentitytpl.cpp 2012-03-19
05:08:22 UTC (rev 4791)
+++ cel/trunk/plugins/addons/celentitytpl/celentitytpl.cpp 2012-03-23
09:30:23 UTC (rev 4792)
@@ -561,7 +561,7 @@
{
const char* tplname = child->GetAttributeValue ("name");
iCelEntityTemplate* tpl = pl->FindEntityTemplate (tplname);
- if (!tplname)
+ if (!tpl)
{
synldr->ReportError (
"cel.addons.celentitytpl",
Modified: cel/trunk/plugins/stdphyslayer/entitytpl.cpp
===================================================================
--- cel/trunk/plugins/stdphyslayer/entitytpl.cpp 2012-03-19 05:08:22 UTC
(rev 4791)
+++ cel/trunk/plugins/stdphyslayer/entitytpl.cpp 2012-03-23 09:30:23 UTC
(rev 4792)
@@ -345,6 +345,7 @@
void celEntityTemplate::AddParent (iCelEntityTemplate* tpl)
{
+ CS_ASSERT (tpl);
parents.Push (tpl);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Cel-cvs-update mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/cel-cvs-update
