From e56d88ad08d2e028ab920f63b0d8312d39f1477c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maksymilian=20Wilczy=C5=84ski?= Date: Wed, 12 Nov 2025 21:44:54 +0100 Subject: [PATCH] fixed some warnings, more engaging dialogue thanks to chatgpt --- src/main.cpp | 84 +++++++++++++++++++++++++--------------------------- src/text.cpp | 2 -- 2 files changed, 40 insertions(+), 46 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index e20dcc2..5a5feef 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -111,7 +111,7 @@ public: } int count() const { - return active_animations.size(); + return (int)active_animations.size(); // it won't overflow.. right? } }; @@ -477,75 +477,71 @@ int main() { // --- Scene Script --- Command scene_commands[] = { - // Show both characters IN PARALLEL {CMD_SHOW, "maksw", 100, POS_Y, 2, 1.0f, "neutral", nullptr, nullptr, TRANS_SLIDE_LEFT, 500.0f, false}, {CMD_SHOW, "wikor", 800, POS_Y, 1, 1.0f, "neutral", nullptr, nullptr, TRANS_SLIDE_RIGHT, 500.0f, true}, - // Maksw speaks - {CMD_SET_Z, "maksw", 0, 0, 3, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, - {CMD_SET_SCALE, "maksw", 0, 0, 0, 1.05f, nullptr, nullptr, nullptr, TRANS_FADE, 200.0f, false}, + // Maksw starts talking {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, "Maksw", - u8"Hey, admirał wiktorov, the sun's actually out today. Did the weather daemon crash overnight?", TRANS_NONE, 0, true}, + "Wow, it's been a really long week, hasn't it? The sky looks different today.", TRANS_NONE, 0, true}, + {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, + + {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, "Maksw", + "I mean, just look at how the clouds are stretching all the way to the horizon. Feels almost cinematic.", TRANS_NONE, 0, true}, + {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, + + {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, "Maksw", + "And the air, it smells like rain... or maybe just damp leaves? Either way, kinda refreshing.", TRANS_NONE, 0, true}, {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, // Wikor responds - {CMD_SET_SCALE, "maksw", 0, 0, 0, 1.0f, nullptr, nullptr, nullptr, TRANS_FADE, 100.0f, false}, + {CMD_SET_SCALE, "maksw", 0, 0, 0, 1.0f, nullptr, nullptr, nullptr, TRANS_FADE, 200.0f, false}, {CMD_SET_Z, "maksw", 0, 0, 1, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, {CMD_SET_Z, "wikor", 0, 0, 3, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, {CMD_SET_SCALE, "wikor", 0, 0, 0, 1.05f, nullptr, nullptr, nullptr, TRANS_FADE, 200.0f, false}, {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, u8"admirał wiktorov", - "Either that, or someone forgot to reboot the clouds. I didn't authorize this much sunlight.", TRANS_NONE, 0, true}, + "I see what you mean. It's almost like the clouds are in slow motion today. Peaceful, but a bit eerie too.", TRANS_NONE, 0, true}, {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, - // Maksw replies - {CMD_SET_SCALE, "wikor", 0, 0, 0, 1.0f, nullptr, nullptr, nullptr, TRANS_FADE, 100.0f, false}, + {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, u8"admirał wiktorov", + "I almost feel like grabbing a cup of tea and just watching the sky for hours. But I have a feeling that won't happen.", TRANS_NONE, 0, true}, + {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, + + {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, u8"admirał wiktorov", + "Also, did you notice that weird bird earlier? It looked like it was practicing aerobatics or something.", TRANS_NONE, 0, true}, + {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, + + // Maksw continues + {CMD_SET_SCALE, "wikor", 0, 0, 0, 1.0f, nullptr, nullptr, nullptr, TRANS_FADE, 200.0f, false}, {CMD_SET_Z, "wikor", 0, 0, 1, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, {CMD_SET_Z, "maksw", 0, 0, 3, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, {CMD_SET_SCALE, "maksw", 0, 0, 0, 1.05f, nullptr, nullptr, nullptr, TRANS_FADE, 200.0f, false}, {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, "Maksw", - "You sound disappointed. Don't tell me you actually prefer the cold and gloom.", TRANS_NONE, 0, true}, + "Yeah, that bird was definitely showing off. Maybe it's training for some secret bird Olympics.", TRANS_NONE, 0, true}, {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, - // Wikor gets smug - {CMD_SET_SCALE, "maksw", 0, 0, 0, 1.0f, nullptr, nullptr, nullptr, TRANS_FADE, 100.0f, false}, + {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, "Maksw", + "Honestly, between the weather, the clouds, and the bird, it feels like the whole world hit the pause button for a moment.", TRANS_NONE, 0, true}, + {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, + + {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, "Maksw", + "But then reality hits. Bugs to fix, emails to answer, the usual chaos. Can't just float in a dream forever.", TRANS_NONE, 0, true}, + {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, + + {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, "Maksw", + "Still, I like moments like this. Makes me appreciate the little things more. You know?", TRANS_NONE, 0, true}, + {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, + + // Wikor closes it + {CMD_SET_SCALE, "maksw", 0, 0, 0, 1.0f, nullptr, nullptr, nullptr, TRANS_FADE, 200.0f, false}, {CMD_SET_Z, "maksw", 0, 0, 1, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, {CMD_SET_Z, "wikor", 0, 0, 3, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, {CMD_SET_SCALE, "wikor", 0, 0, 0, 1.05f, nullptr, nullptr, nullptr, TRANS_FADE, 200.0f, false}, {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, u8"admirał wiktorov", - "Cold means fewer bugs - in the code and in the air. The moment it warms up, the chaos begins.", TRANS_NONE, 0, true}, + "Absolutely. Alright, back to work. But next time the sky looks like this, we should take a proper break.", TRANS_NONE, 0, true}, {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, - // Maksw teasingly replies - {CMD_SET_SCALE, "wikor", 0, 0, 0, 1.0f, nullptr, nullptr, nullptr, TRANS_FADE, 100.0f, false}, - {CMD_SET_Z, "wikor", 0, 0, 1, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, - {CMD_SET_Z, "maksw", 0, 0, 3, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, - {CMD_SET_SCALE, "maksw", 0, 0, 0, 1.05f, nullptr, nullptr, nullptr, TRANS_FADE, 200.0f, false}, - {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, "Maksw", - "You just don't like seeing people happy. Admit it.", TRANS_NONE, 0, true}, - {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, - - // Wikor snarks back - {CMD_SET_SCALE, "maksw", 0, 0, 0, 1.0f, nullptr, nullptr, nullptr, TRANS_FADE, 100.0f, false}, - {CMD_SET_Z, "maksw", 0, 0, 1, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, - {CMD_SET_Z, "wikor", 0, 0, 3, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, - {CMD_SET_SCALE, "wikor", 0, 0, 0, 1.05f, nullptr, nullptr, nullptr, TRANS_FADE, 200.0f, false}, - {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, u8"admirał wiktorov", - "Happiness is fine, as long as it doesn't interfere with system uptime.", TRANS_NONE, 0, true}, - {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, - - // Closing line - {CMD_SET_SCALE, "wikor", 0, 0, 0, 1.0f, nullptr, nullptr, nullptr, TRANS_FADE, 100.0f, false}, - {CMD_SET_Z, "wikor", 0, 0, 1, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, - {CMD_SET_Z, "maksw", 0, 0, 3, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, false}, - {CMD_SET_SCALE, "maksw", 0, 0, 0, 1.05f, nullptr, nullptr, nullptr, TRANS_FADE, 200.0f, false}, - {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, "Maksw", - "Then let's keep uptime at 100% and go grab some coffee before the next storm update.", TRANS_NONE, 0, true}, - {CMD_WAIT, nullptr, 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_NONE, 0, true}, - - // Fade out both - {CMD_SPEAK, nullptr, 0, 0, 0, 0, nullptr, "", nullptr, TRANS_NONE, 0, false}, {CMD_HIDE, "maksw", 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_FADE, 500.0f, false}, - {CMD_HIDE, "wikor", 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_FADE, 500.0f, true}, + {CMD_HIDE, "wikor", 0, 0, 0, 0, nullptr, nullptr, nullptr, TRANS_FADE, 500.0f, true}, }; Scene scene = { scene_commands, sizeof(scene_commands) / sizeof(Command), 0 }; diff --git a/src/text.cpp b/src/text.cpp index dfa05f2..8156c3e 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -740,7 +740,6 @@ extern "C" { size_t cp_i = line.start_cp_index; while (byte_i < line.end_byte_index && cp_i < draw_start) { - size_t prev_byte = byte_i; uint32_t cp = utf8_next(params->text, byte_i); const cached_glyph_t* glyph = get_glyph(text, cp, params->size); if (glyph) { @@ -761,7 +760,6 @@ extern "C" { // Now iterate and draw until cp reaches min(line.end_cp_index, draw_end) while (byte_i < line.end_byte_index && cp_i < std::min(line.end_cp_index, draw_end)) { - size_t prev_byte = byte_i; uint32_t cp = utf8_next(params->text, byte_i); if (cp == (uint32_t)'\n') { ++cp_i; continue; }