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

[David Lau]

Index: usata2/src/usata.cpp
diff -u usata2/src/usata.cpp:1.24 usata2/src/usata.cpp:1.25
--- usata2/src/usata.cpp:1.24   Fri Feb 25 18:08:01 2005
+++ usata2/src/usata.cpp        Fri Feb 25 19:50:47 2005
@@ -10,7 +10,7 @@
 // included in the software distribution, or visit
 // http://www.fsf.org/licenses/gpl.html.
 //
-// $Id: usata.cpp,v 1.24 2005/02/25 18:08:01 skunix Exp $
+// $Id: usata.cpp,v 1.25 2005/02/25 19:50:47 skunix Exp $
 
 #include "usata.hpp"
 #include "config.hpp"
@@ -28,6 +28,7 @@
 #include <boost/format.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/bind.hpp>
+#include <boost/thread/thread.hpp>
 #include <memory>
 
 #include "object.hpp"
@@ -111,6 +112,7 @@
        scene_manager(new SceneManager),
        input_manager(new input::Manager)
 {
+
        input_manager->add_driver(input::default_driver());
        input_manager->quit_signal.connect(boost::bind(&Usata::on_quit, this));
 
@@ -144,10 +146,12 @@
                logstream << "mode checks out." << log::commit;
        else
        {
-               logstream << "scan_modes() suggests " << vm2.width << "x" << 
vm2.height << log::commit;
+               logstream << "scan_modes() suggests " 
+                                 << vm2.width << "x" << vm2.height 
+                                 << log::commit;
        }       
        set_mode(vm2);
-       
+       return; 
 }
 
 int
@@ -194,10 +198,13 @@
        boost::filesystem::path datapath = find_data();
        // FIXME: catch exceptions
        image_manager->load_path(datapath);
-       GuiNode::create(scene_manager.get());
 
        mSceneLoader.reset( new SceneLoader(datapath) );
-       mSceneLoader->load("start.xml");                
+       mSceneLoader->load("start.xml");
+
+       GuiNode::create(scene_manager.get());
+       boost::thread::yield();
+
        return loop();
 }