From 8e6252fc2b3cb2b5867efa9e8e4fa1374bebbe0a Mon Sep 17 00:00:00 2001 From: Rose Date: Fri, 20 Jan 2023 13:45:56 -0800 Subject: [PATCH] Small fixes to make things more clean. --- library/modules/Units.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp index 05c0df0cb..06cb4e62d 100644 --- a/library/modules/Units.cpp +++ b/library/modules/Units.cpp @@ -1025,7 +1025,7 @@ df::unit_misc_trait *Units::getMiscTrait(df::unit *unit, df::misc_trait_type typ // get race name by id or unit pointer string Units::getRaceNameById(int32_t id) { - if (id >= 0 && id < world->raws.creatures.all.size()) + if (id >= 0 && (size_t)id < world->raws.creatures.all.size()) { df::creature_raw* raw = world->raws.creatures.all[id]; if (raw) @@ -1042,7 +1042,7 @@ string Units::getRaceName(df::unit* unit) // get human-readable race name by id or unit pointer string Units::getRaceReadableNameById(int32_t id) { - if (id >= 0 && id < world->raws.creatures.all.size()) + if (id >= 0 && (size_t)id < world->raws.creatures.all.size()) { df::creature_raw* raw = world->raws.creatures.all[id]; if (raw) @@ -1078,7 +1078,7 @@ string Units::getPhysicalDescription(df::unit* unit) // get plural of race name (used for display in autobutcher UI and for sorting the watchlist) string Units::getRaceNamePluralById(int32_t id) { - if (id >= 0 && id < world->raws.creatures.all.size()) + if (id >= 0 && (size_t)id < world->raws.creatures.all.size()) { df::creature_raw* raw = world->raws.creatures.all[id]; if (raw) @@ -1095,7 +1095,7 @@ string Units::getRaceNamePlural(df::unit* unit) string Units::getRaceBabyNameById(int32_t id) { - if (id >= 0 && id < world->raws.creatures.all.size()) + if (id >= 0 && (size_t)id < world->raws.creatures.all.size()) { df::creature_raw* raw = world->raws.creatures.all[id]; if (raw) @@ -1112,7 +1112,7 @@ string Units::getRaceBabyName(df::unit* unit) string Units::getRaceChildNameById(int32_t id) { - if (id >= 0 && id < world->raws.creatures.all.size()) + if (id >= 0 && (size_t)id < world->raws.creatures.all.size()) { df::creature_raw* raw = world->raws.creatures.all[id]; if (raw)