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.cpp | |
| parent | 871943d6a90bdb92b3cc495d4d927199611f8c6b (diff) | |
| download | tanetane-f7875a6d2f129af47a203a5a31c2785b6e2fcf58.tar.gz tanetane-f7875a6d2f129af47a203a5a31c2785b6e2fcf58.tar.bz2 tanetane-f7875a6d2f129af47a203a5a31c2785b6e2fcf58.zip | |
Added speaker header
Diffstat (limited to 'src/message_system.cpp')
| -rw-r--r-- | src/message_system.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
| diff --git a/src/message_system.cpp b/src/message_system.cpp index 5abb4b3..08ef799 100644 --- a/src/message_system.cpp +++ b/src/message_system.cpp | |||
| @@ -76,12 +76,13 @@ void MessageSystem::hideCutsceneBars() { | |||
| 76 | barsState_ = BarsState::Closing; | 76 | barsState_ = BarsState::Closing; |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | void MessageSystem::displayMessage(std::string_view msg, SpeakerType speaker) { | 79 | void MessageSystem::displayMessage(std::string_view msg, std::string speakerName, SpeakerType speakerType) { |
| 80 | if (!(barsState_ == BarsState::Opening || barsState_ == BarsState::Open)) { | 80 | if (!(barsState_ == BarsState::Opening || barsState_ == BarsState::Open)) { |
| 81 | displayCutsceneBars(); | 81 | displayCutsceneBars(); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | speaker_ = speaker; | 84 | speaker_ = speakerType; |
| 85 | speakerName_ = speakerName; | ||
| 85 | 86 | ||
| 86 | auto lineChunks = splitStr<std::list<std::string>>(std::string(msg), "\n"); | 87 | auto lineChunks = splitStr<std::list<std::string>>(std::string(msg), "\n"); |
| 87 | for (const std::string& text : lineChunks) { | 88 | for (const std::string& text : lineChunks) { |