Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8170 in orxonox.OLD for branches/script_engine/src


Ignore:
Timestamp:
Jun 6, 2006, 8:06:50 AM (18 years ago)
Author:
snellen
Message:

added scripttrigger

Location:
branches/script_engine/src/lib/script_engine
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

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

    r8130 r8170  
    1313
    1414libORXscript_a_SOURCES = \
    15                 script.cc\
    16                 script_manager.cc
     15                script.cc\
     16                script_manager.cc\
     17                script_trigger.cc
    1718
    1819AM_CPPFLAGS= @LUA_INCLUDES@
    … …  
    2122                lunar.h\
    2223                script.h\
    23                 script_manager.h
     24                script_manager.h\
     25                script_trigger.h
    2426
    2527
    … …  
    3436
    3537example_DEPENDENCIES = \
    36                 $(MAINSRCDIR)/world_entities/libORXwe.a \
    37                 $(libORXlibs_a_LIBRARIES_) \
    38                 $(MAINSRCDIR)/util/libORXutils.a
     38                $(MAINSRCDIR)/world_entities/libORXwe.a \
     39                $(libORXlibs_a_LIBRARIES_) \
     40                $(MAINSRCDIR)/util/libORXutils.a
    3941
    4042example_LDADD = \
    41                 $(MAINSRCDIR)/util/libORXutils.a \
    42                 $(libORXlibs_a_LIBRARIES_) \
    43                 libORXscript.a -L../../../extern_libs @LUA_LIBS@ \
    44                 $(MAINSRCDIR)/world_entities/libORXwe.a \
    45                 $(libORXlibs_a_LIBRARIES_) \
    46                 $(MAINSRCDIR)/util/libORXutils.a
     43                $(MAINSRCDIR)/util/libORXutils.a \
     44                $(libORXlibs_a_LIBRARIES_) \
     45                libORXscript.a -L../../../extern_libs @LUA_LIBS@ \
     46                $(MAINSRCDIR)/world_entities/libORXwe.a \
     47                $(libORXlibs_a_LIBRARIES_) \
     48                $(MAINSRCDIR)/util/libORXutils.a
    4749
    4850example_SOURCES= \
    49                 example.cc \
    50                 \
    51                 ../util/executor/executor_lua.cc
     51                example.cc \
     52                \
     53                ../util/executor/executor_lua.cc

  • branches/script_engine/src/lib/script_engine/script_manager.cc

    r8164 r8170  
    6868{
    6969  const TiXmlElement* script = scripts->FirstChildElement();
    70   const TiXmlElement* object;
    7170
    7271  PRINTF(4)("Creating scriptlist\n");
    … …  
    7473  while( script != NULL)
    7574  {
    76     { // scope to make the Loadparam work
     75    { // scope to make the LoadParam work
    7776    LoadParam(script, "file", this, ScriptManager, setCurrentScriptFile)
    7877        .describe("the fileName of the script, that should be loaded into this world")
    … …  
    8281    if(!currentScript.name.empty()) // if LoadParam didn't fail... fill the object list with the needed objects
    8382    {
    84     /*object = script->FirstChildElement("object");
    85 
    86     while(object != NULL)
    87     {
    88       LoadParam(object, "object", this, ScriptManager, setCurrentScriptFile)
    89           .describe("the fileName of the script, that should be loaded into this world")
    90           .defaultValues("");
    91       object = object->NextSiblingElement("object");
    92     }
    93     */
    9483
    9584    LOAD_PARAM_START_CYCLE(script, object);
    … …  
    9988    }
    10089    LOAD_PARAM_END_CYCLE(object);
    101 
    10290
    10391    scriptList.push_back(currentScript);

  • branches/script_engine/src/lib/script_engine/script_manager.h

    r8164 r8170  
    11#ifndef _SCRIPT_MANAGER_H
    2 #define _SCRIPT_MNAGER_H
     2#define _SCRIPT_MANAGER_H
    33
    44#include <list>
Note: See TracChangeset for help on using the changeset viewer.