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

[David Lau]

Index: usata2/src/usata.cpp
diff -u usata2/src/usata.cpp:1.18 usata2/src/usata.cpp:1.19
--- usata2/src/usata.cpp:1.18   Sat Jan 15 19:33:57 2005
+++ usata2/src/usata.cpp        Tue Jan 18 00:12:08 2005
@@ -1,7 +1,7 @@
 // -*- mode: C++; tab-width: 4; indent-tabs-mode: t; -*- vim:ts=4:sw=4
 //
-// Copyright (C) 2004  David Lau (skunix)
-//                     Chong Kai Xiong (descender)
+// Copyright (C) 2004,2005  David Lau (skunix)
+//                          Chong Kai Xiong (descender)
 //
 // This file is part of The Plains of Usata.
 //
@@ -10,7 +10,7 @@
 // included in the software distribution, or visit
 // http://www.fsf.org/licenses/gpl.html.
 //
-// $Id: usata.cpp,v 1.18 2005/01/15 19:33:57 skunix Exp $
+// $Id: usata.cpp,v 1.19 2005/01/18 00:12:08 skunix Exp $
 
 #include "usata.hpp"
 #include "config.hpp"
@@ -104,7 +104,7 @@
 
 }
 Usata::Usata()
-:      texture_manager(new TextureManager),
+:      image_manager(new ImageManager),
        scene_manager(new SceneManager)
 {
 
@@ -186,7 +186,7 @@
        setup_video();
        boost::filesystem::path datapath = find_data();
        // FIXME: catch exceptions
-       texture_manager->load_path(datapath);
+       image_manager->load_path(datapath);
        GuiNode::create(scene_manager.get());
        
        Object * obj=ObjectRegistry::instance()->create("Something");
@@ -194,10 +194,6 @@
        GCInterface * gci = dynamic_cast<GCInterface*>(obj);
        gci->realize(*this, zzz);
 
-
-       //texture_manager->get("atex");
-       
-
        return loop();
 }