Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11751


Ignore:
Timestamp:
Feb 15, 2018, 11:29:31 PM (6 years ago)
Author:
landauf
Message:

[Dialog_HS17] details

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  
    33<GUILayout >
    44    <Window Type="DefaultWindow" Name="orxonox/Dialog/Background" >
    5         <Property Name="InheritsAlpha" Value="False" />
     5        <Property Name="InheritsAlpha" Value="False" />
    66        <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    77        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
  • code/branches/Presentation_HS17_merge/src/modules/dialog/DialogManager.cc

    r11750 r11751  
    4040        {
    4141                this->currentTalk_ = nullptr;
     42                this->answerIds_ = nullptr;
    4243        }
    4344
     
    4546        {
    4647                this->currentTalk_ = dialog;
    47                 answerIds_ = &currentTalk_->getAnswerIds();
     48                this->answerIds_ = &this->currentTalk_->getAnswerIds();
    4849        }
    4950
     
    8586    void DialogManager::update(int index)
    8687    {
    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();
    8990    }
    9091}
Note: See TracChangeset for help on using the changeset viewer.