Changeset 10492 in orxonox.OLD for trunk

Timestamp:

Jan 30, 2007, 1:30:44 AM (18 years ago)

Author:

patrick

Message:

blinki patch

Location:

trunk/src/world_entities/questGUI

Files:

• quest_gui.cc (modified) (6 diffs)
• quest_gui.h (modified) (2 diffs)

trunk/src/world_entities/questGUI/quest_gui.cc

@@ -59 +59 @@
 #include "script_class.h"
 CREATE_SCRIPTABLE_CLASS(QuestGUI,
-                        addMethod("guiInit", Executor0<QuestGUI, lua_State*>(&QuestGUI::guiInit))
-                        ->addMethod("isActive", Executor0ret<QuestGUI, lua_State*,bool>(&QuestGUI::isActive))
+                        addMethod("startGUI", Executor0<QuestGUI, lua_State*>(&QuestGUI::startGUI))
+                      ->addMethod("stopGUI",  Executor0<QuestGUI, lua_State*>(&QuestGUI::stopGUI))
+                      ->addMethod("isActive", Executor0ret<QuestGUI, lua_State*,bool>(&QuestGUI::isActive))
                        );
 
@@ -80 +81 @@
 
   this->myQuest = new Quest(root);
+
   if(root)
     this->loadParams( root);
@@ -109 +111 @@
  * initializes the gui
  */
-void QuestGUI::guiInit()
-{
+void QuestGUI::startGUI()
+{
+  this->bKillGui = false;
+
+
   if (questBox == NULL)
   {
@@ -119 +124 @@
     questBox->setBorderBottom(10);
     this->questBox->setBackgroundTexture("textures/gui/gui_quest_border.png");
-    this->bKillGui = false;
 
     OrxGui::GLGuiBox* headerBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
@@ -243 +247 @@
     OrxGui::GLGuiHandler::getInstance()->activateCursor();
   }
-  else
-  {
+}
+
+void QuestGUI::stopGUI()
+{
     this->bKillGui = true;
-  }
-
 }
 
@@ -278 +282 @@
   this->questBox = NULL;
   this->bKillGui = false;
-}
+  this->bActive = false;
+}

trunk/src/world_entities/questGUI/quest_gui.h

@@ -10 +10 @@
 class Quest;
 
-class QuestGUI : public WorldEntity 
+class QuestGUI : public WorldEntity
 {
 
   ObjectListDeclaration(QuestGUI);
-  
+
   public:
    QuestGUI (const TiXmlElement* root = NULL);
    virtual ~QuestGUI ();
-                     
+
    void loadParams(const TiXmlElement* root);
    bool isActive(){ return this->bActive; }
-   void guiInit();
+
+   void startGUI();
+   void stopGUI();
 
    virtual void tick(float dt);
-   
+
   private:
     Quest*                  myQuest;
     bool                    bKillGui;
     bool                    bActive;
-    
+
     OrxGui::GLGuiBox*       headerBox;
-    OrxGui::GLGuiBox*       outlineBox; 
+    OrxGui::GLGuiBox*       outlineBox;
     OrxGui::GLGuiBox*       labelBox;
     OrxGui::GLGuiImage*     placeImage;
@@ -45 +47 @@
 
     OrxSound::SoundSource*  selectorSource;
-    
+
     void accept();
     void refuse();