Index: trunk/src/lib/graphics/importer/md2/md2Model.cc
===================================================================
--- trunk/src/lib/graphics/importer/md2/md2Model.cc	(revision 10076)
+++ trunk/src/lib/graphics/importer/md2/md2Model.cc	(revision 10114)
@@ -92,5 +92,5 @@
   rebuildInfo();
 
-  //this->debug();
+  this->debug();
 }
 
@@ -99,4 +99,7 @@
 {
   this->init();
+
+  this->scaleFactor = model.scaleFactor;
+
   this->rebuildInfo();
 }
@@ -104,4 +107,6 @@
 MD2Model& MD2Model::operator=(const MD2Model& md2model)
 {
+  this->init();
+  this->scaleFactor = md2model.scaleFactor;
   this->data = md2model.data;
   this->rebuildInfo();
@@ -141,4 +146,9 @@
   this->data = MD2Data::Pointer(new MD2Data(modelFileName, skinFileName, scale));
   this->rebuildInfo();
+
+  // init the animation - do not remove
+  this->tick( 0.01);
+
+  return true;
 }
 
@@ -268,6 +278,4 @@
 /**
  * @brief draws the model: interface for all other classes out in the world
- * @todo make it const and virtual
- * FIXME
  */
 void MD2Model::draw() const
@@ -313,4 +321,5 @@
       glNormal3fv(anorms[this->data->pLightNormals[pCommands[2]]]);
       glVertex3fv(this->verticesList[pCommands[2]]);
+//       printf("vertex: %f, %f, %f\n", this->verticesList[pCommands[2]][0], this->verticesList[pCommands[2]][1], this->verticesList[pCommands[2]][2]);
     }
     glEnd();
@@ -325,5 +334,5 @@
 {
   //static sVec3D this->verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
-  int* pCommands = this->data->pGLCommands;
+  //  int* pCommands = this->data->pGLCommands;
   /* some face culling stuff */
   //   glPushAttrib(GL_POLYGON_BIT);
@@ -428,5 +437,6 @@
   PRINT(0)("=  Number of Frames: \t%i\n", this->data->header->numFrames);
   PRINT(0)("=  Height, Width:\t%i, %i\n", this->data->header->skinHeight, this->data->header->skinWidth);
-  //PRINT(0)("=  Pointer to the data object: %p\n", this->data);
+  PRINT(0)("=  DATA:\n");
+  PRINT(0)("=  Number of references to data: %i\n", this->data.count());
   PRINT(0)("===================================================\n\n");
 }
@@ -452,4 +462,6 @@
   this->loadModel(modelFileName);
   this->loadSkin(skinFileName);
+
+  PRINTF(0)("model %s, skin %s\n", modelFileName.c_str(), skinFileName.c_str());
 }
 
@@ -570,4 +582,6 @@
   delete [] buffer;
   fclose(pFile);
+
+  return true;
 }
 
@@ -592,3 +606,5 @@
   this->material.setIllum(3);
   this->material.setAmbient(1.0, 1.0, 1.0);
-}
+
+  return true;
+}
Index: trunk/src/lib/graphics/importer/md2/resource_md2.cc
===================================================================
--- trunk/src/lib/graphics/importer/md2/resource_md2.cc	(revision 10076)
+++ trunk/src/lib/graphics/importer/md2/resource_md2.cc	(revision 10114)
@@ -20,7 +20,8 @@
     PRINTF(0)("NOT FOUND MD2: %s\n", modelName.c_str());
     std::string modelFileName = this->Resource::locateFile(modelName);
-    //std::string skinFileName = this->Resource::locateFile(skinName);
+    std::string skinFileName = this->Resource::locateFile(skinName);
+    PRINTF(0)("NEW %s::%s\n", modelName.c_str(), modelFileName.c_str());
     this->MD2Model::load(modelFileName, skinName, scale);
-    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinName, scale), keepLevel, this->MD2Model::dataPointer()));
+    this->Resource::addResource(new ResourceMD2::MD2ResourcePointer(loadString(modelName, skinFileName, scale), keepLevel, this->MD2Model::dataPointer()));
   }
 
Index: trunk/src/lib/graphics/light.cc
===================================================================
--- trunk/src/lib/graphics/light.cc	(revision 10076)
+++ trunk/src/lib/graphics/light.cc	(revision 10114)
@@ -26,7 +26,5 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(Light, CL_LIGHT);
+ObjectListDefinition(Light);
 CREATE_FACTORY(Light);
 
Index: trunk/src/lib/graphics/render2D/image_plane.cc
===================================================================
--- trunk/src/lib/graphics/render2D/image_plane.cc	(revision 10076)
+++ trunk/src/lib/graphics/render2D/image_plane.cc	(revision 10114)
@@ -23,8 +23,5 @@
 #include "p_node.h"
 
-
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(ImagePlane, CL_IMAGE_PLANE);
+ObjectListDefinition(ImagePlane);
 CREATE_FACTORY(ImagePlane);
 
Index: trunk/src/lib/graphics/shader_data.cc
===================================================================
--- trunk/src/lib/graphics/shader_data.cc	(revision 10076)
+++ trunk/src/lib/graphics/shader_data.cc	(revision 10114)
@@ -63,5 +63,8 @@
   {
     PRINTF(2)("Shaders are not supported on your hardware\n");
-  }
+    return true;
+  }
+  
+  return true;
 }
 
Index: trunk/src/lib/graphics/text_engine/limited_width_text.cc
===================================================================
--- trunk/src/lib/graphics/text_engine/limited_width_text.cc	(revision 10076)
+++ trunk/src/lib/graphics/text_engine/limited_width_text.cc	(revision 10114)
@@ -33,4 +33,5 @@
   this->setLineWidth(lineWidth);
 }
+
 
 /**
