Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r6205) -CodeChange : use a switch case instead of a cascade of if

Browse Source 
-CodeChange : rename var Engine *e to Engine *eng, since we have WindowEvent *e in same fnct
-CodeChange : fix a broken tabulation on a switch case. SOme breathing spaces too
pull/155/head
belugas 18 years ago
parent 86dc219b4b
commit 1f660a8175
3 changed files with 116 additions and 108 deletions
Show Stats Download Patch File Download Diff File

28
road_gui.c
Unescape Escape View File

@ -233,16 +233,24 @@ static void BuildRoadToolbWndProc(Window *w, WindowEvent *e)
case WE_PLACE_DRAG: {
int sel_method;
if (e->place.userdata == 1) {
sel_method = VPM_FIX_X;
_place_road_flag = (_place_road_flag&~2) | ((e->place.pt.y&8)>>2);
} else if (e->place.userdata == 2) {
sel_method = VPM_FIX_Y;
_place_road_flag = (_place_road_flag&~2) | ((e->place.pt.x&8)>>2);
} else if (e->place.userdata == 4) {
sel_method = VPM_X_AND_Y;
} else {
sel_method = VPM_X_OR_Y;
switch (e->place.userdata) {
case 1:
sel_method = VPM_FIX_X;
_place_road_flag = (_place_road_flag & ~2) | ((e->place.pt.y & 8) >> 2);
break;
case 2:
sel_method = VPM_FIX_Y;
_place_road_flag = (_place_road_flag & ~2) | ((e->place.pt.x & 8) >> 2);
break;
case 4:
sel_method = VPM_X_AND_Y;
break;
default:
sel_method = VPM_X_OR_Y;
break;
}
VpSelectTilesWithMethod(e->place.pt.x, e->place.pt.y, sel_method);

12
ship_gui.c
Unescape Escape View File

@ -328,11 +328,11 @@ static void NewShipWndProc(Window *w, WindowEvent *e)
{
int count = 0;
int num = NUM_SHIP_ENGINES;
const Engine *e = GetEngine(SHIP_ENGINES_INDEX);
const Engine *eng = GetEngine(SHIP_ENGINES_INDEX);
do {
if (HASBIT(e->player_avail, _local_player)) count++;
} while (++e,--num);
if (HASBIT(eng->player_avail, _local_player)) count++;
} while (++eng,--num);
SetVScrollCount(w, count);
}
@ -340,7 +340,7 @@ static void NewShipWndProc(Window *w, WindowEvent *e)
{
int num = NUM_SHIP_ENGINES;
const Engine *e = GetEngine(SHIP_ENGINES_INDEX);
const Engine *eng = GetEngine(SHIP_ENGINES_INDEX);
int x = 2;
int y = 15;
int sel = WP(w,buildtrain_d).sel_index;
@ -349,7 +349,7 @@ static void NewShipWndProc(Window *w, WindowEvent *e)
EngineID selected_id = INVALID_ENGINE;
do {
if (HASBIT(e->player_avail, _local_player)) {
if (HASBIT(eng->player_avail, _local_player)) {
if (sel==0) selected_id = engine_id;
if (IS_INT_INSIDE(--pos, -w->vscroll.cap, 0)) {
DrawString(x+75, y+7, GetCustomEngineName(engine_id), sel==0 ? 0xC : 0x10);
@ -358,7 +358,7 @@ static void NewShipWndProc(Window *w, WindowEvent *e)
}
sel--;
}
} while (++engine_id, ++e,--num);
} while (++engine_id, ++eng,--num);
WP(w,buildtrain_d).sel_engine = selected_id;

184
smallmap_gui.c
Unescape Escape View File

@ -806,108 +806,108 @@ void SmallMapCenterOnCurrentPos(Window *w)
static void SmallMapWindowProc(Window *w, WindowEvent *e)
{
switch (e->event) {
case WE_PAINT: {
const uint16 *tbl;
int x,y,y_org;
DrawPixelInfo new_dpi;
/* draw the window */
SetDParam(0, STR_00E5_CONTOURS + _smallmap_type);
DrawWindowWidgets(w);
/* draw the legend */
tbl = _legend_table[(_smallmap_type != 2) ? _smallmap_type : (_opt.landscape + IND_OFFS)];
x = 4;
y_org = w->height - 44 - 11;
y = y_org;
for (;;) {
GfxFillRect(x, y + 1, x + 8, y + 5, 0);
GfxFillRect(x + 1, y + 2, x + 7, y + 4, (byte)tbl[0]);
DrawString(x + 11, y, tbl[1], 0);
tbl += 2;
y += 6;
if (tbl[0] == 0xFFFF) {
break;
} else if (tbl[0] & 0x100) {
x += 123;
y = y_org;
case WE_PAINT: {
const uint16 *tbl;
int x, y, y_org;
DrawPixelInfo new_dpi;
/* draw the window */
SetDParam(0, STR_00E5_CONTOURS + _smallmap_type);
DrawWindowWidgets(w);
/* draw the legend */
tbl = _legend_table[(_smallmap_type != 2) ? _smallmap_type : (_opt.landscape + IND_OFFS)];
x = 4;
y_org = w->height - 44 - 11;
y = y_org;
for (;;) {
GfxFillRect(x, y + 1, x + 8, y + 5, 0);
GfxFillRect(x + 1, y + 2, x + 7, y + 4, (byte)tbl[0]);
DrawString(x + 11, y, tbl[1], 0);
tbl += 2;
y += 6;
if (tbl[0] == 0xFFFF) {
break;
} else if (tbl[0] & 0x100) {
x += 123;
y = y_org;
}
}
}
if (!FillDrawPixelInfo(&new_dpi, 3, 17, w->width - 28 + 22, w->height - 64 - 11))
return;
DrawSmallMap(&new_dpi, w, _smallmap_type, _smallmap_show_towns);
} break;
if (!FillDrawPixelInfo(&new_dpi, 3, 17, w->width - 28 + 22, w->height - 64 - 11))
return;
case WE_CLICK:
switch (e->click.widget) {
case 4: { // Map window
Window *w2 = FindWindowById(WC_MAIN_WINDOW, 0);
Point pt;
int x, y;
pt = RemapCoords(WP(w,smallmap_d).scroll_x, WP(w,smallmap_d).scroll_y, 0);
x = pt.x + ((_cursor.pos.x - w->left + 2) << 4) - (w2->viewport->virtual_width >> 1);
y = pt.y + ((_cursor.pos.y - w->top - 16) << 4) - (w2->viewport->virtual_height >> 1);
/* If you press twice on a place in the smallmap, center there */
if (WP(w2, vp_d).scrollpos_x == x && WP(w2, vp_d).scrollpos_y == y) {
SmallMapCenterOnCurrentPos(w);
} else {
WP(w2, vp_d).scrollpos_x = x;
WP(w2, vp_d).scrollpos_y = y;
}
SetWindowDirty(w);
DrawSmallMap(&new_dpi, w, _smallmap_type, _smallmap_show_towns);
} break;
case 5: // Show land contours
case 6: // Show vehicles
case 7: // Show industries
case 8: // Show transport routes
case 9: // Show vegetation
case 10: // Show land owners
w->click_state &= ~(1<<5|1<<6|1<<7|1<<8|1<<9|1<<10);
w->click_state |= 1 << e->click.widget;
_smallmap_type = e->click.widget - 5;
SetWindowDirty(w);
SndPlayFx(SND_15_BEEP);
case WE_CLICK:
switch (e->click.widget) {
case 4: { // Map window
Window *w2 = FindWindowById(WC_MAIN_WINDOW, 0);
Point pt;
int x, y;
pt = RemapCoords(WP(w,smallmap_d).scroll_x, WP(w,smallmap_d).scroll_y, 0);
x = pt.x + ((_cursor.pos.x - w->left + 2) << 4) - (w2->viewport->virtual_width >> 1);
y = pt.y + ((_cursor.pos.y - w->top - 16) << 4) - (w2->viewport->virtual_height >> 1);
/* If you press twice on a place in the smallmap, center there */
if (WP(w2, vp_d).scrollpos_x == x && WP(w2, vp_d).scrollpos_y == y) {
SmallMapCenterOnCurrentPos(w);
} else {
WP(w2, vp_d).scrollpos_x = x;
WP(w2, vp_d).scrollpos_y = y;
}
SetWindowDirty(w);
} break;
case 5: // Show land contours
case 6: // Show vehicles
case 7: // Show industries
case 8: // Show transport routes
case 9: // Show vegetation
case 10: // Show land owners
w->click_state &= ~( 1 << 5 | 1 << 6 | 1 << 7 | 1 << 8 | 1 << 9 | 1 << 10);
w->click_state |= 1 << e->click.widget;
_smallmap_type = e->click.widget - 5;
SetWindowDirty(w);
SndPlayFx(SND_15_BEEP);
break;
case 11: // Center the smallmap again
SmallMapCenterOnCurrentPos(w);
SetWindowDirty(w);
SndPlayFx(SND_15_BEEP);
break;
case 12: // Toggle town names
w->click_state ^= (1 << 12);
_smallmap_show_towns = (w->click_state >> 12) & 1;
SetWindowDirty(w);
SndPlayFx(SND_15_BEEP);
break;
}
break;
case 11: // Center the smallmap again
SmallMapCenterOnCurrentPos(w);
SetWindowDirty(w);
SndPlayFx(SND_15_BEEP);
case WE_RCLICK:
if (e->click.widget == 4) {
if (_scrolling_viewport) return;
_scrolling_viewport = true;
_cursor.delta.x = 0;
_cursor.delta.y = 0;
}
break;
case 12: // Toggle town names
w->click_state ^= (1 << 12);
_smallmap_show_towns = (w->click_state >> 12) & 1;
SetWindowDirty(w);
SndPlayFx(SND_15_BEEP);
case WE_MOUSELOOP:
/* update the window every now and then */
if ((++w->vscroll.pos & 0x1F) == 0) SetWindowDirty(w);
break;
}
break;
case WE_RCLICK:
if (e->click.widget == 4) {
if (_scrolling_viewport) return;
_scrolling_viewport = true;
_cursor.delta.x = 0;
_cursor.delta.y = 0;
}
break;
case WE_MOUSELOOP:
/* update the window every now and then */
if ((++w->vscroll.pos & 0x1F) == 0) SetWindowDirty(w);
break;
case WE_SCROLL: {
int x;

Write Preview
Loading…
Cancel
Save