[Orxonox-commit 7134] r11751 - in code/branches/Presentation_HS17_merge: data/gui/layouts src/modules/dialog

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-15 23:29:31 +0100 (Thu, 15 Feb 2018)
New Revision: 11751

Modified:
   code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout
   code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc
Log:
[Dialog_HS17] details

Modified: code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout
===================================================================
--- code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout	2018-02-15 22:18:38 UTC (rev 11750)
+++ code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout	2018-02-15 22:29:31 UTC (rev 11751)
@@ -2,7 +2,7 @@
 
 <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}}" />
         <Window Type="MenuWidgets/StaticText" Name="orxonox/Dialog/Options" >

Modified: code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc	2018-02-15 22:18:38 UTC (rev 11750)
+++ code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc	2018-02-15 22:29:31 UTC (rev 11751)
@@ -39,12 +39,13 @@
 	DialogManager::DialogManager()
 	{
 		this->currentTalk_ = nullptr;
+		this->answerIds_ = nullptr;
 	}
 
 	void DialogManager::setDialog(Dialog* dialog)
 	{
 		this->currentTalk_ = dialog;
-		answerIds_ = &currentTalk_->getAnswerIds();
+		this->answerIds_ = &this->currentTalk_->getAnswerIds();
 	}
 
 	//from here onward funcionality for lua axports
@@ -84,7 +85,7 @@
 
     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();
     }
 }