Changeset 11751 for code/branches/Presentation_HS17_merge
- Timestamp:
- Feb 15, 2018, 11:29:31 PM (7 years ago)
- Location:
- code/branches/Presentation_HS17_merge
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_HS17_merge/data/gui/layouts/Dialog.layout
r11747 r11751 3 3 <GUILayout > 4 4 <Window Type="DefaultWindow" Name="orxonox/Dialog/Background" > 5 5 <Property Name="InheritsAlpha" Value="False" /> 6 6 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" /> 7 7 <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" /> -
code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc
r11750 r11751 40 40 { 41 41 this->currentTalk_ = nullptr; 42 this->answerIds_ = nullptr; 42 43 } 43 44 … … 45 46 { 46 47 this->currentTalk_ = dialog; 47 answerIds_ = ¤tTalk_->getAnswerIds();48 this->answerIds_ = &this->currentTalk_->getAnswerIds(); 48 49 } 49 50 … … 85 86 void DialogManager::update(int index) 86 87 { 87 this->currentTalk_->update( answerIds_->at(index));88 answerIds_ = &this->currentTalk_->getAnswerIds();88 this->currentTalk_->update(this->answerIds_->at(index)); 89 this->answerIds_ = &this->currentTalk_->getAnswerIds(); 89 90 } 90 91 }
Note: See TracChangeset
for help on using the changeset viewer.