Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9869 in orxonox.OLD for trunk/src/proto


Ignore:
Timestamp:
Oct 3, 2006, 12:19:30 AM (18 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..

Location:
trunk/src/proto
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/proto/proto_class.cc

    r9406 r9869  
    1717
    1818#include "proto_class.h"
     19ObjectListDefinition(ProtoClass);
    1920
    2021
    … …  
    2728ProtoClass::ProtoClass ()
    2829{
    29    this->setClassID(CL_PROTO_ID, "ProtoClass");
     30  this->registerObject(this, ProtoClass::_objectList);
    3031
    3132   /* If you make a new class, what is most probably the case when you write this file
    3233      don't forget to:
    3334       1. Add the new file new_class.cc to the ./src/Makefile.am
    34        2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
    3535
    3636      Advanced Topics:

  • trunk/src/proto/proto_class.h

    r4838 r9869  
    1515//! A class for ...
    1616class ProtoClass : public BaseObject {
    17 
     17  ObjectListDeclaration(ProtoClass);
    1818 public:
    1919  ProtoClass();

  • trunk/src/proto/proto_singleton.cc

    r9406 r9869  
    1717
    1818#include "proto_singleton.h"
    19 
    20 
    21 
     19ObjectListDefinition(ProtoSingleton);
    2220
    2321/**
    … …  
    2624ProtoSingleton::ProtoSingleton ()
    2725{
    28    this->setClassID(CL_PROTO_ID, "ProtoSingleton");
    29    this->setName("ProtoSingleton");
    30 
    31    /* If you make a new class, what is most probably the case when you write this file
    32       don't forget to:
    33        1. Add the new file new_class.cc to the ./src/Makefile.am
    34        2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
    35    !!!!!!!!!! IMPORTANT FOR SINGLETON !!!!!!!!!!!!!!!!
    36         3. SingleTon MUST be CL_NEW_CLASS = 0x00000fxx
    37 
    38       Advanced Topics:
    39       - if you want to let your object be managed via the ObjectManager make sure to read
    40         the object_manager.h header comments. You will use this most certanly only if you
    41         make many objects of your class, like a weapon bullet.
    42    */
     26  this->registerObject(this, ProtoSingleton::_objectList);
     27  this->setName("ProtoSingleton");
    4328}
    4429

  • trunk/src/proto/proto_singleton.h

    r5405 r9869  
    1313//! A default singleton class.
    1414class ProtoSingleton : public BaseObject {
     15  ObjectListDeclaration(ProtoSingleton);
     16
    1517
    1618 public:
Note: See TracChangeset for help on using the changeset viewer.