Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10277 in orxonox.OLD


Ignore:
Timestamp:
Jan 17, 2007, 7:22:15 PM (17 years ago)
Author:
hejja
Message:

2 Folgequestscd ..

Location:
branches/gui/src/world_entities
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/gui/src/world_entities/questGUI/quest_gui.cc

    r10273 r10277  
    6060CREATE_SCRIPTABLE_CLASS(QuestGUI,
    6161                        addMethod("guiInit", Executor0<QuestGUI, lua_State*>(&QuestGUI::guiInit))
     62                        ->addMethod("isActive", Executor0ret<QuestGUI, lua_State*,bool>(&QuestGUI::isActive))
    6263                       );
    6364
    … …  
    7576
    7677  this->bKillGui = false;
     78 
     79  this->bActive = false;
    7780
    7881  this->myQuest = new Quest(root);
    … …  
    250253  this->myQuest->setQuestActive();
    251254  this->bKillGui = true;
     255  bActive=true;
    252256}
    253257
    … …  
    255259{
    256260  this->bKillGui = true;
     261  bActive=false;
    257262}
    258263

  • branches/gui/src/world_entities/questGUI/quest_gui.h

    r10273 r10277  
    2020                     
    2121   void loadParams(const TiXmlElement* root);
    22    
     22   bool isActive(){ return this->bActive; }
    2323   void guiInit();
    2424
    … …  
    2828    Quest*                  myQuest;
    2929    bool                    bKillGui;
     30    bool                    bActive;
    3031   
    3132    OrxGui::GLGuiBox*       headerBox;

  • branches/gui/src/world_entities/script_trigger.cc

    r10265 r10277  
    209209void ScriptTrigger::executeAction(float timestep)
    210210{
    211   printf("Script %s called \n",this->functionName.c_str());
    212211  if(scriptIsOk)
    213212  {
Note: See TracChangeset for help on using the changeset viewer.