Changeset 11751 for code/branches

Timestamp:

Feb 15, 2018, 11:29:31 PM (7 years ago)

Author:

landauf

Message:

[Dialog_HS17] details

Location:

code/branches/Presentation_HS17_merge

Files:

• data/gui/layouts/Dialog.layout (modified) (1 diff)
• src/modules/dialog/DialogManager.cc (modified) (3 diffs)

code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout

@@ -3 +3 @@
 <GUILayout >
     <Window Type="DefaultWindow" Name="orxonox/Dialog/Background" > 
-        <Property Name="InheritsAlpha" Value="False" />
+        <Property Name="InheritsAlpha" Value="False" />
         <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />

code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc

@@ -40 +40 @@
         {
                 this->currentTalk_ = nullptr;
+                this->answerIds_ = nullptr;
         }
 
@@ -45 +46 @@
         {
                 this->currentTalk_ = dialog;
-                answerIds_ = &currentTalk_->getAnswerIds();
+                this->answerIds_ = &this->currentTalk_->getAnswerIds();
         }
 
@@ -85 +86 @@
     void DialogManager::update(int index)
     {
-        this->currentTalk_->update(answerIds_->at(index));
-        answerIds_ = &this->currentTalk_->getAnswerIds();
+        this->currentTalk_->update(this->answerIds_->at(index));
+        this->answerIds_ = &this->currentTalk_->getAnswerIds();
     }
 }