Skip to content

Commit

Permalink
zlib
Browse files Browse the repository at this point in the history
  • Loading branch information
Daivuk committed Dec 7, 2023
1 parent c448279 commit 0374ba2
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion APCpp
Submodule APCpp updated 3 files
+164 −81 Archipelago.cpp
+19 −7 Archipelago.h
+1 −1 IXWebSocket
2 changes: 1 addition & 1 deletion Launcher/APDoomLauncher/Form1.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions ap_gen_tool/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
imgui.ini
*.WAD
build/
*.dll
1 change: 1 addition & 0 deletions release.lst
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Release/libsndfile-1.dll
Release/samplerate.dll
Release/SDL2.dll
Release/SDL2_mixer.dll
Release/zlib1.dll
Release/APDOOM.WAD
Release/APHERETIC.WAD
Release/credits-doom-1993.txt
Expand Down
9 changes: 4 additions & 5 deletions src/archipelago/apdoom.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -518,13 +518,12 @@ int apdoom_init(ap_settings_t* settings)
printf(" %s = %i:\n", permission.first.c_str(), permission.second);
printf(" Hint cost: %i\n", ap_room_info.hint_cost);
printf(" Location check points: %i\n", ap_room_info.location_check_points);
printf(" Data package version: %i\n", ap_room_info.datapackage_version);
printf(" Data package versions: %i\n", ap_room_info.datapackage_version);
for (const auto& datapackage_version : ap_room_info.datapackage_versions)
printf(" %s = %i:\n", datapackage_version.first.c_str(), datapackage_version.second);
printf(" Data package checksums:\n");
for (const auto& kv : ap_room_info.datapackage_checksums)
printf(" %s = %s:\n", kv.first.c_str(), kv.second.c_str());
printf(" Seed name: %s\n", ap_room_info.seed_name.c_str());
printf(" Time: %f\n", ap_room_info.time);

ap_was_connected = true;
ap_save_dir_name = "AP_" + ap_room_info.seed_name + "_" + string_to_hex(ap_settings.player_name);

Expand Down
4 changes: 2 additions & 2 deletions src/archipelago/apdoom.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ extern "C"

#define APDOOM_MAJOR 1
#define APDOOM_MINOR 0
#define APDOOM_PATCH 2
#define APDOOM_PATCH 3
#define APDOOM_STR(x) APDOOM_STR2(x)
#define APDOOM_STR2(x) #x
#define APDOOM_VERSION APDOOM_STR(APDOOM_MAJOR) "." APDOOM_STR(APDOOM_MINOR) "." APDOOM_STR(APDOOM_PATCH)
#define APDOOM_VERSION_TEXT APDOOM_VERSION " (BETA)"
#define APDOOM_VERSION_TEXT APDOOM_VERSION ""
#define APDOOM_VERSION_FULL_TEXT "APDOOM " APDOOM_VERSION_TEXT


Expand Down

0 comments on commit 0374ba2

Please sign in to comment.