mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2025-07-16 10:02:59 -07:00
Warnings Round 2 (mostly Rando) (#5486)
* Handle virtually all warnings in `soh/Enhancements/randomizer`. Handle order of operations warning in FasterHeavyBlockLift. * Missed a few. * Add float-specific versions of some M_PI and M_SQRT defines, and swap them in for the static casts in draw.cpp. * Swap a static cast for M_PIf in check tracker code.
This commit is contained in:
parent
23a5198986
commit
e673eaefb6
25 changed files with 98 additions and 85 deletions
|
@ -1814,7 +1814,7 @@ void Logic::ApplyItemEffect(Item& item, bool state) {
|
|||
if (randoGet == RG_BOTTLE_WITH_BIG_POE) {
|
||||
BigPoes++;
|
||||
}
|
||||
mSaveContext->inventory.items[slot] = itemId;
|
||||
mSaveContext->inventory.items[slot] = static_cast<uint8_t>(itemId);
|
||||
} break;
|
||||
case RG_RUTOS_LETTER:
|
||||
SetRandoInf(RAND_INF_OBTAINED_RUTOS_LETTER, state);
|
||||
|
@ -2306,7 +2306,7 @@ void Logic::SetEventChkInf(int32_t flag, bool state) {
|
|||
}
|
||||
|
||||
uint8_t Logic::GetGSCount() {
|
||||
return mSaveContext->inventory.gsTokens;
|
||||
return static_cast<uint8_t>(mSaveContext->inventory.gsTokens);
|
||||
}
|
||||
|
||||
uint8_t Logic::GetAmmo(uint32_t item) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue