Changeset 9202152 in Readingame

Timestamp:

Apr 29, 2024, 7:05:34 PM (8 weeks ago)

Author:

PulkoMandy <pulkomandy@…>

Branches:

main

Children:

d6dc8dd

Parents:

2317cb2

Message:

Implement player identity

Have a startup window asking for name and gender before starting the
game. Fully implement @, {|}, %p and %n using these informations.

Files:

• IdentityWindow.cpp (added)
• IdentityWindow.h (added)
• main.cpp (modified) (9 diffs)

main.cpp

@@ -6 +6 @@
 
 #include "HyperTextView.h"
+#include "IdentityWindow.h"
 
 #include <Application.h>
@@ -265 +266 @@
 uint8_t gSavePC;
 uint8_t gGameStatus;
+bool gGender;
+BString gFirstName;
+BString gLastName;
 
 uint32_t gLastRunScript;
@@ -622 +626 @@
                                         {
                                                 // @ Gender mark (print an e if the player identifies as female)
-                                                // TODO we don't have a way to configure player gender yet
-                                                decoded += 'e';
+                                                if (gGender)
+                                                        decoded += 'e';
                                                 cursor++;
                                                 break;
@@ -665 +669 @@
                         int icursor = cursor;
                         // {%f3|%m2~%m3}
+                        // {%c3|%m2|%m3|...}
+                        // {male|female}
                         cursor++;
-                        if (message[cursor] != '%' || message[cursor + 1] != 'f') {
-                                fprintf(stderr, "Unknwown message conditional\n");
-                                return 1;
-                        }
-
-                        cursor += 2;
+                        if (message[cursor] == '%') {
+                                if ( message[cursor + 1] == 'f') {
+                                        cursor += 2;
+                                        return HandlePercentFConditional(message, cursor) + 3;
+                                } else {
+                                        fprintf(stderr, "Unknwown message conditional\n");
+                                        return 2;
+                                }
+                        }
+
+                        int start, end;
+
+                        if (gGender) {
+                                while(message[cursor] != '|')
+                                        cursor++;
+                                cursor++;
+                                start = cursor;
+                                while(message[cursor] != '}')
+                                        cursor++;
+                                end = cursor;
+                                cursor++;
+                        } else {
+                                start = cursor;
+                                while(message[cursor] != '|')
+                                        cursor++;
+                                end = cursor;
+                                cursor++;
+                                while(message[cursor] != '}')
+                                        cursor++;
+                                cursor++;
+                        }
+
+                        std::string extracted = message.substr(start, end - start);
+                        fMainText->Insert(extracted.c_str());
+
+                        return cursor - icursor;
+                }
+
+                int HandlePercentFConditional(const std::string& message, int cursor)
+                {
+                        int icursor = cursor;
 
                         int flagToCheck = ParseInt(message, cursor);
@@ -718 +759 @@
                                 i++;
                         }
+
+                        // TODO links can contain escape sequences (for example @)
 
                         while (message[cursor + i] != ']') {
@@ -744 +787 @@
                                 return 3;
                         } else if (message[cursor] == 'p') {
-                                // Should show the player first name, not configurable yet
-                                decoded += "PRENOM";
+                                decoded += gFirstName;
+                                return 2;
+                        } else if (message[cursor] == 'n') {
+                                decoded += gLastName;
                                 return 2;
                         } else {
@@ -799 +844 @@
         void ReadyToRun() override
         {
+                BWindow* identity = new IdentityWindow();
+                identity->Show();
+                identity->CenterOnScreen();
+
                 // TODO check if we have a game loaded
                 fMainWindow = new GameWindow();
@@ -806 +855 @@
                 fDebugWindow = new DebugWindow();
 
-                fMainWindow->Show();
-                fMainWindow->CenterOnScreen();
 
                 // TODO: only if asked from the command line
@@ -816 +863 @@
                 fDebugWindow->Update();
 
-                bool runNextLine = true;
-                int line = 0;
-                while (runNextLine && (line < gRooms[0].fScripts.size())) {
-                        gSavePC = 0;
-                        runNextLine = RunScriptLine(gRooms[0].fScripts[line]);
-                        gLastRunScript = line;
-                        line++;
-                }
-                fMainWindow->SetMainText(gRooms[gCurrentRoom].fMessages[gCurrentScreen - 1]);
-                fDebugWindow->Update();
         }
 
         void MessageReceived(BMessage* message) override
         {
-                if (message->what < 256) {
+                if (message->what == 'STRT') {
+                        fMainWindow->Show();
+                        fMainWindow->CenterOnScreen();
+
+                        bool runNextLine = true;
+                        int line = 0;
+                        while (runNextLine && (line < gRooms[0].fScripts.size())) {
+                                gSavePC = 0;
+                                runNextLine = RunScriptLine(gRooms[0].fScripts[line]);
+                                gLastRunScript = line;
+                                line++;
+                        }
+                        fMainWindow->SetMainText(gRooms[gCurrentRoom].fMessages[gCurrentScreen - 1]);
+                        fDebugWindow->Update();
+                } else if (message->what < 256) {
                         gTrigger = message->what;