Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8408 in orxonox.OLD for trunk/src/world_entities/space_ships


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

Location:
trunk/src/world_entities/space_ships
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/space_ships/helicopter.cc

    r8362 r8408  
    3535
    3636CREATE_FACTORY(Helicopter, CL_HELICOPTER);
     37#include "script_class.h"
     38//CREATE_SCRIPTABLE_CLASS(Helicopter, CL_HELICOPTER, NULL);
     39
    3740
    3841/**

  • trunk/src/world_entities/space_ships/helicopter.h

    r7810 r8408  
    3737
    3838    virtual void process(const Event &event);
     39   
     40    virtual void moveUp(bool move){bUp = move;};
    3941
    4042
    … …  
    7880};
    7981
     82//CREATE_SCRIPTABLE_CLASS(Helicopter, CL_HELICOPTER,
     83                       // addMethod("moveUp", ExecutorLua1<Object,bool>(&Helicopter::moveUp))
     84                       // );
     85
     86
    8087#endif /* _HELICOPTERS_H */
Note: See TracChangeset for help on using the changeset viewer.