usata-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Usata-commits] Changes to usata2/src/scene-loader.cpp


From: David Lau
Subject: [Usata-commits] Changes to usata2/src/scene-loader.cpp
Date: Tue, 01 Mar 2005 23:34:13 -0500

Index: usata2/src/scene-loader.cpp
diff -u usata2/src/scene-loader.cpp:1.2 usata2/src/scene-loader.cpp:1.3
--- usata2/src/scene-loader.cpp:1.2     Fri Feb 25 18:08:01 2005
+++ usata2/src/scene-loader.cpp Wed Mar  2 04:34:11 2005
@@ -10,7 +10,7 @@
 // included in the software distribution, or visit
 // http://www.fsf.org/licenses/gpl.html.
 //
-// $Id: scene-loader.cpp,v 1.2 2005/02/25 18:08:01 skunix Exp $
+// $Id: scene-loader.cpp,v 1.3 2005/03/02 04:34:11 skunix Exp $
 
 #include <memory>
 #include <fstream>
@@ -80,15 +80,23 @@
                Object* no = objreg->create(odp->type);
                if (!no)
                {
-                       ls << "creation of object failed (class=\"" << 
odp->type <<"\")" << log::commit;
+                       ls      << "creation of object failed (class=\"" 
+                               << odp->type <<"\")" << log::commit;
+                       continue;
                }
                GCInterface *no_gci = dynamic_cast<GCInterface*>(no);
                if (no_gci)
                {
-                       no_gci->construct(odp->props);
-                       LoadedObjects->push_back(Object_sp(no));
-                       ls << "successfully loaded and initialized " << 
odp->type
-                               <<log::commit;
+                       bool Good = no_gci->initialize(odp->props);
+
+                       if (Good)
+                       {
+                               LoadedObjects->push_back(Object_sp(no));
+                               ls  << "successfully loaded and initialized " 
<< odp->type
+                                       <<log::commit;
+                       }
+                       else
+                               delete no;
                }
                else
                {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]