Changeset 9298 in orxonox.OLD for trunk/src/world_entities/world_entity.h

Timestamp:

Jul 17, 2006, 9:29:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the branche scripting back here.

merged with command:
svn merge -r9239:HEAD ​https://svn.orxonox.net/orxonox/branches/scripting .
no conflicts

File:

• trunk/src/world_entities/world_entity.h (modified) (1 diff)

trunk/src/world_entities/world_entity.h

@@ -129 +129 @@
 
   /* --- Character Attribute Block --- */
+  /** @returns the scaling of the model */
+  float getScaling(){return this->scaling;}
   /** @returns the damage dealt by this world entity */
   float getDamage() const { return this->damage; }