More sanitizer fixes
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2022-03-25 19:21:02 +01:00
parent 38a26888be
commit bc1f78c8bd
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
4 changed files with 6 additions and 2 deletions

View File

@ -129,6 +129,7 @@ if (CREATURELIB_TESTS)
# Add a definition for the test library
target_compile_definitions(CreatureLibTests PRIVATE TESTS_BUILD)
if (SANITIZER_TESTS AND NOT WINDOWS)
target_compile_options(CreatureLib PRIVATE -fsanitize=address,undefined,leak,integer,nullability -fno-sanitize-recover=all)
target_compile_options(CreatureLibTests PRIVATE -fsanitize=address,undefined,leak,integer,nullability -fno-sanitize-recover=all)
target_link_options(CreatureLibTests PRIVATE -fsanitize=address,undefined,leak,integer,nullability -fno-sanitize-recover=all)
endif ()

View File

@ -22,6 +22,9 @@ bool CreatureLib::Battling::ChoiceQueue::MoveCreatureChoiceNext(CreatureLib::Bat
for (size_t i = choiceIndex - 1; i >= _current && i != SIZE_MAX; i--) {
// Place everything in one spot later.
_queue[i + 1] = _queue[i];
if (i == 0) {
break;
}
}
// Set the creature choice up next.
_queue[_current] = creatureChoice;

View File

@ -40,7 +40,7 @@ Creature* CreateCreature::Create() {
}
auto identifier = this->_identifier;
if (identifier == 0) {
identifier = rand.Get();
identifier = rand.GetUnsigned();
}
auto gender = this->_gender;
if (gender == static_cast<Library::Gender>(-1)) {

View File

@ -34,7 +34,7 @@ namespace CreatureLib::Battling {
Library::Gender _gender;
u8 _coloring;
u32 _currentHealth = -1;
u32 _currentHealth = 0;
f32 _weight;
f32 _height;