diff options
| author | skidd13 <skidd13@openttd.org> | 2007-11-24 10:38:43 +0000 |
|---|---|---|
| committer | skidd13 <skidd13@openttd.org> | 2007-11-24 10:38:43 +0000 |
| commit | bf959f926ff6dee99a15d91652256169a6484042 (patch) | |
| tree | 9c936ecbb5e2e4367788a18a55cbf52eb6eb6cc6 /src/settings.cpp | |
| parent | 64246a2775c56c99746727a02af509fe8d75d53f (diff) | |
| download | openttd-bf959f926ff6dee99a15d91652256169a6484042.tar.xz | |
(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
Diffstat (limited to 'src/settings.cpp')
| -rw-r--r-- | src/settings.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/settings.cpp b/src/settings.cpp index 853719a71..962db0948 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -1155,15 +1155,15 @@ static int32 CheckInterval(int32 p1) const Patches *ptc = (_game_mode == GM_MENU) ? &_patches_newgame : &_patches; if (p1) { - warning = ( (IS_INT_INSIDE(ptc->servint_trains, 5, 90 + 1) || ptc->servint_trains == 0) && - (IS_INT_INSIDE(ptc->servint_roadveh, 5, 90 + 1) || ptc->servint_roadveh == 0) && - (IS_INT_INSIDE(ptc->servint_aircraft, 5, 90 + 1) || ptc->servint_aircraft == 0) && - (IS_INT_INSIDE(ptc->servint_ships, 5, 90 + 1) || ptc->servint_ships == 0) ); + warning = ( (IsInsideMM(ptc->servint_trains, 5, 90 + 1) || ptc->servint_trains == 0) && + (IsInsideMM(ptc->servint_roadveh, 5, 90 + 1) || ptc->servint_roadveh == 0) && + (IsInsideMM(ptc->servint_aircraft, 5, 90 + 1) || ptc->servint_aircraft == 0) && + (IsInsideMM(ptc->servint_ships, 5, 90 + 1) || ptc->servint_ships == 0) ); } else { - warning = ( (IS_INT_INSIDE(ptc->servint_trains, 30, 800 + 1) || ptc->servint_trains == 0) && - (IS_INT_INSIDE(ptc->servint_roadveh, 30, 800 + 1) || ptc->servint_roadveh == 0) && - (IS_INT_INSIDE(ptc->servint_aircraft, 30, 800 + 1) || ptc->servint_aircraft == 0) && - (IS_INT_INSIDE(ptc->servint_ships, 30, 800 + 1) || ptc->servint_ships == 0) ); + warning = ( (IsInsideMM(ptc->servint_trains, 30, 800 + 1) || ptc->servint_trains == 0) && + (IsInsideMM(ptc->servint_roadveh, 30, 800 + 1) || ptc->servint_roadveh == 0) && + (IsInsideMM(ptc->servint_aircraft, 30, 800 + 1) || ptc->servint_aircraft == 0) && + (IsInsideMM(ptc->servint_ships, 30, 800 + 1) || ptc->servint_ships == 0) ); } if (!warning) |