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_gui.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_gui.cpp')
| -rw-r--r-- | src/settings_gui.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 40ec04426..a16b9cb40 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -511,7 +511,7 @@ static void GameDifficultyWndProc(Window *w, WindowEvent *e) return; x = e->we.click.pt.x - 5; - if (!IS_INT_INSIDE(x, 0, 21)) // Button area + if (!IsInsideMM(x, 0, 21)) // Button area return; y = e->we.click.pt.y - GAMEDIFF_WND_TOP_OFFSET; @@ -1101,7 +1101,7 @@ static void CustCurrencyWndProc(Window *w, WindowEvent *e) switch (line) { case 0: // rate - if (IS_INT_INSIDE(x, 10, 30)) { // clicked buttons + if (IsInsideMM(x, 10, 30)) { // clicked buttons if (x < 20) { if (_custom_currency.rate > 1) _custom_currency.rate--; WP(w,def_d).data_1 = 1 << (line * 2 + 0); @@ -1118,7 +1118,7 @@ static void CustCurrencyWndProc(Window *w, WindowEvent *e) break; case 1: // separator - if (IS_INT_INSIDE(x, 10, 30)) { // clicked button + if (IsInsideMM(x, 10, 30)) { // clicked button WP(w,def_d).data_1 = 1 << (line * 2 + 1); } str = BindCString(_str_separator); @@ -1126,7 +1126,7 @@ static void CustCurrencyWndProc(Window *w, WindowEvent *e) break; case 2: // prefix - if (IS_INT_INSIDE(x, 10, 30)) { // clicked button + if (IsInsideMM(x, 10, 30)) { // clicked button WP(w,def_d).data_1 = 1 << (line * 2 + 1); } str = BindCString(_custom_currency.prefix); @@ -1134,7 +1134,7 @@ static void CustCurrencyWndProc(Window *w, WindowEvent *e) break; case 3: // suffix - if (IS_INT_INSIDE(x, 10, 30)) { // clicked button + if (IsInsideMM(x, 10, 30)) { // clicked button WP(w,def_d).data_1 = 1 << (line * 2 + 1); } str = BindCString(_custom_currency.suffix); @@ -1142,7 +1142,7 @@ static void CustCurrencyWndProc(Window *w, WindowEvent *e) break; case 4: // to euro - if (IS_INT_INSIDE(x, 10, 30)) { // clicked buttons + if (IsInsideMM(x, 10, 30)) { // clicked buttons if (x < 20) { _custom_currency.to_euro = (_custom_currency.to_euro <= 2000) ? CF_NOEURO : _custom_currency.to_euro - 1; |