diff options
author | rubidium <rubidium@openttd.org> | 2008-03-28 04:57:32 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2008-03-28 04:57:32 +0000 |
commit | 0e73ac21986a3b1224f63d220b9dbfb81a91d239 (patch) | |
tree | 054d82fc3797d11e8a32609a8112e9799cc33682 /src/station_gui.cpp | |
parent | 55676e3b6c5ba0e09c605f6dadac5d76382f2bdc (diff) | |
download | openttd-0e73ac21986a3b1224f63d220b9dbfb81a91d239.tar.xz |
(svn r12458) -Codechange: split acquiring the sprite ID for cargos from the actual drawing of them.
Diffstat (limited to 'src/station_gui.cpp')
-rw-r--r-- | src/station_gui.cpp | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/src/station_gui.cpp b/src/station_gui.cpp index 82fe883c9..8a4f7a6f5 100644 --- a/src/station_gui.cpp +++ b/src/station_gui.cpp @@ -682,19 +682,8 @@ static const Widget _station_view_widgets[] = { { WIDGETS_END}, }; -/** - * Draws icons of wainting cargo in the StationView window - * - * @param i type of cargo - * @param waiting number of wainting units - * @param x x on-screen coordinate where to start with drawing icons - * @param y y coordinate - */ -static void DrawCargoIcons(CargoID i, uint waiting, int x, int y, uint width) +SpriteID GetCargoSprite(CargoID i) { - uint num = min((waiting + 5) / 10, width / 10); // maximum is width / 10 icons so it won't overflow - if (num == 0) return; - const CargoSpec *cs = GetCargo(i); SpriteID sprite; @@ -707,6 +696,24 @@ static void DrawCargoIcons(CargoID i, uint waiting, int x, int y, uint width) if (sprite == 0) sprite = SPR_CARGO_GOODS; + return sprite; +} + +/** + * Draws icons of waiting cargo in the StationView window + * + * @param i type of cargo + * @param waiting number of waiting units + * @param x x on-screen coordinate where to start with drawing icons + * @param y y coordinate + */ +static void DrawCargoIcons(CargoID i, uint waiting, int x, int y, uint width) +{ + uint num = min((waiting + 5) / 10, width / 10); // maximum is width / 10 icons so it won't overflow + if (num == 0) return; + + SpriteID sprite = GetCargoSprite(i); + do { DrawSprite(sprite, PAL_NONE, x, y); x += 10; |