← Back to branch summary

~ubuntu-branches/debian/squeeze/freeciv/squeeze

« back to all changes in this revision

Viewing changes to client/gui-win32/canvas.c

  • Committer: Bazaar Package Importer
  • Author(s): Clint Adams, Karl Goetz, Clint Adams
  • Date: 2010-02-23 22:09:02 UTC
  • mfrom: (1.2.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20100223220902-kiyrmr9i4152cka5
Tags: 2.2.0-1
http://bugs.debian.org/523772
http://bugs.debian.org/517787
[ Karl Goetz ]
* Remove civserver files in /etc/ggzd/ (Closes: 523772, 517787)
* Adding ${misc:Depends} to all binary packages (lintian warnings)

[ Clint Adams ]
* New upstream version.
  - Drop data_dsc_use_bindir.diff (binary pathnames have changed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/gui-win32/canvas.c
21
21
#include <windows.h>
22
22
#include <windowsx.h>
23
23
 
 
24
/* utility */
24
25
#include "log.h"
25
26
#include "fcintl.h"
26
27
 
 
28
/* client */
 
29
#include "options.h"
 
30
 
 
31
/* gui-win32 */
27
32
#include "canvas.h"
28
33
#include "colors.h"
29
34
#include "graphics.h"
268
273
  if (!psprite)
269
274
    return;
270
275
 
271
 
  if (fog && better_fog && !psprite->fog) {
 
276
  if (fog && gui_win32_better_fog && !psprite->fog) {
272
277
    fog_sprite(psprite);
273
278
    if (!psprite->fog) {
274
279
      freelog(LOG_NORMAL,
275
280
              _("Better fog will only work in truecolor.  Disabling it"));
276
 
      better_fog = FALSE;
 
281
      gui_win32_better_fog = FALSE;
277
282
    }
278
283
  }
279
284
 
280
285
  hdc = canvas_get_hdc(pcanvas);
281
286
 
282
 
  if (fog && better_fog) {
 
287
  if (fog && gui_win32_better_fog) {
283
288
    draw_sprite_fog(psprite, hdc, canvas_x, canvas_y);
284
289
  } else {
285
290
    draw_sprite(psprite, hdc, canvas_x, canvas_y);
344
349
 
345
350
  canvas_release_hdc(pcanvas);
346
351
}
 
352
 
 
353
/**************************************************************************
 
354
  Draw a 1-pixel-width colored curved line onto the canvas.
 
355
**************************************************************************/
 
356
void canvas_put_curved_line(struct canvas *pcanvas, struct color *pcolor,
 
357
                            enum line_type ltype, int start_x, int start_y,
 
358
                            int dx, int dy)
 
359
{
 
360
  /* FIXME: Implement curved line drawing. */
 
361
  canvas_put_line(pcanvas, pcolor, ltype, start_x, start_y, dx, dy);
 
362
}