Index: branches/new_class_id/src/world_entities/creatures/fps_player.cc
===================================================================
--- branches/new_class_id/src/world_entities/creatures/fps_player.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/creatures/fps_player.cc	(revision 9757)
@@ -46,5 +46,5 @@
 
 #include "script_class.h"
-CREATE_SCRIPTABLE_CLASS(FPSPlayer, FPSPlayer::classID(),
+CREATE_SCRIPTABLE_CLASS(FPSPlayer,
 			addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
 			    ->addMethod("getAbsCoorX", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorX))
@@ -167,5 +167,5 @@
 
     //subscribe to collision reaction
-  this->subscribeReaction(CREngine::CR_PHYSICS_FULL_WALK, BspEntity::classID());
+  this->subscribeReaction(CREngine::CR_PHYSICS_FULL_WALK, BspEntity::staticClassID());
 
   this->initWeapon = false;
Index: branches/new_class_id/src/world_entities/environments/mapped_water.cc
===================================================================
--- branches/new_class_id/src/world_entities/environments/mapped_water.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/environments/mapped_water.cc	(revision 9757)
@@ -32,5 +32,5 @@
 SHELL_COMMAND(output, MappedWater, saveParams);
 
-CREATE_SCRIPTABLE_CLASS(MappedWater, MappedWater::classID(),
+CREATE_SCRIPTABLE_CLASS(MappedWater,
                         addMethod("waterUV", Executor2<MappedWater, lua_State*, float, float>(&MappedWater::fadeWaterUV))
                         ->addMethod("waterFlow", Executor2<MappedWater, lua_State*, float, float>(&MappedWater::fadeWaterFlow))
Index: branches/new_class_id/src/world_entities/npcs/attractor_mine.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/attractor_mine.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/npcs/attractor_mine.cc	(revision 9757)
@@ -37,5 +37,5 @@
 CREATE_FACTORY(AttractorMine);
 #include "script_class.h"
-CREATE_SCRIPTABLE_CLASS(AttractorMine, AttractorMine::classID(),
+CREATE_SCRIPTABLE_CLASS(AttractorMine,
                         addMethod("setName", Executor1<BaseObject, lua_State*,const std::string&>(&BaseObject::setName))
                         //Coordinates
Index: branches/new_class_id/src/world_entities/npcs/gate.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/gate.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/npcs/gate.cc	(revision 9757)
@@ -37,5 +37,5 @@
 
 #include "script_class.h"
-CREATE_SCRIPTABLE_CLASS(Gate, Gate::classID(),
+CREATE_SCRIPTABLE_CLASS(Gate,
 			addMethod("hide", Executor0<WorldEntity, lua_State*>(&WorldEntity::hide))
 			    ->addMethod("unhide", Executor0<WorldEntity, lua_State*>(&WorldEntity::unhide))
Index: branches/new_class_id/src/world_entities/npcs/generic_npc.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/generic_npc.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/npcs/generic_npc.cc	(revision 9757)
@@ -37,5 +37,5 @@
 
 #include "script_class.h"
-CREATE_SCRIPTABLE_CLASS(GenericNPC, GenericNPC::classID(),
+CREATE_SCRIPTABLE_CLASS(GenericNPC,
                         // Move
                         addMethod("walkTo", Executor3<GenericNPC, lua_State*,float,float,float>(&GenericNPC::walkTo))
@@ -95,5 +95,5 @@
 
   // collision reaction registration
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, BspEntity::classID());
+  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, BspEntity::staticClassID());
 }
 
Index: branches/new_class_id/src/world_entities/playable.cc
===================================================================
--- branches/new_class_id/src/world_entities/playable.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/playable.cc	(revision 9757)
@@ -110,9 +110,9 @@
 {
   /// FIXME TOTALLY
-  if(powerUp->isA(WeaponPowerUp::classID()))
+  if(powerUp->isA(WeaponPowerUp::staticClassID()))
   {
     return static_cast<WeaponPowerUp*>(powerUp)->process(&this->getWeaponManager());
   }
-  else if(powerUp->isA(ParamPowerUp::classID()))
+  else if(powerUp->isA(ParamPowerUp::staticClassID()))
   {
     ParamPowerUp* ppu = static_cast<ParamPowerUp*>(powerUp);
Index: branches/new_class_id/src/world_entities/power_ups/power_up.cc
===================================================================
--- branches/new_class_id/src/world_entities/power_ups/power_up.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/power_ups/power_up.cc	(revision 9757)
@@ -122,5 +122,5 @@
 void PowerUp::collidesWith (WorldEntity* entity, const Vector& location)
 {
-  if(this->collider != entity && entity->isA(Extendable::classID()))
+  if(this->collider != entity && entity->isA(Extendable::staticClassID()))
   {
     this->collider = entity;
Index: branches/new_class_id/src/world_entities/script_trigger.cc
===================================================================
--- branches/new_class_id/src/world_entities/script_trigger.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/script_trigger.cc	(revision 9757)
@@ -22,5 +22,5 @@
 ObjectListDefinition(ScriptTrigger);
 
-CREATE_SCRIPTABLE_CLASS(ScriptTrigger, ScriptTrigger::classID(),
+CREATE_SCRIPTABLE_CLASS(ScriptTrigger,
             // Coordinates
 			addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
Index: branches/new_class_id/src/world_entities/space_ships/helicopter.cc
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/helicopter.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/space_ships/helicopter.cc	(revision 9757)
@@ -38,5 +38,5 @@
 CREATE_FACTORY(Helicopter);
 #include "script_class.h"
-CREATE_SCRIPTABLE_CLASS(Helicopter, Helicopter::classID(),
+CREATE_SCRIPTABLE_CLASS(Helicopter,
 			addMethod("moveUp", Executor1<Helicopter, lua_State*,bool>(&Helicopter::moveUp))
 			    ->addMethod("moveDown", Executor1<Helicopter, lua_State*,bool>(&Helicopter::moveDown))
Index: branches/new_class_id/src/world_entities/space_ships/hover.cc
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/hover.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/space_ships/hover.cc	(revision 9757)
@@ -39,5 +39,5 @@
 
 #include "script_class.h"
-CREATE_SCRIPTABLE_CLASS(Hover, Hover::classID(),
+CREATE_SCRIPTABLE_CLASS(Hover,
 			addMethod("hasPlayer", Executor0ret<Playable, lua_State*,bool>(&Playable::hasPlayer))
                         //Coordinates
Index: branches/new_class_id/src/world_entities/space_ships/space_ship.cc
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/space_ship.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/space_ships/space_ship.cc	(revision 9757)
@@ -58,5 +58,5 @@
 
 #include "script_class.h"
-CREATE_SCRIPTABLE_CLASS(SpaceShip, SpaceShip::classID(),
+CREATE_SCRIPTABLE_CLASS(SpaceShip,
                         addMethod("hasPlayer", Executor0ret<Playable, lua_State*,bool>(&Playable::hasPlayer))
                         ->addMethod("fire", Executor1<Playable, lua_State*, bool>(&Playable::fire))
Index: branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.cc
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.cc	(revision 9757)
@@ -42,5 +42,5 @@
 CREATE_FACTORY(Spacecraft2D);
 
-CREATE_SCRIPTABLE_CLASS(Spacecraft2D, Spacecraft2D::classID(),
+CREATE_SCRIPTABLE_CLASS(Spacecraft2D,
 			addMethod("hasPlayer", Executor0ret<Playable, lua_State*,bool>(&Playable::hasPlayer))
                         //Coordinates
Index: branches/new_class_id/src/world_entities/test_entity.cc
===================================================================
--- branches/new_class_id/src/world_entities/test_entity.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/test_entity.cc	(revision 9757)
@@ -40,5 +40,5 @@
 
 #include "script_class.h"
-CREATE_SCRIPTABLE_CLASS(TestEntity, TestEntity::classID(),
+CREATE_SCRIPTABLE_CLASS(TestEntity,
                         addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
                         ->addMethod("getAbsCoorX", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorX))
Index: branches/new_class_id/src/world_entities/weapons/aiming_system.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/aiming_system.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/weapons/aiming_system.cc	(revision 9757)
@@ -62,5 +62,5 @@
   // registering default reactions:
   this->unsubscribeReaction(CREngine::CR_OBJECT_DAMAGE);
-  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, WorldEntity::classID());
+  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, WorldEntity::staticClassID());
 
   this->range = 1000.0f;
Index: branches/new_class_id/src/world_entities/weapons/weapon.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/weapon.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/weapons/weapon.cc	(revision 9757)
@@ -77,5 +77,5 @@
   if (createdObject != NULL)
   {
-    if (createdObject->isA(Weapon::classID()))
+    if (createdObject->isA(Weapon::staticClassID()))
       return dynamic_cast<Weapon*>(createdObject);
     else
@@ -93,5 +93,5 @@
   if (createdObject != NULL)
   {
-    if (createdObject->isA(Weapon::classID()))
+    if (createdObject->isA(Weapon::staticClassID()))
       return dynamic_cast<Weapon*>(createdObject);
     else
@@ -131,5 +131,5 @@
   this->defaultTarget = NULL;                      //< Nothing is Targeted by default.
 
-  this->projectile = NullClass::classID();         //< No Projectile Class is Connected to this weapon
+  this->projectile = NullClass::staticClassID();         //< No Projectile Class is Connected to this weapon
   this->projectileFactory = NULL;                  //< No Factory generating Projectiles is selected.
 
Index: branches/new_class_id/src/world_entities/weapons/weapon_manager.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/weapon_manager.cc	(revision 9755)
+++ branches/new_class_id/src/world_entities/weapons/weapon_manager.cc	(revision 9757)
@@ -298,5 +298,5 @@
   {
     this->parentNode->addChild(weapon);
-    if (this->parentEntity->isA(Playable::classID()))
+    if (this->parentEntity->isA(Playable::staticClassID()))
       dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
     weapon->setDefaultTarget(this->crosshair);
@@ -468,5 +468,5 @@
       else
         this->currentSlotConfig[i].position.deactivateNode();
-      if (this->parentEntity != NULL && this->parentEntity->isA(Playable::classID()))
+      if (this->parentEntity != NULL && this->parentEntity->isA(Playable::staticClassID()))
         dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
     }
