Changeset 7778ea6 in Readingame

Timestamp:

Apr 30, 2024, 6:32:05 PM (8 weeks ago)

Author:

PulkoMandy <pulkomandy@…>

Branches:

main

Children:

50676d6

Parents:

d6dc8dd

Message:

Recursive pretty-printing of hyperlinks

Allows use of @ and other escape sequences in hyperlinks.

File:

• main.cpp (modified) (5 diffs)

main.cpp

@@ -577 +577 @@
                         BString decoded;
                         PrettyPrint(text, decoded);
+                        decoded += '\n';
 
                         text_run_array runs;
@@ -651 +652 @@
                                 }
                         }
-                        decoded += '\n';
                 }
 
@@ -763 +763 @@
 
                         while (message[cursor + i] != ']') {
-                                if (message[cursor + i] >= 0)
-                                        linkText += message[cursor + i];
-                                else
-                                        linkText += cp850_lookup[(message[cursor + i] - 0x80) & 0xFF];
+                                linkText += message[cursor + i];
                                 i++;
                         }
+
+                        BString decoded;
+                        PrettyPrint(linkText.String(), decoded);
 
                         text_run_array single_run;
@@ -775 +775 @@
                         single_run.runs->font = be_plain_font;
                         single_run.runs->color = make_color(0, 0, 196);
-                        fMainText->InsertHyperText(linkText, new HyperTextAction(v), &single_run);
+                        fMainText->InsertHyperText(decoded, new HyperTextAction(v), &single_run);
 
                         return i + 1;
@@ -785 +785 @@
                                 int value = message[cursor + 1] - '0';
                                 PrettyPrint(gRooms[0].fMessages[value - 1], decoded);
+                                decoded += '\n';
                                 return 3;
                         } else if (message[cursor] == 'p') {