Changeset 9869 in orxonox.OLD for trunk/src/world_entities/npcs/npc_test.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/npcs/npc_test.cc (modified) (3 diffs)

trunk/src/world_entities/npcs/npc_test.cc

@@ -30 +30 @@
 #include "effects/explosion.h"
 
-CREATE_FACTORY(NPC2, CL_NPC_TEST2);
-
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(NPC2, CL_NPC_TEST2);
+CREATE_FACTORY(NPC2);
 
 NPC2::NPC2(const TiXmlElement* root)
   : NPC(NULL)
 {
-  this->setClassID(CL_NPC_TEST2, "NPC2");
+  this->registerObject(this, NPC2::_objectList);
 
   if ((float)rand()/RAND_MAX > .5f)
@@ -47 +48 @@
 
   this->shader = NULL;
-  if (likely(Shader::checkShaderAbility()))
-    this->shader = Shader::getShader("shaders/toon.vert", "shaders/toon.frag");
+//  if (likely(Shader::checkShaderAbility()))
+    //this->shader = Shader::getShader("shaders/toon.vert", "shaders/toon.frag");
 
   this->randomRotAxis = VECTOR_RAND(1);
@@ -58 +59 @@
 
 NPC2::~NPC2 ()
-{
-  if (this->shader)
-    Shader::unload(this->shader);
-}
+{}