diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-05 13:32:04 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-05 13:32:04 -0500 |
commit | f7875a6d2f129af47a203a5a31c2785b6e2fcf58 (patch) | |
tree | 815d7fb1c28b5667dcd31d50aa65b18a802a89bc /src/message_system.h | |
parent | 871943d6a90bdb92b3cc495d4d927199611f8c6b (diff) | |
download | tanetane-f7875a6d2f129af47a203a5a31c2785b6e2fcf58.tar.gz tanetane-f7875a6d2f129af47a203a5a31c2785b6e2fcf58.tar.bz2 tanetane-f7875a6d2f129af47a203a5a31c2785b6e2fcf58.zip |
Added speaker header
Diffstat (limited to 'src/message_system.h')
-rw-r--r-- | src/message_system.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/message_system.h b/src/message_system.h index 153805a..18dd299 100644 --- a/src/message_system.h +++ b/src/message_system.h | |||
@@ -33,7 +33,10 @@ public: | |||
33 | 33 | ||
34 | void hideCutsceneBars(); | 34 | void hideCutsceneBars(); |
35 | 35 | ||
36 | void displayMessage(std::string_view msg, SpeakerType speaker); | 36 | void displayMessage( |
37 | std::string_view msg, | ||
38 | std::string speakerName = "", | ||
39 | SpeakerType speakerType = SpeakerType::None); | ||
37 | 40 | ||
38 | void advanceText(); | 41 | void advanceText(); |
39 | 42 | ||
@@ -48,6 +51,8 @@ public: | |||
48 | 51 | ||
49 | const std::list<MessageLine>& getLines() const { return linesToShow_; } | 52 | const std::list<MessageLine>& getLines() const { return linesToShow_; } |
50 | 53 | ||
54 | const std::string& getSpeaker() const { return speakerName_; } | ||
55 | |||
51 | private: | 56 | private: |
52 | 57 | ||
53 | enum class BarsState { | 58 | enum class BarsState { |
@@ -62,6 +67,7 @@ private: | |||
62 | double accum_ = 0.0; | 67 | double accum_ = 0.0; |
63 | double length_ = 1000.0/8; | 68 | double length_ = 1000.0/8; |
64 | SpeakerType speaker_ = SpeakerType::None; | 69 | SpeakerType speaker_ = SpeakerType::None; |
70 | std::string speakerName_; | ||
65 | std::list<std::string> lines_; | 71 | std::list<std::string> lines_; |
66 | std::list<MessageLine> linesToShow_; | 72 | std::list<MessageLine> linesToShow_; |
67 | Timer textAdvTimer_ { 10 }; | 73 | Timer textAdvTimer_ { 10 }; |