From d592b58af373c2c8e863ff0c744f23c26a26fa64 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Mon, 8 Sep 2025 16:07:10 -0400 Subject: Downgrade protobuf This allows the generated Python file to be compatible with the frozen Archipelago install. --- apworld/requirements.txt | 2 +- tools/assign_ids/main.cpp | 1 + tools/util/godot_scene.cpp | 6 ++---- vcpkg.json | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/apworld/requirements.txt b/apworld/requirements.txt index b701d11..49ca0a7 100644 --- a/apworld/requirements.txt +++ b/apworld/requirements.txt @@ -1 +1 @@ -protobuf>=5.29.3 \ No newline at end of file +protobuf==3.20.3 \ No newline at end of file diff --git a/tools/assign_ids/main.cpp b/tools/assign_ids/main.cpp index d212767..ee55338 100644 --- a/tools/assign_ids/main.cpp +++ b/tools/assign_ids/main.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include #include diff --git a/tools/util/godot_scene.cpp b/tools/util/godot_scene.cpp index 1e77c9e..f788d21 100644 --- a/tools/util/godot_scene.cpp +++ b/tools/util/godot_scene.cpp @@ -1,10 +1,8 @@ #include "godot_scene.h" -#include -#include - #include #include +#include #include namespace com::fourisland::lingo2_archipelago { @@ -23,7 +21,7 @@ struct Heading { GodotInstanceType instance_type; }; -Heading ParseTscnHeading(absl::string_view line) { +Heading ParseTscnHeading(std::string_view line) { std::string original_line(line); Heading heading; diff --git a/vcpkg.json b/vcpkg.json index 5a1975d..ba6833f 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -7,7 +7,7 @@ "overrides": [ { "name": "protobuf", - "version": "5.29.3" + "version": "3.21.12" } ] } \ No newline at end of file -- cgit 1.4.1