Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10616 in orxonox.OLD


Ignore:
Timestamp:
Mar 31, 2007, 12:06:51 PM (18 years ago)
Author:
snellen
Message:

shame on me: how could I forget to add the new classes to Makefile.am , removed obsolete lua_vector.*

Location:
branches/scriptimprovements/src
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • branches/scriptimprovements/src/lib/script_engine/Makefile.am

    r10561 r10616  
    1717                script.cc \
    1818                script_manager.cc \
    19                 executor_lua_state.cc \
    20                 lua_vector.cc
     19                executor_lua_state.cc
    2120
    2221AM_CPPFLAGS= @LUA_INCLUDES@
    … …  
    2827                script_class.h \
    2928                script_method.h \
    30                 executor_lua_state.h \
    31                 lua_vector.h
     29                executor_lua_state.h
    3230
    3331

  • branches/scriptimprovements/src/world_entities/Makefile.am

    r10437 r10616  
    2727                     effects/trail.cc\
    2828                     elements/glgui_energywidget.cc\
    29                      elements/glgui_energywidgetvertical.cc
     29                     elements/glgui_energywidgetvertical.cc\
     30                     script_triggers/script_trigger.cc
    3031
    3132
    … …  
    5152                 effects/wobblegrid.h\
    5253                 elements/glgui_energywidget.h\
    53                  elements/glgui_energywidgetvertical.h
     54                 elements/glgui_energywidgetvertical.h\
     55                 script_triggers/script_trigger.h
    5456
    5557

  • branches/scriptimprovements/src/world_entities/WorldEntities.am

    r10606 r10616  
    102102                world_entities/effects/blink.cc \
    103103                \
    104                 world_entities/script_triggers/script_trigger.cc \
     104                world_entities/script_triggers/space_trigger.cc \
     105                world_entities/script_triggers/tick_trigger.cc \
    105106                \
    106107                \
    … …  
    235236                effects/blink.h \
    236237                \
    237                 script_triggers/script_trigger.h \
     238                script_triggers/space_trigger.h \
     239                script_triggers/tick_trigger.h \
    238240                \
    239241                \

  • branches/scriptimprovements/src/world_entities/script_triggers/script_trigger.h

    r10614 r10616  
    4444  private:
    4545
    46     Script*      script;
    47     std::string  functionName;
    4846    bool         doDebugDraw;
    49    
    5047   
    5148    //for internal use
    … …  
    5451   
    5552  protected:
    56    
     53    Script*      script;
     54    std::string  functionName;
    5755    bool         scriptCalled;
    5856    bool         scriptIsOk;

  • branches/scriptimprovements/src/world_entities/script_triggers/space_trigger.cc

    r10614 r10616  
    1414*/
    1515
    16 
     16#include "util/loading/factory.h"
    1717#include "space_trigger.h"
    1818#include "debug.h"
    … …  
    4949{
    5050  this->registerObject(this, SpaceTrigger::_objectList);
    51   this->toList(OM_COMMON);
     51  //this->toList(OM_COMMON);
    5252
    5353  radius = 10;

  • branches/scriptimprovements/src/world_entities/script_triggers/tick_trigger.cc

    r10614 r10616  
    1414*/
    1515
    16 
     16#include "util/loading/factory.h"
    1717#include "tick_trigger.h"
    1818#include "debug.h"
    … …  
    4343{
    4444  this->registerObject(this, TickTrigger::_objectList);
    45   this->toList(OM_COMMON);
     45  //this->toList(OM_COMMON);
    4646
    4747  if(root != NULL)
Note: See TracChangeset for help on using the changeset viewer.