Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 30, 2017, 9:33:27 AM (6 years ago)
Author:
kuchlert
Message:

fixed addQuestion and addAnswer in Dialog

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/Dialog_HS17/src/modules/dialog/DialogManager.h

    r11607 r11611  
    1 /*
    21#ifndef _DialogManager_H__
    32#define _DialogManager_H__
    43
    5 #include "core/CoreIncludes.h"
    6 #include "core/LuaState.h"
    7 #include "core/GUIManager.h"
    8 #include "core/class/Identifier.h"
    9 #include "core/singleton/ScopedSingletonIncludes.h"
    10 #include "network/Host.h"
    11 #include "network/NetworkFunctionIncludes.h"
    12 #include "util/Singleton.h"
    13 #include <string>
    14 #include <vector>
    15 #include "core/config/Configurable.h"
    16 #include "core/XMLPort.h"
    17 #include "core/EventIncludes.h"
    18 #include "Dialog.h"
    19 
    20 
    21 
    22 
    23 
    24 namespace orxonox //tolua_export
    25 
    26 {//tolua_export
    27         class _OrxonoxExport DialogManager //tolua_export
    28         : public Singleton<DialogManager>
    29         {//tolua_export
    30                 friend class Singleton<DialogManager>;
    31        
    32                 public:
    33                
    34                 DialogManager();
    35                
    36 
    37                 static DialogManager& getInstance() { return Singleton<DialogManager>::getInstance(); } //tolua_export
    38                
    39 
    40                 void setDialog(Dialog* dialog); //tolua_export  // the triggered dialog sets it self so the lua can get to it.
    41                 const Dialog& getCurrentDialog();       //tolua_export
    42                 bool empty(); //tolua_export //returns true if no dialog is set.
    43 
    44 private:
    45         Dialog* currentTalk_; //Dialog which is currently set.
    46         static DialogManager* singletonPtr_s;
    47 
    48         };//tolua_export
    49 }//tolua_export
    50 #endif
    51  */
    52 
    53 #ifndef _DialogManager_H__
    54 #define _DialogManager_H__
    55 
     4#include "DialogPrereqs.h"
    565#include "util/Singleton.h"
    576#include "core/object/Listable.h"
    … …  
    609namespace orxonox
    6110{
    62     class DialogManager : public Singleton<DialogManager>, public Listable
     11    class _DialogExport DialogManager : public Singleton<DialogManager>, public Listable
    6312    {
    6413        friend class Singleton<DialogManager>;
    … …  
    6716            DialogManager();
    6817
    69             int getValue() const
    70                 { return this->value_; }
     18           // int getValue() const { return this->value_; }
    7119
    72                 static DialogManager& getInstance() { return Singleton<DialogManager>::getInstance(); }
     20                static DialogManager& getInstance() { return Singleton<DialogManager>::getInstance(); } //toloa_export
    7321
    7422                void setDialog(Dialog* dialog);
    … …  
    7624                bool empty();
    7725
     26            //form here on all lua functionality used in lua scrips is declared
     27
     28
    7829        private:
    7930                Dialog* currentTalk_;
    80             int value_;
     31            //int value_;
    8132
    8233            static DialogManager* singletonPtr_s;
Note: See TracChangeset for help on using the changeset viewer.