petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r8055) -Codechange: Replace the different max, dmax, maxu whatever macros by a simple template function max(), that requires two arguments of the same type. While I'm at it change a variable called "max" to "maxval" in a function that calls max().

Browse Source
This commit is contained in:
celestar
2007-01-11 11:05:01 +00:00
parent 7996c9e560
commit 2ac0410767
19 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/station_cmd.cpp
View File

@@ -200,7 +200,7 @@ RoadStop *AllocateRoadStop(void)
* radius that is available within the station */
static uint FindCatchmentRadius(const Station* st)
{
uint ret = 0;
CatchmentAera ret = CA_NONE;
if (st->bus_stops != NULL) ret = max(ret, CA_BUS);
if (st->truck_stops != NULL) ret = max(ret, CA_TRUCK);
@@ -2525,7 +2525,7 @@ static void UpdateStationRating(Station *st)
if (rating <= 127 && waiting != 0) {
uint32 r = Random();
if ( (uint)rating <= (r & 0x7F) ) {
waiting = max(waiting - ((r >> 8)&3) - 1, 0);
waiting = max(waiting - ((r >> 8)&3) - 1, 0U);
waiting_changed = true;
}
}