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

(svn r3078) Some more stuff, which piled up:

Browse Source 
- const, whitespace, indentation, bracing, GB/SB, pointless casts
- use the trinary operator where appropriate
- data types (uint[] -> AcceptedCargo, ...)
- if cascade -> switch
- if (ptr) -> if (ptr != NULL)
- DeMorgan's Law
- Fix some comments
- 0 -> '\0', change magic numbers to symbolic constants
This commit is contained in:
tron
2005-10-23 13:04:44 +00:00
parent 2cc2154ad2
commit 47137cefb7
38 changed files with 442 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
window.c
View File

@@ -214,11 +214,9 @@ void CallWindowEventNP(Window *w, int event)
w->wndproc(w, &e);
}
void SetWindowDirty(Window *w)
void SetWindowDirty(const Window* w)
{
if (w == NULL)
return;
if (w == NULL) return;
SetDirtyBlocks(w->left, w->top, w->left + w->width, w->top + w->height);
}
@@ -1402,10 +1400,16 @@ static void MouseLoop(int click, int mousewheel)
y -= vp->top;
//here allows scrolling in both x and y axis
#define scrollspeed 3
if (x-15<0) { WP(w,vp_d).scrollpos_x += (x-15) * scrollspeed << vp->zoom; }
else if (15-(vp->width-x) > 0) { WP(w,vp_d).scrollpos_x += (15-(vp->width-x))*scrollspeed << vp->zoom; }
if (y-15<0) { WP(w,vp_d).scrollpos_y += (y-15)*scrollspeed << vp->zoom; }
else if (15-(vp->height-y) > 0) { WP(w,vp_d).scrollpos_y += (15-(vp->height-y))*scrollspeed << vp->zoom; }
if (x - 15 < 0) {
WP(w, vp_d).scrollpos_x += (x - 15) * scrollspeed << vp->zoom;
} else if (15 - (vp->width - x) > 0) {
WP(w, vp_d).scrollpos_x += (15 - (vp->width - x)) * scrollspeed << vp->zoom;
}
if (y - 15 < 0) {
WP(w, vp_d).scrollpos_y += (y - 15) * scrollspeed << vp->zoom;
} else if (15 - (vp->height - y) > 0) {
WP(w,vp_d).scrollpos_y += (15 - (vp->height - y)) * scrollspeed << vp->zoom;
}
#undef scrollspeed
}
}
@@ -1434,8 +1438,9 @@ static void MouseLoop(int click, int mousewheel)
_cursor.sprite != SPR_CURSOR_QUERY &&
_cursor.sprite != SPR_CURSOR_SIGN &&
_pause != 0 &&
!_cheats.build_in_pause.value)
return;
!_cheats.build_in_pause.value) {
return;
}
if (_thd.place_mode == 0) {
HandleViewportClicked(vp, x, y);