about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ap_state.cpp4
-rw-r--r--src/game_data.cpp4
-rw-r--r--src/game_data.h1
-rw-r--r--src/main.cpp2
-rw-r--r--src/tracker_state.cpp7
-rw-r--r--src/updater.cpp2
-rw-r--r--src/version.h2
7 files changed, 14 insertions, 8 deletions
diff --git a/src/ap_state.cpp b/src/ap_state.cpp index dfb8fe7..8438649 100644 --- a/src/ap_state.cpp +++ b/src/ap_state.cpp
@@ -29,8 +29,8 @@
29#include "tracker_state.h" 29#include "tracker_state.h"
30 30
31constexpr int AP_MAJOR = 0; 31constexpr int AP_MAJOR = 0;
32constexpr int AP_MINOR = 4; 32constexpr int AP_MINOR = 6;
33constexpr int AP_REVISION = 5; 33constexpr int AP_REVISION = 1;
34 34
35constexpr const char* CERT_STORE_PATH = "cacert.pem"; 35constexpr const char* CERT_STORE_PATH = "cacert.pem";
36constexpr int ITEM_HANDLING = 7; // <- all 36constexpr int ITEM_HANDLING = 7; // <- all
diff --git a/src/game_data.cpp b/src/game_data.cpp index 94b9888..588ffc8 100644 --- a/src/game_data.cpp +++ b/src/game_data.cpp
@@ -127,6 +127,10 @@ struct GameData {
127 exit_obj.type = EntranceType::kCrossroadsRoofAccess; 127 exit_obj.type = EntranceType::kCrossroadsRoofAccess;
128 } 128 }
129 129
130 if (option["static_painting"] && option["static_painting"].as<bool>()) {
131 exit_obj.type = EntranceType::kStaticPainting;
132 }
133
130 rooms_[from_room_id].exits.push_back(exit_obj); 134 rooms_[from_room_id].exits.push_back(exit_obj);
131 }; 135 };
132 136
diff --git a/src/game_data.h b/src/game_data.h index ac911e5..8d3db4b 100644 --- a/src/game_data.h +++ b/src/game_data.h
@@ -31,6 +31,7 @@ enum class EntranceType {
31 kWarp, 31 kWarp,
32 kPilgrimage, 32 kPilgrimage,
33 kCrossroadsRoofAccess, 33 kCrossroadsRoofAccess,
34 kStaticPainting,
34}; 35};
35 36
36enum class DoorType { 37enum class DoorType {
diff --git a/src/main.cpp b/src/main.cpp index 1d7cc9e..574b6df 100644 --- a/src/main.cpp +++ b/src/main.cpp
@@ -10,7 +10,7 @@
10 10
11class TrackerApp : public wxApp { 11class TrackerApp : public wxApp {
12 public: 12 public:
13 virtual bool OnInit() { 13 virtual bool OnInit() override {
14 GetTrackerConfig().Load(); 14 GetTrackerConfig().Load();
15 15
16 TrackerFrame *frame = new TrackerFrame(); 16 TrackerFrame *frame = new TrackerFrame();
diff --git a/src/tracker_state.cpp b/src/tracker_state.cpp index bf2725a..674f68a 100644 --- a/src/tracker_state.cpp +++ b/src/tracker_state.cpp
@@ -342,7 +342,7 @@ class StateCalculator {
342 new_boundary.push_back( 342 new_boundary.push_back(
343 {.source_room = room_exit.destination_room, 343 {.source_room = room_exit.destination_room,
344 .destination_room = GD_GetRoomByName("Color Hallways"), 344 .destination_room = GD_GetRoomByName("Color Hallways"),
345 .type = EntranceType::kPainting}); 345 .type = EntranceType::kStaticPainting});
346 } 346 }
347 347
348 if (AP_IsPilgrimageEnabled()) { 348 if (AP_IsPilgrimageEnabled()) {
@@ -368,7 +368,7 @@ class StateCalculator {
368 .destination_room = GD_GetRoomByName("Pilgrim Antechamber"), 368 .destination_room = GD_GetRoomByName("Pilgrim Antechamber"),
369 .door = 369 .door =
370 GD_GetDoorByName("Pilgrim Antechamber - Sun Painting"), 370 GD_GetDoorByName("Pilgrim Antechamber - Sun Painting"),
371 .type = EntranceType::kPainting}); 371 .type = EntranceType::kStaticPainting});
372 } 372 }
373 } 373 }
374 374
@@ -650,7 +650,8 @@ class StateCalculator {
650 !AP_DoesPilgrimageAllowRoofAccess()) { 650 !AP_DoesPilgrimageAllowRoofAccess()) {
651 return kNo; 651 return kNo;
652 } 652 }
653 if (room_exit.type == EntranceType::kPainting && 653 if ((room_exit.type == EntranceType::kPainting ||
654 room_exit.type == EntranceType::kStaticPainting) &&
654 !AP_DoesPilgrimageAllowPaintings()) { 655 !AP_DoesPilgrimageAllowPaintings()) {
655 return kNo; 656 return kNo;
656 } 657 }
diff --git a/src/updater.cpp b/src/updater.cpp index 773f7d3..2b05daf 100644 --- a/src/updater.cpp +++ b/src/updater.cpp
@@ -36,7 +36,7 @@ std::string CalculateStringSha256(const wxString& data) {
36 36
37 char output[65] = {0}; 37 char output[65] = {0};
38 for (int i = 0; i < SHA256_DIGEST_LENGTH; i++) { 38 for (int i = 0; i < SHA256_DIGEST_LENGTH; i++) {
39 sprintf(output + (i * 2), "%02x", hash[i]); 39 snprintf(output + (i * 2), 3, "%02x", hash[i]);
40 } 40 }
41 41
42 return std::string(output); 42 return std::string(output);
diff --git a/src/version.h b/src/version.h index fe31a6e..3439fda 100644 --- a/src/version.h +++ b/src/version.h
@@ -36,6 +36,6 @@ struct Version {
36 } 36 }
37}; 37};
38 38
39constexpr const Version kTrackerVersion = Version(2, 0, 1); 39constexpr const Version kTrackerVersion = Version(2, 0, 2);
40 40
41#endif /* end of include guard: VERSION_H_C757E53C */ \ No newline at end of file 41#endif /* end of include guard: VERSION_H_C757E53C */ \ No newline at end of file