Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8408 in orxonox.OLD for trunk/src/lib/script_engine/script_class.cc


Ignore:
Timestamp:
Jun 14, 2006, 5:50:18 PM (19 years ago)
Author:
bensch
Message:

trunk: merged the script_engine branche back here
merged with command
svn merge https://svn.orxonox.net/orxonox/branches/script_engine . -r8284:HEAD
no conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/script_engine/script_class.cc

    r8271 r8408  
    1717
    1818#include "script_class.h"
    19 
    20 using namespace std;
    21 
     19#include <cassert>
    2220
    2321/**
    24  * standard constructor
     22 * @brief standard constructor
    2523 * @todo this constructor is not jet implemented - do it
    2624*/
    27 ScriptClass::ScriptClass(const std::string& name, ClassID classID)
    28  : BaseObject(name)
     25ScriptClass::ScriptClass(const std::string& name, ClassID classID, ScriptMethod* scriptMethods)
     26    : BaseObject(name)
    2927{
    30    this->setClassID(CL_SCRIPT_CLASS, "ScriptClass");
    31    this->classID = classID;
     28  assert(scriptMethods != NULL);
     29  this->setClassID(CL_SCRIPT_CLASS, "ScriptClass");
     30
     31  this->_classID = classID;
     32
     33  this->_scriptMethods = scriptMethods;
    3234}
    3335
     
    3840ScriptClass::~ScriptClass ()
    3941{
    40   // delete what has to be deleted here
     42  delete this->_scriptMethods;
    4143}
Note: See TracChangeset for help on using the changeset viewer.