openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix Visual Studio undefined behavior test errors

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-02-15 12:27:36 -06:00
committed by Celtic Minstrel
parent a18f754e11
commit ff65ddbb69
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/item_legacy.cpp
View File

@@ -14,8 +14,13 @@
#include "race.hpp" #include "race.hpp"
static void set_item_name(legacy::item_record_type& item, const std::string& full, const std::string& name) { static void set_item_name(legacy::item_record_type& item, const std::string& full, const std::string& name) {
std::copy_n(full.begin(), std::min<size_t>(25, 1 + full.size()), item.full_name); size_t full_size = std::min<size_t>(24, full.size());
std::copy_n(name.begin(), std::min<size_t>(15, 1 + name.size()), item.name); std::copy_n(full.begin(), full_size, item.full_name);
item.full_name[full_size] = '\0';
size_t name_size = std::min<size_t>(14, name.size());
std::copy_n(name.begin(), name_size, item.name);
item.name[name_size] = '\0';
} }
TEST_CASE("Converting items from legacy scenarios") { TEST_CASE("Converting items from legacy scenarios") {

2
test/out_write.cpp
View File

@@ -80,6 +80,8 @@ TEST_CASE("Saving an outdoors sector") {
wand.friendly[1] = 12; wand.friendly[1] = 12;
wand.end_spec1 = 210; wand.end_spec1 = 210;
wand.end_spec2 = 22; wand.end_spec2 = 22;
wand.cant_flee = true;
wand.forced = true;
REQUIRE(out.special_enc.size() >= 1); REQUIRE(out.special_enc.size() >= 1);
out.special_enc[0] = spec; out.special_enc[0] = spec;

2
test/town_legacy.cpp
View File

@@ -19,7 +19,7 @@
TEST_CASE("Converting legacy town data") { TEST_CASE("Converting legacy town data") {
cScenario scen; cScenario scen;
scen.ter_types.resize(5); scen.ter_types.resize(16);
legacy::town_record_type old_town = {0}; legacy::town_record_type old_town = {0};
SECTION("With basic data") { SECTION("With basic data") {