5 files changed, 49 insertions, 11 deletions

@@ -33,7 +33,7 @@ void InputSystem::tick(double dt) {
           game_.getSystem<MessageSystem>().displayCutsceneBars();
         }*/
         //game_.getSystem<MessageSystem>().displayMessage("Some people always try to avoid fighting when there are enemies around. You know the type, right? They use the dash ability to zoom right by. I guess you could say they're followers of \"peace at any price\".", SpeakerType::Woman);
-        game_.getSystem<MessageSystem>().displayMessage("Go to sleep.\nIn the absolute darkness.\nDon't do aaaanything.\nDon't see anyone.\nJust sleep.\nIt'll be oh, so much fun......!\nOhohohoho!", SpeakerType::Woman);
+        game_.getSystem<MessageSystem>().displayMessage("Lucas. You're awful at hide-and-seek, you know that? Try harder.", "Kumatora", SpeakerType::Woman);
       } else if (e.key.keysym.sym == SDLK_b) {
         // TODO: Remove this, it's just for testing.
         game_.getSystem<MessageSystem>().advanceText();
@@ -76,12 +76,13 @@ void MessageSystem::hideCutsceneBars() {
   barsState_ = BarsState::Closing;
 }
 
-void MessageSystem::displayMessage(std::string_view msg, SpeakerType speaker) {
+void MessageSystem::displayMessage(std::string_view msg, std::string speakerName, SpeakerType speakerType) {
   if (!(barsState_ == BarsState::Opening || barsState_ == BarsState::Open)) {
     displayCutsceneBars();
   }
 
-  speaker_ = speaker;
+  speaker_ = speakerType;
+  speakerName_ = speakerName;
 
   auto lineChunks = splitStr<std::list<std::string>>(std::string(msg), "\n");
   for (const std::string& text : lineChunks) {
@@ -33,7 +33,10 @@ public:
 
   void hideCutsceneBars();
 
-  void displayMessage(std::string_view msg, SpeakerType speaker);
+  void displayMessage(
+    std::string_view msg,
+    std::string speakerName = "",
+    SpeakerType speakerType = SpeakerType::None);
 
   void advanceText();
 
@@ -48,6 +51,8 @@ public:
 
   const std::list<MessageLine>& getLines() const { return linesToShow_; }
 
+  const std::string& getSpeaker() const { return speakerName_; }
+
 private:
 
   enum class BarsState {
@@ -62,6 +67,7 @@ private:
   double accum_ = 0.0;
   double length_ = 1000.0/8;
   SpeakerType speaker_ = SpeakerType::None;
+  std::string speakerName_;
   std::list<std::string> lines_;
   std::list<MessageLine> linesToShow_;
   Timer textAdvTimer_ { 10 };
@@ -157,10 +157,35 @@ void Renderer::render(Game& game) {
 
     if (game.getSystem<MessageSystem>().getCutsceneBarsProgress() == 1.0 &&
         !game.getSystem<MessageSystem>().getLines().empty()) {
+      if (!game.getSystem<MessageSystem>().getSpeaker().empty()) {
+        if (speakerHeaderTex_ == -1) {
+          speakerHeaderTex_ = loadImageFromFile("../res/speaker_header.png");
+        }
+
+        {
+          SDL_Rect destRect { 0, 111, 57, 13 };
+          SDL_RenderCopy(ren_.get(), textures_.at(speakerHeaderTex_).get(), nullptr, &destRect);
+        }
+
+        if (speakerHeaderLine_.line != game.getSystem<MessageSystem>().getSpeaker()) {
+          renderMessageLine(speakerHeaderLine_, game.getSystem<MessageSystem>().getSpeaker(), game);
+        }
+
+        {
+          SDL_Rect destRect {
+            4,
+            112,
+            MESSAGE_TEXT_WIDTH,
+            game.getFont().getCharacterHeight() };
+
+          SDL_RenderCopy(ren_.get(), speakerHeaderLine_.renderedTex.get(), nullptr, &destRect);
+        }
+      }
+
       int lineIndex = 0;
       for (const MessageSystem::MessageLine& line : game.getSystem<MessageSystem>().getLines()) {
         if (messageLines_[lineIndex].line != line.text) {
-          renderMessageLine(lineIndex, line.text, game);
+          renderMessageLine(messageLines_[lineIndex], line.text, game);
         }
 
         // 18x, 127y1, 143y2
@@ -204,8 +229,7 @@ int Renderer::loadImageFromFile(std::string_view filename) {
   return texId;
 }
 
-void Renderer::renderMessageLine(int lineIndex, const std::string& text, Game& game) {
-  MessageCache& line = messageLines_[lineIndex];
+void Renderer::renderMessageLine(MessageCache& line, const std::string& text, Game& game) {
   line.line = text;
 
   line.renderedTex.reset(
@@ -123,26 +123,33 @@ public:
 
 private:
 
-  texture_ptr renderMapLayer(const Map& map, int layer);
-
-  void renderMessageLine(int lineIndex, const std::string& text, Game& game);
-
+  // Important wrappers
   sdl_wrapper sdl_;
   img_wrapper img_;
   window_ptr win_;
   renderer_ptr ren_;
 
+  // Textures loaded from files
   std::vector<texture_ptr> textures_;
+
+  // Map rendering
+  texture_ptr renderMapLayer(const Map& map, int layer);
+
   texture_ptr renLay0_;
   texture_ptr renLay1_;
 
+  // Text rendering
   struct MessageCache {
     texture_ptr renderedTex;
     std::vector<int> charIndexToWidth;
     std::string line;
   };
 
+  void renderMessageLine(MessageCache& line, const std::string& text, Game& game);
+
   MessageCache messageLines_[2];
+  int speakerHeaderTex_ = -1;
+  MessageCache speakerHeaderLine_;
 };
 
 #endif /* end of include guard: RENDERER_H_6A58EC30 */