From: Holger Schemel <holger.schemel@virtion.de>
Date: Mon, 11 Nov 2024 18:58:52 +0000 (+0100)
Subject: added converting single newlines for native BD cave (set) stories
X-Git-Tag: 4.4.0.0-test-4~63
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=8fd2356d4d4e7bb6ccbff9feb6759c441d563bc0;p=rocksndiamonds.git

added converting single newlines for native BD cave (set) stories
---

diff --git a/src/screens.c b/src/screens.c
index 25f17794..bb4cb8b8 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -1045,11 +1045,43 @@ static struct MainControlInfo main_controls[] =
   }
 };
 
+static char *getInfoTextBuffer_BD(char *text_raw)
+{
+  static char *text_final = NULL;
+  int max_text_size = 3 * strlen(text_raw) + 1;
+
+  checked_free(text_final);
+
+  text_final = checked_calloc(max_text_size);
+
+  unsigned char *src = (unsigned char *)text_raw;
+  unsigned char *dst = (unsigned char *)text_final;
+
+  while (*src)
+  {
+    // add two spaces (to indicate line break) before single newlines
+    if (src[0] != '\n' && src[1] == '\n' && src[2] != '\n')
+    {
+      *dst++ = *src++;
+      *dst++ = ' ';
+      *dst++ = ' ';
+    }
+
+    *dst++ = *src++;
+  }
+
+  // only use the smallest possible string buffer size
+  text_final = checked_realloc(text_final, strlen(text_final) + 1);
+
+  return text_final;
+}
+
 static char *getLevelSetInfoBuffer(void)
 {
   if (level.game_engine_type == GAME_ENGINE_TYPE_BD &&
-      level.native_bd_level->caveset != NULL)
-    return level.native_bd_level->caveset->story;
+      level.native_bd_level->caveset != NULL &&
+      level.native_bd_level->caveset->story != NULL)
+    return getInfoTextBuffer_BD(level.native_bd_level->caveset->story);
 
   return NULL;
 }
@@ -1057,8 +1089,9 @@ static char *getLevelSetInfoBuffer(void)
 static char *getLevelInfoBuffer(void)
 {
   if (level.game_engine_type == GAME_ENGINE_TYPE_BD &&
-      level.native_bd_level->cave != NULL)
-    return level.native_bd_level->cave->story;
+      level.native_bd_level->cave != NULL &&
+      level.native_bd_level->cave->story != NULL)
+    return getInfoTextBuffer_BD(level.native_bd_level->cave->story);
 
   return NULL;
 }