mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix compilation with older clang 

Older clang would expand the macros and spot that clamping unsigned
values to [0, MAX] is a tautological operation and produce an error.

As these are tautological operations, no network version change should
be needed.
This commit is contained in:
Michał Janiszewski 2017-10-09 17:34:37 +02:00 committed by GitHub
parent 6e1521caec
commit b05bdf28fc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/core/textinputbuffer.c
View File

@ -108,7 +108,7 @@ void textinputbuffer_cursor_right(textinputbuffer * tib)
selectionOffset++;
} while (!utf8_is_codepoint_start(ch) && selectionOffset < selectionMaxOffset);
tib->selection_size = max(0, tib->selection_size - (selectionOffset - tib->selection_offset));
tib->selection_size = tib->selection_size - (selectionOffset - tib->selection_offset);
tib->selection_offset = selectionOffset;
}
}

2
src/openrct2/peep/peep.c
View File

@ -10830,7 +10830,7 @@ static void peep_update_ride_nausea_growth(rct_peep *peep, Ride *ride)
uint32 nauseaGrowthRateChange = (ride->nausea * nauseaMultiplier) / 512;
nauseaGrowthRateChange *= max(128, peep->hunger) / 64;
nauseaGrowthRateChange >>= (peep->nausea_tolerance & 3);
peep->nausea_target = (uint8)clamp(0, peep->nausea_target + nauseaGrowthRateChange, 255);
peep->nausea_target = (uint8)max(peep->nausea_target + nauseaGrowthRateChange, 255);
}
static bool peep_should_go_on_ride_again(rct_peep *peep, Ride *ride)