From 7868ddf1c9bb6d77580cddb07202b80ee3c81d2e Mon Sep 17 00:00:00 2001 From: rftrdev <102184004+rftrdev@users.noreply.github.com> Date: Wed, 26 Jul 2023 23:44:25 -0700 Subject: [PATCH 1/3] Pablo speech fix (#187) Courtesy of Seven Fixes #181 --- Laptop/PostalService.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Laptop/PostalService.cpp b/Laptop/PostalService.cpp index e131c47f..b1fbf9f7 100644 --- a/Laptop/PostalService.cpp +++ b/Laptop/PostalService.cpp @@ -539,6 +539,23 @@ BOOLEAN CPostalService::DeliverShipment(UINT16 usShipmentID) SetFactFalse( FACT_PABLOS_STOLE_FROM_LATEST_SHIPMENT ); } + // set fact according to shipment size (item count, not weight) + if (usNumberOfItems - uiStolenCount <= 5) + { + SetFactFalse(FACT_MEDIUM_SIZED_SHIPMENT_WAITING); + SetFactFalse(FACT_LARGE_SIZED_SHIPMENT_WAITING); + } + else if (usNumberOfItems - uiStolenCount <= 15) + { + SetFactTrue(FACT_MEDIUM_SIZED_SHIPMENT_WAITING); + SetFactFalse(FACT_LARGE_SIZED_SHIPMENT_WAITING); + } + else + { + SetFactFalse(FACT_MEDIUM_SIZED_SHIPMENT_WAITING); + SetFactTrue(FACT_LARGE_SIZED_SHIPMENT_WAITING); + } + SetFactFalse( FACT_PLAYER_FOUND_ITEMS_MISSING ); SetFactFalse( FACT_LARGE_SIZED_OLD_SHIPMENT_WAITING ); @@ -1146,4 +1163,4 @@ RefToDestinationStruct CPostalService::_GetDestination(UINT16 usDestinationID) } return DESTINATION(dli); -} \ No newline at end of file +} From d14c92e2a9278dbc0b75c68109eec23499246dbf Mon Sep 17 00:00:00 2001 From: Asdow <20314541+Asdow@users.noreply.github.com> Date: Thu, 27 Jul 2023 12:07:35 +0300 Subject: [PATCH 2/3] Add /lib/ folder to gitignore (#188) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 07d506ec..e91f3742 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /out/ /CMakeSettings.json /CMakeUserPresets.json +/lib/ From a0ac81aa659ba0acb85eb832ab6906a07388a39b Mon Sep 17 00:00:00 2001 From: majcosta <34732933+majcosta@users.noreply.github.com> Date: Thu, 27 Jul 2023 12:15:53 -0300 Subject: [PATCH 3/3] Add support for AddressSanitizer instrumentation (#189) To use, just set `ADDRESS_SANITIZER` to `ON` on the command-line or your CMakeUserPresets.json file --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b1c2357..b196f87e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,12 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) +option(ADDRESS_SANITIZER OFF) +if(ADDRESS_SANITIZER) + message(STATUS "AddressSanitizer ENABLED for non-Release builds") + add_compile_options($,$>,-fsanitize=address,>) +endif() + # whether we are using MSBuild as a generator set(usingMsBuild $)